Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8625] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-02-14 21:35:42
|
Revision: 8625
http://sourceforge.net/p/fudaa/svn/8625
Author: deniger
Date: 2014-02-14 21:35:39 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
CRUE-618
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/CoeurProperty.java
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/node/Bundle.properties
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/PlanimetryAccrocheController.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/PlanimetryCLimMLayer.java
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/sig/traceprofil/GGPointToTraceProfilProcessor.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/SigHelperForTest.java
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf
trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp
Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -40,24 +40,10 @@
data.setSto(readBinaire(this, Crue9FileFormatFactory.getSTOFileFormat(), FilesForTest.STO_ETU30_M30, data).getMetier());
ValidatorAndLoaderResultatCrue9.validFcbProfils(read.getMetier(), data, log);
AbstractIOBinaryTestCase.testAnalyser(log);
- assertTrue(getResultatPosition(data, "ST_B5_AMONT") > 0);
- assertTrue(getResultatPosition(data, "ST_B5_AVAL") > 0);
- assertTrue(getResultatPosition(data, "ST_B8_AMONT") > 0);
- assertTrue(getResultatPosition(data, "ST_B8_AVAL") > 0);
- // tests des sections sans géometrie qui peuvent causer problèmes:
-// FCBSequentialReader.EnteteContainer<FCBValueObject.EnteteBranche, FCBValueObject.ResBranche> containerBranches = infos.getContainerBranches();
-// for (int i = 0; i < containerBranches.getNbData(); i++) {
-// String name = containerBranches.getDataName(i);
-// assertFalse(StringUtils.isBlank(name));
-// }
-// FCBSequentialReader.EnteteContainer<FCBValueObject.EnteteCasier, FCBValueObject.ResCasier> containerNoeud = infos.getContainerCasiers();
-// for (int i = 0; i < containerNoeud.getNbData(); i++) {
-// String name = containerNoeud.getDataName(i);
-// assertFalse(StringUtils.isBlank(name));
-// }
-// int nbPdt = read.getMetier().getPdt().getNbResultats();
-// assertEquals(25, nbPdt);
-
+ assertTrue(getResultatPosition(data, "ST_B5_AM") > 0);
+ assertTrue(getResultatPosition(data, "ST_B5_AV") > 0);
+ assertTrue(getResultatPosition(data, "ST_B8_AM") > 0);
+ assertTrue(getResultatPosition(data, "ST_B8_AV") > 0);
}
private int getResultatPosition(CrueData data, final String id) {
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaCampagneTopComponent.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -88,6 +88,7 @@
associateLookup(ExplorerUtils.createLookup(mgr, getActionMap()));
this.outlineView.addPropertyColumn("commentaire", NbBundle.getMessage(OtfaCampagneTopComponent.class, "comment"));
+ this.outlineView.addPropertyColumn("lancerComparaison", NbBundle.getMessage(OtfaCampagneTopComponent.class, "lancerComparaison"));
this.outlineView.addPropertyColumn("referenceEtuFile", NbBundle.getMessage(OtfaCampagneTopComponent.class, "refEtuFile"));
this.outlineView.addPropertyColumn("referenceScenarioNom", NbBundle.getMessage(OtfaCampagneTopComponent.class, "refScenario"));
this.outlineView.addPropertyColumn("referenceLaunchCompute", NbBundle.getMessage(OtfaCampagneTopComponent.class,
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/node/OtfaCampagneLineNode.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -153,6 +153,7 @@
try {
Property indice = new PropertySupportReflection(this, line, int.class, "getIndice", null);
Property commentaire = new PropertySupportReflection(this, line, String.class, "getCommentaire", "setCommentaire");
+ Property lancerComparaison = new PropertySupportReflection(this, line, boolean.class, "isLancerComparaison", "setLancerComparaison");
final String logDisplayName = NbBundle.getMessage(OtfaCampagneLineNode.class, "logsName");
final String logDescription = NbBundle.getMessage(OtfaCampagneLineNode.class, "logsDescription");
OtfaRtfaLineProperty logs = new OtfaRtfaLineProperty(data, "logs", logDisplayName, logDescription);
@@ -168,6 +169,10 @@
commentaire.setDisplayName(NbBundle.getMessage(OtfaCampagneLineNode.class, "commentName"));
commentaire.setShortDescription(NbBundle.getMessage(OtfaCampagneLineNode.class, "commentDescription"));
+ lancerComparaison.setName("lancerComparaison");
+ lancerComparaison.setDisplayName(NbBundle.getMessage(OtfaCampagneLineNode.class, "lancerComparaisonName"));
+ lancerComparaison.setShortDescription(NbBundle.getMessage(OtfaCampagneLineNode.class, "lancerComparaisonDescription"));
+
logs.setPropertyEditorClass(LogsPropertyEditor.class);
comparaisons.setPropertyEditorClass(ComparaisonsPropertyEditor.class);
if (!data.hasDifferences()) {
@@ -178,6 +183,7 @@
}
set.put(indice);
+ set.put(lancerComparaison);
set.put(commentaire);
set.put(logs);
set.put(comparaisons);
@@ -234,7 +240,7 @@
configureFileEditor(etude);
PropertySupportReflection scenario = new ScenarioProperty(this, otfaCampagne, line.getReference(), "getScenarioNom", "setScenarioNom");
- CoeurProperty coeur = new CoeurProperty(this, line.getReference(), String.class, "getCoeurName", "setCoeurName");
+ CoeurProperty coeur = new CoeurProperty(this, line.getReference(), String.class, "getCoeurName", "setCoeurName", false);
Property lancerCalcul = new PropertySupportReflection(this, line.getReference(), boolean.class, "isLaunchCompute", "setLaunchCompute");
etude.setName(REFERENCE_ETU_FILE_PROPERTY);
@@ -287,8 +293,9 @@
};
etude.setCanWrite(true);
configureFileEditor(etude);
- Property scenario = new ScenarioProperty(this, otfaService.getCurrentOTFA().getOtfaCampagne(), line.getCible(), "getScenarioNom", "setScenarioNom");
- Reflection coeur = new CoeurProperty(this, line.getCible(), String.class, "getCoeurName", "setCoeurName");
+ Property scenario = new ScenarioProperty(this, otfaService.getCurrentOTFA().getOtfaCampagne(), line.getCible(), "getScenarioNom",
+ "setScenarioNom");
+ Reflection coeur = new CoeurProperty(this, line.getCible(), String.class, "getCoeurName", "setCoeurName", true);
Property lancerCalcul = new PropertySupportReflection(this, line.getCible(), boolean.class, "isLaunchCompute", "setLaunchCompute");
etude.setName(CIBLE_ETU_FILE_PROPERPTY);
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/CoeurProperty.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/CoeurProperty.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/CoeurProperty.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -8,6 +8,7 @@
import java.beans.PropertyEditorSupport;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneItem;
import org.fudaa.fudaa.crue.common.property.AbstractNodeFirable;
import org.fudaa.fudaa.crue.common.property.PropertySupportReflection;
@@ -20,8 +21,11 @@
*/
public class CoeurProperty extends PropertySupportReflection<String> {
- public CoeurProperty(AbstractNodeFirable node, Object instance, Class clazz, String getter, String setter) throws NoSuchMethodException {
+ private final boolean emptyAuthorized;
+
+ public CoeurProperty(AbstractNodeFirable node, Object instance, Class clazz, String getter, String setter, boolean emptyAuthorized) throws NoSuchMethodException {
super(node, instance, clazz, getter, setter);
+ this.emptyAuthorized = emptyAuthorized;
}
@Override
@@ -51,6 +55,9 @@
public String[] getTags() {
if (coeurs == null) {
List<String> all = new ArrayList<String>();
+ if (emptyAuthorized) {
+ all.add(StringUtils.EMPTY);
+ }
all.add(OtfaCampagneItem.CRUE9);
all.addAll(service.getCoeursNames());
coeurs = (String[]) all.toArray(new String[all.size()]);
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties 2014-02-14 21:35:39 UTC (rev 8625)
@@ -38,6 +38,7 @@
OtfaCampagneTopComponent.ciblesDeleteRunsBeforeCheckBox.text=Effacer les runs avant
OtfaCampagneTopComponent.openOtfaButton.text=OpenOtfa
comment=Commentaire
+lancerComparaison=Comparaison
refEtuFile=Fichier Etu de la r\u00e9f\u00e9rence
refScenario=Sc\u00e9nario de la r\u00e9f\u00e9rence
refLaunchCompute=Lancement des runs de la r\u00e9f\u00e9rence
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/node/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/node/Bundle.properties 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/node/Bundle.properties 2014-02-14 21:35:39 UTC (rev 8625)
@@ -3,6 +3,8 @@
indiceDescription=D\u00e9fini l'indice de la ligne.
commentName=Commentaire
commentDescription=D\u00e9fini le commentaire de la ligne.
+lancerComparaisonName=Lancer la comparaison
+lancerComparaisonDescription=Lancer la comparaison ou non
indicateurName=Indicateur
indicateurDescription=D\u00e9fini l'\u00e9tat des comparaisons de la ligne.
logsName=Logs
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 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -14,6 +14,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.MissingResourceException;
import java.util.Observable;
import java.util.Observer;
import java.util.Set;
@@ -27,12 +28,15 @@
import javax.swing.border.Border;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gis.GISPolyligne;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.IdRegistry;
import org.fudaa.ebli.calque.BArbreCalqueModel;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BGroupeCalque;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
+import org.fudaa.ebli.calque.ZCatchEvent;
import org.fudaa.ebli.calque.ZSelectionEvent;
import org.fudaa.ebli.calque.ZSelectionListener;
import org.fudaa.ebli.calque.action.AddVertexAction;
@@ -48,10 +52,12 @@
import org.fudaa.ebli.find.EbliFindDialog;
import org.fudaa.ebli.find.EbliFindableItem;
import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.crue.planimetry.action.AddBrancheAction;
import org.fudaa.fudaa.crue.planimetry.action.AddCasierAction;
import org.fudaa.fudaa.crue.planimetry.action.AddNoeudAction;
import org.fudaa.fudaa.crue.planimetry.action.EditZonePanel;
+import org.fudaa.fudaa.crue.planimetry.controller.LayerBrancheController;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryVisuPanelController;
import org.fudaa.fudaa.crue.planimetry.layer.CalqueWithDynamicActions;
@@ -157,6 +163,54 @@
}
@Override
+ public void setAccrocheText(ZCatchEvent _evt) {
+ final ZCalqueAffichageDonneesInterface layer = _evt.selection.getScene().getLayerForId(_evt.idxGeom);
+ int idx = _evt.selection.getScene().sceneId2LayerId(_evt.idxGeom);
+ int vertex = _evt.idxVertex;
+ final PlanimetryController planimetryController = getPlanimetryController();
+ if (layer == planimetryController.getCqNoeud()) {
+ final EMH emh = planimetryController.getNodeController().getEMHFromLayerPosition(idx);
+ setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.node", emh.getNom()));
+ } else if (layer == planimetryController.getCqBranche()) {
+ setAccrocheTextBranche(planimetryController, idx, vertex);
+ } else if (layer == planimetryController.getCqCasier()) {
+ final EMH emh = planimetryController.getCasierController().getEMHFromLayerPosition(idx);
+ setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.casier", emh.getNom(), vertex));
+ } else if (layer == planimetryController.getCqSection()) {
+ final EMH emh = planimetryController.getSectionController().getEMHFromLayerPosition(idx);
+ setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.section", emh.getNom()));
+ } else {
+ super.setAccrocheText(_evt);
+ }
+ }
+
+ private void setAccrocheTextBranche(final PlanimetryController planimetryController, int idx, int vertex) throws MissingResourceException {
+ final CatEMHBranche branche = (CatEMHBranche) planimetryController.getBrancheController().getEMHFromLayerPosition(idx);
+ final GISPolyligne brancheGis = planimetryController.getBrancheController().getBrancheGis(idx);
+ if (vertex == LayerBrancheController.getAmontCoordinatePosition()) {
+ final EMH emh = branche.getNoeudAmont();
+ setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.node", emh.getNom()));
+ } else if (vertex == LayerBrancheController.getAvalCoordinatePosition(brancheGis.getNumPoints())) {
+ final EMH emh = branche.getNoeudAval();
+ setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.node", emh.getNom()));
+ } else {
+ setInfoText(NbBundle.getMessage(PlanimetryVisuPanel.class, "accroche.branche", branche.getNom(), vertex + 1));
+ }
+ }
+
+ public void setAccrocheText(String[] vars) {
+ String text
+ = EbliResource.EBLI.getString(
+ "Accroche : Calque={0} Geom={1} Sommet={2}", vars);
+ setInfoText(text);
+ }
+
+ @Override
+ public void unsetAcrrocheText() {
+ super.unsetAcrrocheText();
+ }
+
+ @Override
protected ZEditorDefault createGisEditor() {
return new PlanimetryGisEditor(this);
}
@@ -178,7 +232,7 @@
}
@Override
- public void setEnabled(boolean _newValue) {
+ public void setEnabled(boolean _newValue) {
}
};
return res;
@@ -393,15 +447,20 @@
TitledSeparator titleSeparator = new TitledSeparator(org.openide.util.NbBundle.getMessage(PlanimetryVisuPanel.class, "Toolbar.Separator"));
final Border emptyBorder = BorderFactory.createEmptyBorder(5, 1, 1, 1);
+
titleSeparator.setBorder(emptyBorder);
+
gisEditionPalette.add(titleSeparator);
gisEditionPalette.add(add(addNoeud.buildToolButton(EbliComponentFactory.INSTANCE)));
gisEditionPalette.add(add(addBranche.buildToolButton(EbliComponentFactory.INSTANCE)));
gisEditionPalette.add(add(addCasier.buildToolButton(EbliComponentFactory.INSTANCE)));
titleSeparator = new TitledSeparator(org.openide.util.NbBundle.getMessage(PlanimetryVisuPanel.class, "Project.Separator"));
+
titleSeparator.setBorder(emptyBorder);
+
gisEditionPalette.add(titleSeparator);
+
gisEditionPalette.add(add(getPlanimetryController().getProjectEMHOnSIGAction().buildToolButton(EbliComponentFactory.INSTANCE)));
gisEditionPalette.add(add(getPlanimetryController().getTraceProfilAttachedToBrancheAction().buildToolButton(EbliComponentFactory.INSTANCE)));
}
@@ -435,6 +494,7 @@
}
}
return emhs;
+
}
private class ObserverCalque implements Observer {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryAccrocheController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryAccrocheController.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryAccrocheController.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -46,8 +46,10 @@
final CtuluListSelection selection = layer.selection(pt, ZCalqueSelectionInteractionAbstract.DEFAULT_TOLERANCE_PIXEL);
Cursor newCursor = null;
if (selection == null || selection.isEmpty()) {
- newCursor = view.getController().getDefautCursor();
- view.unsetInfoText();
+ if (!view.getController().getCqCatchI().isSomethingCatched()) {
+ newCursor = view.getController().getDefautCursor();
+ view.unsetInfoText();
+ }
PlanimetryCLimMLayer climM = view.getPlanimetryController().getcondLimiteController().getLayer();
final CtuluListSelection selectionClimM = climM.selection(pt, ZCalqueSelectionInteractionAbstract.DEFAULT_TOLERANCE_PIXEL);
if (selectionClimM != null && !selectionClimM.isEmpty()) {
@@ -63,7 +65,7 @@
}
view.setInfoText(StringUtils.join(emhs, "; "));
}
- if (!newCursor.equals(view.getVueCalque().getCursor())) {
+ if (newCursor != null && !newCursor.equals(view.getVueCalque().getCursor())) {
view.getVueCalque().setCursor(newCursor);
}
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 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -2,6 +2,7 @@
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -46,11 +47,23 @@
}
@Override
+ public void setCalqueInteractionActif(BCalqueInteraction _b) {
+ super.setCalqueInteractionActif(_b);
+ getView().getVueCalque().requestFocus();
+ }
+
+
+ @Override
public void setView(final ZEbliCalquesPanel view) {
super.setView(view);
-// view.getVueCalque().removeKeyListener(cqCatchI_);
-// removeCalqueInteraction(cqCatchI_);
+ view.getVueCalque().removeKeyListener(cqCatchI_);
cqCatchI_.setGele(true);
+ final PropertyChangeListener[] propertyChangeListeners = cqCatchI_.getPropertyChangeListeners("gele");
+ if (propertyChangeListeners != null) {
+ for (PropertyChangeListener propertyChangeListener : propertyChangeListeners) {
+ cqCatchI_.removePropertyChangeListener("gele", propertyChangeListener);
+ }
+ }
view.getVueCalque().addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
@@ -68,7 +81,6 @@
cqCatchI_.setGele(true);
}
}
-
});
new PlanimetryAccrocheController((PlanimetryVisuPanel) view).install();
SelectionMoveInteraction selection = (SelectionMoveInteraction) getCalqueInteraction("cqSELECTION");
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCLimMLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCLimMLayer.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCLimMLayer.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -50,6 +50,11 @@
}
@Override
+ public boolean canBeUsedForAccroche() {
+ return false;
+ }
+
+ @Override
public CtuluListSelection selection(GrPoint _pt, int _tolerance) {
if (modele == null || !isVisible()) {
return null;
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 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -111,6 +111,11 @@
LabelPainter labelPainter = new LabelPainter();
@Override
+ public boolean canBeUsedForAccroche() {
+ return false;
+ }
+
+ @Override
protected boolean isPainted(int idx, GrMorphisme _versEcran) {
if (isSelected(idx)) {
return true;
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilProcessor.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -44,6 +44,7 @@
GISAttributeModel model = entry.getValue();
if (model == null) {
log.addSevereError(NbBundle.getMessage(GGPointToTraceProfilProcessor.class, "traceProfil.AttributNotFound", key));
+ return;
} else if (model.getSize() != nbPoint) {
log.addSevereError(NbBundle.getMessage(GGPointToTraceProfilProcessor.class, "traceProfil.AttributeSizeNotCorrect", key, Integer.toString(
model.getSize()), Integer.toString(nbPoint)));
@@ -64,7 +65,7 @@
if (model.getObjectValueAt(i) == null) {
log.
addSevereError(NbBundle.getMessage(GGPointToTraceProfilProcessor.class, "traceProfil.AttributeWithEmptyValue", key, Integer.
- toString(i)));
+ toString(i)));
}
}
}
@@ -144,7 +145,6 @@
}
res.setResultat(zone);
-
return res;
}
}
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 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties 2014-02-14 21:35:39 UTC (rev 8625)
@@ -18,3 +18,8 @@
DeleteEMH.Name=Supprimer uniquement la s\u00e9lection
Cancel.Name=Annuler
Project.Separator=<->
+accroche.node=Accroche: Noeud {0}
+accroche.branche=Accroche: Branche {0}, sommet {1}
+accroche.casier=Accroche: Casier {0}, sommet {1}
+accroche.section=Accroche: Section {0}
+
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/SigHelperForTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/SigHelperForTest.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/SigHelperForTest.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -33,7 +33,7 @@
analyse);
assertTrue(analyse.isEmpty());
GISZoneCollectionPoint buildPoints = SigLoaderHelper.buildPoints(result.createData());
- assertEquals(16581, buildPoints.getNbGeometries());
+ assertEquals(2433, buildPoints.getNbGeometries());
GGPointToTraceProfilProcessor toTrace = new GGPointToTraceProfilProcessor(buildPoints, TestCoeurConfig.INSTANCE.getCrueConfigMetier());
CtuluLogResult<GISZoneCollectionLigneBrisee> toProfil = toTrace.toProfil();
return toProfil;
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilTest.java 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/GGPointToTraceProfilTest.java 2014-02-14 21:35:39 UTC (rev 8625)
@@ -32,10 +32,10 @@
@BeforeClass
public static void extractFile() throws IOException {
targetDir = CtuluLibFile.createTempDir();
- shapeFile = new File(targetDir, "EMG_Profil_point.shp");
- File dbfFile = new File(targetDir, "EMG_Profil_point.dbf");
- CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point.shp", shapeFile);
- CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point.dbf", dbfFile);
+ shapeFile = new File(targetDir, "EMG_Profil_point_canal_de_fuite.shp");
+ File dbfFile = new File(targetDir, "EMG_Profil_point_canal_de_fuite.dbf");
+ CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point_canal_de_fuite.shp", shapeFile);
+ CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point_canal_de_fuite.dbf", dbfFile);
}
@AfterClass
@@ -57,7 +57,7 @@
assertTrue("contient des doublons donc warning", toProfil.getLog().containsWarnings());//a cous
assertFalse(toProfil.getLog().containsErrorOrSevereError());
assertNotNull(toProfil.getResultat());
- final int nbProfil = 96;
+ final int nbProfil = 16;
assertEquals(nbProfil, toProfil.getResultat().getNbGeometries());
GISAttributeModel modelNom = toProfil.getResultat().getModel(nomIdx);
assertEquals(GGTraceProfilSectionAttributesController.NOM, modelNom.getAttribute());
@@ -67,8 +67,8 @@
objectValues[i] = (String) initValues[i];
}
Arrays.sort(objectValues);
- assertEquals("100.000", objectValues[0]);
- assertEquals("99.800", objectValues[nbProfil - 1]);
+ assertEquals("PCF1", objectValues[0]);
+ assertEquals("PCF5", objectValues[nbProfil - 1]);
GISAttributeModel modelXt = toProfil.getResultat().getModel(xtIdx);
GISAttributeModel modelZ = toProfil.getResultat().getModel(zIdx);
@@ -78,68 +78,68 @@
//c'est trié dans l'ordre
String nom1 = (String) modelNom.getObjectValueAt(0);
- assertEquals("98.500", nom1);
+ assertEquals("PCF1", nom1);
Double xt = getValueAt(modelXt, 0, 0);
- assertEquals(-29.84, xt, 1e-3);
+ assertEquals(-12.02, xt, 1e-3);
//on teste la première frontière:
int firstLimMinIdx = 7;
xt = getValueAt(modelXt, 0, firstLimMinIdx);
- String limLit = getValueAt(modelLimLit, 0, firstLimMinIdx);
- String limGeom = getValueAt(modelLimGeo, 0, firstLimMinIdx);
- String label = getValueAt(modelLabel, 0, firstLimMinIdx);
- assertEquals(1.08, xt, 1e-3);
- assertEquals(LimLitHelper.MAJD_MIN, limLit);
- assertEquals("", limGeom);
- assertEquals(LimLitHelper.MAJD_MIN, label);
-
- int thalwegIdx = 12;
- xt = getValueAt(modelXt, 0, thalwegIdx);
- limLit = getValueAt(modelLimLit, 0, thalwegIdx);
- limGeom = getValueAt(modelLimGeo, 0, thalwegIdx);
- label = getValueAt(modelLabel, 0, thalwegIdx);
- assertEquals(10.93, xt, 1e-3);
- assertEquals("", limLit);
- assertEquals(LimGeoHelper.THALWEG, limGeom);
- assertEquals(LimGeoHelper.THALWEG, label);
-
- int lastLimMinIdx = 40;
- xt = getValueAt(modelXt, 0, lastLimMinIdx);
- limLit = getValueAt(modelLimLit, 0, lastLimMinIdx);
- limGeom = getValueAt(modelLimGeo, 0, lastLimMinIdx);
- label = getValueAt(modelLabel, 0, lastLimMinIdx);
- assertEquals(114.03, xt, 1e-3);
- assertEquals("", limGeom);
- assertEquals(LimLitHelper.MIN_MAJG, limLit);
- assertEquals(LimLitHelper.MIN_MAJG, label);
-
- String nom2 = (String) modelNom.getObjectValueAt(1);
- assertEquals("98.600", nom2);
-
- int first = 1;
- xt = getValueAt(modelXt, 1, first);
- limLit = getValueAt(modelLimLit, 1, first);
- limGeom = getValueAt(modelLimGeo, 1, first);
- label = getValueAt(modelLabel, 1, first);
- assertEquals(-18, xt, 1e-3);
- assertEquals("", limGeom);
- assertEquals(LimLitHelper.RD_STOD, limLit);
- assertEquals(LimLitHelper.RD_STOD, label);
-
- first = 7;
- xt = getValueAt(modelXt, 1, first);
- limLit = getValueAt(modelLimLit, 1, first);
- limGeom = getValueAt(modelLimGeo, 1, first);
- label = getValueAt(modelLabel, 1, first);
- assertEquals(0.54, xt, 1e-3);
- final String limLitResult = LimLitHelper.STOD_MAJD + ";" + LimLitHelper.MAJD_MIN;
- final String litGeoResult = LimGeoHelper.AXE + ";" + LimGeoHelper.THALWEG;
- assertEquals(litGeoResult, limGeom);
- assertEquals(limLitResult, limLit);
- assertEquals(limLitResult + "; " + litGeoResult, label);
+ assertEquals(39.98, xt, 1e-3);
+// String limLit = getValueAt(modelLimLit, 0, firstLimMinIdx);
+// String limGeom = getValueAt(modelLimGeo, 0, firstLimMinIdx);
+// String label = getValueAt(modelLabel, 0, firstLimMinIdx);
+//// assertEquals(LimLitHelper.MAJD_MIN, limLit);
+// assertEquals("", limGeom);
+//// assertEquals(LimLitHelper.MAJD_MIN, label);
+//
+// int thalwegIdx = 12;
+// xt = getValueAt(modelXt, 0, thalwegIdx);
+// limLit = getValueAt(modelLimLit, 0, thalwegIdx);
+// limGeom = getValueAt(modelLimGeo, 0, thalwegIdx);
+// label = getValueAt(modelLabel, 0, thalwegIdx);
+// assertEquals(10.93, xt, 1e-3);
+// assertEquals("", limLit);
+//// assertEquals(LimGeoHelper.THALWEG, limGeom);
+//// assertEquals(LimGeoHelper.THALWEG, label);
+//
+// int lastLimMinIdx = 40;
+// xt = getValueAt(modelXt, 0, lastLimMinIdx);
+// limLit = getValueAt(modelLimLit, 0, lastLimMinIdx);
+// limGeom = getValueAt(modelLimGeo, 0, lastLimMinIdx);
+// label = getValueAt(modelLabel, 0, lastLimMinIdx);
+// assertEquals(114.03, xt, 1e-3);
+// assertEquals("", limGeom);
+//// assertEquals(LimLitHelper.MIN_MAJG, limLit);
+//// assertEquals(LimLitHelper.MIN_MAJG, label);
+//
+// String nom2 = (String) modelNom.getObjectValueAt(1);
+// assertEquals("98.600", nom2);
+//
+// int first = 1;
+// xt = getValueAt(modelXt, 1, first);
+// limLit = getValueAt(modelLimLit, 1, first);
+// limGeom = getValueAt(modelLimGeo, 1, first);
+// label = getValueAt(modelLabel, 1, first);
+// assertEquals(-18, xt, 1e-3);
+// assertEquals("", limGeom);
+// assertEquals(LimLitHelper.RD_STOD, limLit);
+// assertEquals(LimLitHelper.RD_STOD, label);
+//
+// first = 7;
+// xt = getValueAt(modelXt, 1, first);
+// limLit = getValueAt(modelLimLit, 1, first);
+// limGeom = getValueAt(modelLimGeo, 1, first);
+// label = getValueAt(modelLabel, 1, first);
+// assertEquals(0.54, xt, 1e-3);
+// final String limLitResult = LimLitHelper.STOD_MAJD + ";" + LimLitHelper.MAJD_MIN;
+// final String litGeoResult = LimGeoHelper.AXE + ";" + LimGeoHelper.THALWEG;
+// assertEquals(litGeoResult, limGeom);
+// assertEquals(limLitResult, limLit);
+// assertEquals(limLitResult + "; " + litGeoResult, label);
}
private static <T> T getValueAt(GISAttributeModel model, int geoIdx, int attIdx) {
return (T) ((CtuluCollection) model.getObjectValueAt(geoIdx)).getObjectValueAt(attIdx);
}
-}
\ No newline at end of file
+}
Added: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf
===================================================================
(Binary files differ)
Index: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf 2014-02-14 21:35:39 UTC (rev 8625)
Property changes on: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.dbf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp
===================================================================
(Binary files differ)
Index: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp 2014-02-14 21:16:50 UTC (rev 8624)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp 2014-02-14 21:35:39 UTC (rev 8625)
Property changes on: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point_canal_de_fuite.shp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
