Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7761] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-10-18 15:28:26
|
Revision: 7761
http://fudaa.svn.sourceforge.net/fudaa/?rev=7761&view=rev
Author: deniger
Date: 2012-10-18 15:28:14 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfiguration.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/VisuConfiguration.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/layer/PlanimetryNodeLayer.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayerModel.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayer.java
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/ReportTestHelper.java
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponentTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationExtra.java
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/pom.xml 2012-10-18 15:28:14 UTC (rev 7761)
@@ -247,6 +247,17 @@
<artifactId>jide-oss</artifactId>
<version>3.4.3</version>
</dependency>
+ <!--utiliser pour construire les graphes-->
+ <dependency>
+ <groupId>jgrapht</groupId>
+ <artifactId>jgrapht</artifactId>
+ <version>0.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>jgraphx</groupId>
+ <artifactId>jgraphx</artifactId>
+ <version>1.10.0.5</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
@@ -278,16 +289,16 @@
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>nbm-maven-plugin</artifactId>
- <version>3.5</version>
- <extensions>true</extensions>
- <configuration>
- <brandingToken>${brandingToken}</brandingToken>
- <cluster>${brandingToken}</cluster>
- </configuration>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
+ <configuration>
+ <brandingToken>${brandingToken}</brandingToken>
+ <cluster>${brandingToken}</cluster>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2012-10-18 15:28:14 UTC (rev 7761)
@@ -124,12 +124,10 @@
<dependency>
<groupId>jgrapht</groupId>
<artifactId>jgrapht</artifactId>
- <version>0.8.3</version>
</dependency>
<dependency>
<groupId>jgraphx</groupId>
<artifactId>jgraphx</artifactId>
- <version>1.10.0.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfiguration.java 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfiguration.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -7,6 +7,7 @@
import org.fudaa.ebli.trace.TraceIconModel;
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.fudaa.crue.planimetry.controller.LayerNodeController;
+import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryNodeLayerModel;
import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryPointLayerModel;
/**
@@ -30,6 +31,9 @@
this.parent = parent;
}
+// public NodeConfigurationExtra getExtra() {
+// return parent.getNodeExtra();
+// }
public void setDisplayCasierLabel(boolean displayCasier) {
this.displayCasierLabel = displayCasier;
}
@@ -38,17 +42,36 @@
return displayCasierLabel;
}
+ public String getDisplayedLabel(CatEMHNoeud noeud, PlanimetryNodeLayerModel model) {
+ if (model.getNodeConfigurationExtra() != null) {
+ return model.getNodeConfigurationExtra().getDisplayedLabel(noeud, this);
+ }
+ String nom = noeud.getNom();
+ if (isDisplayCasierLabel()) {
+ if (noeud.getCasier() != null) {
+ if (noeud.getCasier().getActuallyActive() || isInactiveEMHVisible()) {
+ nom = nom + "\n" + noeud.getCasier().getNom();
+ }
+ }
+ }
+ return nom;
+ }
+
public boolean isInactiveEMHVisible() {
return parent.isInactiveEMHVisible();
}
@Override
public void initTraceIcon(TraceIconModel _ligne, int _idxPoint, PlanimetryPointLayerModel model) {
+ PlanimetryNodeLayerModel nodeModel = (PlanimetryNodeLayerModel) model;
super.initTraceIcon(_ligne, _idxPoint, model);
- CatEMHNoeud noeud = ((LayerNodeController) (model.getLayerController())).getNoeud(_idxPoint);
+ CatEMHNoeud noeud = nodeModel.getLayerController().getNoeud(_idxPoint);
if (!noeud.getActuallyActive()) {
_ligne.setCouleur(parent.getInactiveEMHColor());
}
+ if (nodeModel.getNodeConfigurationExtra() != null) {
+ nodeModel.getNodeConfigurationExtra().configureTraceIcon(_ligne, noeud, model);
+ }
}
public VisuConfiguration getParent() {
Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationExtra.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationExtra.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationExtra.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -0,0 +1,20 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.planimetry.configuration;
+
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryPointLayerModel;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface NodeConfigurationExtra {
+
+ public void configureTraceIcon(TraceIconModel _ligne, CatEMHNoeud noeud, PlanimetryPointLayerModel model);
+
+ public String getDisplayedLabel(CatEMHNoeud noeud, NodeConfiguration aThis);
+
+}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/VisuConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/VisuConfiguration.java 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/VisuConfiguration.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -30,6 +30,7 @@
CasierConfiguration casierConfiguration;
CondLimitConfiguration condLimiteConfiguration;
public static final Font DEFAULT_FONT = createDefaultFont();
+
private static final Font createDefaultFont() {
// Theme.font
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 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -18,6 +18,7 @@
import org.fudaa.fudaa.crue.planimetry.GeometryIndexer;
import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanel;
import org.fudaa.fudaa.crue.planimetry.action.OpenEMHAction;
+import org.fudaa.fudaa.crue.planimetry.configuration.NodeConfigurationExtra;
import org.fudaa.fudaa.crue.planimetry.configuration.VisuConfiguration;
import org.fudaa.fudaa.crue.planimetry.layer.LayerControllerEMH;
import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryNodeLayer;
@@ -33,7 +34,16 @@
public class LayerNodeController extends LayerModelControllerDefault<PlanimetryNodeLayer> implements LayerControllerEMH {
GeometryIndexer nodeIndexer;
+ NodeConfigurationExtra nodeConfigurationExtra;
+ public NodeConfigurationExtra getNodeConfigurationExtra() {
+ return nodeConfigurationExtra;
+ }
+
+ public void setNodeConfigurationExtra(NodeConfigurationExtra nodeConfigurationExtra) {
+ this.nodeConfigurationExtra = nodeConfigurationExtra;
+ }
+
protected static LayerNodeController install(PlanimetryController ctx, PlanimetryVisuPanel res,
VisuConfiguration configuration) {
LayerNodeController nodeController = new LayerNodeController();
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 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -23,8 +23,8 @@
*
* @author deniger ( genesis)
*/
-public class PlanimetryNodeLayer extends PlanimetryPointLayer<NodeConfiguration>
- implements LayerWithCascadeDeleteAction, PlanimetryLayerWithEMHContrat,CalqueWithDynamicActions {
+public class PlanimetryNodeLayer extends PlanimetryPointLayer<NodeConfiguration>
+ implements LayerWithCascadeDeleteAction, PlanimetryLayerWithEMHContrat, CalqueWithDynamicActions {
public PlanimetryNodeLayer(PlanimetryNodeLayerModel _modele, FSigEditor _editor) {
super(_modele, _editor);
@@ -35,6 +35,11 @@
}
@Override
+ public PlanimetryNodeLayerModel modeleDonnees() {
+ return (PlanimetryNodeLayerModel) super.modeleDonnees();
+ }
+
+ @Override
public EbliFindActionInterface getFinder() {
return new PlanimetryFindEMHLayerAction(this);
}
@@ -113,14 +118,7 @@
return;
}
CatEMHNoeud noeud = getNoeudController().getNoeud(idx);
- String nom = noeud.getNom();
- if (layerConfiguration.isDisplayCasierLabel()) {
- if (noeud.getCasier() != null) {
- if (noeud.getCasier().getActuallyActive() || layerConfiguration.isInactiveEMHVisible()) {
- nom = nom + "\n" + noeud.getCasier().getNom();
- }
- }
- }
+ String nom = layerConfiguration.getDisplayedLabel(noeud, (PlanimetryNodeLayerModel) modeleDonnees());
painter.paintLabels(g2d, pEcran, nom, labelConfiguration, alpha_);
}
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayerModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayerModel.java 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayerModel.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -15,6 +15,7 @@
import org.fudaa.dodico.crue.metier.emh.EnumNoeudType;
import org.fudaa.ebli.calque.edition.ZEditionAttributesDataI;
import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.fudaa.crue.planimetry.configuration.NodeConfigurationExtra;
import org.fudaa.fudaa.crue.planimetry.controller.LayerNodeController;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryControllerHelper;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryGisModelContainer;
@@ -25,10 +26,16 @@
*/
public class PlanimetryNodeLayerModel extends PlanimetryPointLayerModel<LayerNodeController> {
+ private NodeConfigurationExtra nodeConfigurationExtra;
+
public PlanimetryNodeLayerModel(GISZoneCollectionPoint _zone, LayerNodeController layerModelController) {
super(_zone, layerModelController);
}
+ public void setNodeConfigurationExtra(NodeConfigurationExtra nodeConfigurationExtra) {
+ this.nodeConfigurationExtra = nodeConfigurationExtra;
+ }
+
@Override
public boolean removePoint(int[] _idx, CtuluCommandContainer _cmd) {
return removeNoeuds(_idx, false);
@@ -103,4 +110,8 @@
List data = planimetryGisAttributeContext.buildNodeData(nd);
getGeometries().addGeometry(gisPt, data.toArray(), null);
}
+
+ public NodeConfigurationExtra getNodeConfigurationExtra() {
+ return nodeConfigurationExtra;
+ }
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayer.java 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayer.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -36,6 +36,7 @@
return getLayerController().isEditable();
}
+ @Override
public LayerController getLayerController() {
return modeleDonnees().getLayerController();
}
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2012-10-18 15:28:14 UTC (rev 7761)
@@ -167,7 +167,19 @@
<scope>provided</scope>
</dependency>
+ <!--bizarre, nécessaire pour les test-->
<dependency>
+ <groupId>jgrapht</groupId>
+ <artifactId>jgrapht</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jgraphx</groupId>
+ <artifactId>jgraphx</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/ReportTestHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/ReportTestHelper.java 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/ReportTestHelper.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -10,7 +10,9 @@
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JFrame;
@@ -21,6 +23,7 @@
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.IdRegistry;
import org.fudaa.dodico.crue.metier.emh.ResultatKey;
+import org.fudaa.dodico.crue.metier.etude.EMHProjectInfos;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.dodico.crue.projet.EMHScenarioContainer;
import org.fudaa.dodico.crue.projet.coeur.TestCoeurConfig;
@@ -38,10 +41,18 @@
public static Pair<EMHScenarioContainer, File> readScenario() {
Pair<EMHScenarioContainer, File> readScenarioAndRun = TestScenarioLoader.readScenarioAndRun();
PostServiceImpl postService = Lookup.getDefault().lookup(PostServiceImpl.class);
+ EMHProjet projet = new EMHProjet();
+ final EMHProjectInfos infos = new EMHProjectInfos();
+ Map<String, String> dir = new HashMap<String, String>();
+ dir.put(EMHProjectInfos.CONFIG, "nowherer");
+ infos.setDirectories(dir);
+ projet.setInfos(infos);
+
+ projet.setPropDefinition(TestCoeurConfig.INSTANCE);
+
//appele pour avoir le chargement:
ReportService reportService = Lookup.getDefault().lookup(ReportService.class);
- EMHProjet projet = new EMHProjet();
- projet.setPropDefinition(TestCoeurConfig.INSTANCE);
+
final EMHScenarioContainer first = readScenarioAndRun.first;
EMHScenario emhScenario = first.getEmhScenario();
IdRegistry idRegistry = new IdRegistry();
Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponentTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponentTest.java 2012-10-18 14:00:59 UTC (rev 7760)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponentTest.java 2012-10-18 15:28:14 UTC (rev 7761)
@@ -4,8 +4,22 @@
package org.fudaa.fudaa.crue.report;
import java.awt.EventQueue;
+import java.io.File;
+import org.fudaa.dodico.crue.common.Pair;
+import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.dodico.crue.projet.EMHScenarioContainer;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanel;
+import org.fudaa.fudaa.crue.planimetry.configuration.NodeConfiguration;
+import org.fudaa.fudaa.crue.planimetry.configuration.NodeConfigurationExtra;
+import org.fudaa.fudaa.crue.planimetry.layer.PlanimetryPointLayerModel;
+import org.fudaa.fudaa.crue.report.service.ReportVisuPanelService;
import org.junit.Assert;
import org.junit.Test;
+import org.openide.util.Lookup;
+import org.openide.util.Lookup.Result;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
/**
*
@@ -33,4 +47,50 @@
Assert.fail(ex.getMessage());
}
}
+
+ private static class TestConfig implements NodeConfigurationExtra {
+
+ @Override
+ public void configureTraceIcon(TraceIconModel _ligne, CatEMHNoeud noeud, PlanimetryPointLayerModel model) {
+ }
+
+ @Override
+ public String getDisplayedLabel(CatEMHNoeud noeud, NodeConfiguration aThis) {
+ return "essai\nessai";
+ }
+ }
+
+ public static void main(String[] args) {
+ //pour activer le service
+ System.setProperty("dev.etcDir", "C:\\data\\Fudaa-Crue\\etc");
+ final ReportVisuPanelService reportVisuPanelService = Lookup.getDefault().lookup(ReportVisuPanelService.class);
+ Result<PlanimetryVisuPanel> lookup = reportVisuPanelService.getLookup().lookupResult(PlanimetryVisuPanel.class);
+ lookup.addLookupListener(new LookupListener() {
+ @Override
+ public void resultChanged(LookupEvent ev) {
+ PlanimetryVisuPanel planimetryVisuPanel = reportVisuPanelService.getPlanimetryVisuPanel();
+ if (planimetryVisuPanel != null) {
+ planimetryVisuPanel.getPlanimetryController().getCqNoeud().modeleDonnees().setNodeConfigurationExtra(new TestConfig());
+ }
+ }
+ });
+ PlanimetryVisuPanel planimetryVisuPanel = reportVisuPanelService.getPlanimetryVisuPanel();
+ if (planimetryVisuPanel != null) {
+ planimetryVisuPanel.getPlanimetryController().getCqNoeud().modeleDonnees().setNodeConfigurationExtra(new TestConfig());
+ }
+ final Pair<EMHScenarioContainer, File> load = ReportTestHelper.readScenario();
+ final ReportVisualTopComponent topComponent = new ReportVisualTopComponent();
+ topComponent.open();
+ topComponent.runLoaded();
+ topComponent.setEditable(true);
+ reportVisuPanelService.resultChanged(null);
+
+ Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ ReportTestHelper.display(topComponent, load.second);
+ }
+ };
+ EventQueue.invokeLater(runnable);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
