Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7237] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-05-25 17:30:07
|
Revision: 7237
http://fudaa.svn.sourceforge.net/fudaa/?rev=7237&view=rev
Author: deniger
Date: 2012-05-25 17:29:59 +0000 (Fri, 25 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationV1_1_1.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/projet/TestChargementResultats.java
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/post-outputWsmode.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfiguration.java
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/layer/PlanimetryBrancheLayer.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/TestIntegration.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/TestUI.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfiguration.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfiguration.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/LayerModelController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/LayerModelControllerDefault.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayerModel.java
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/PlanimetryPointLayerModel.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/common/TestIntegration.java
Copied: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/TestIntegration.java (from rev 7209, trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/common/TestIntegration.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/TestIntegration.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/TestIntegration.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,9 @@
+package org.fudaa.dodico.crue.categories;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public interface TestIntegration {
+
+}
Added: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/TestUI.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/TestUI.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/categories/TestUI.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,8 @@
+package org.fudaa.dodico.crue.categories;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public interface TestUI {
+}
Deleted: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/common/TestIntegration.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/common/TestIntegration.java 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/common/TestIntegration.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -1,9 +0,0 @@
-package org.fudaa.dodico.crue.common;
-
-/**
- *
- * @author deniger ( genesis)
- */
-public interface TestIntegration {
-
-}
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationV1_1_1.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationV1_1_1.java 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationV1_1_1.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -10,7 +10,7 @@
import org.fudaa.dodico.crue.projet.coeur.TestCoeurConfig;
import org.junit.experimental.categories.Category;
-@Category(org.fudaa.dodico.crue.common.TestIntegration.class)
+@Category(org.fudaa.dodico.crue.categories.TestIntegration.class)
public class TestIntegrationV1_1_1 extends TestIntegrationTemplate {
/**
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/projet/TestChargementResultats.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/projet/TestChargementResultats.java 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/projet/TestChargementResultats.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -35,7 +35,7 @@
*
* @author deniger ( genesis)
*/
-@Category(org.fudaa.dodico.crue.common.TestIntegration.class)
+@Category(org.fudaa.dodico.crue.categories.TestIntegration.class)
public class TestChargementResultats {
static File targetDir;
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/pom.xml 2012-05-25 17:29:59 UTC (rev 7237)
@@ -41,7 +41,7 @@
<module>ui-loader</module>
<module>ui-commandline</module>
<module>ui-wrapper</module>
- <module>ui-planimetry</module>
+<!-- <module>ui-planimetry</module>-->
</modules>
<dependencyManagement>
<dependencies>
@@ -74,11 +74,6 @@
<artifactId>utils</artifactId>
<version>1.07.00</version>
</dependency>
-<!-- <dependency>
- <groupId>org.fudaa.framework.fudaa</groupId>
- <artifactId>fudaa-common</artifactId>
- <version>${fudaa-common.version}</version>
- </dependency>-->
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-server</artifactId>
@@ -132,12 +127,12 @@
<version>${project.version}</version>
<type>nbm</type>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>ui-planimetry</artifactId>
<version>${project.version}</version>
<type>nbm</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>ui-post</artifactId>
@@ -202,6 +197,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
+ <configuration>
+<!-- par défaut les tests ui sont désactivés-->
+ <excludedGroups>org.fudaa.dodico.crue.categories.TestUI.class</excludedGroups>
+ <parallel>methods</parallel>
+ <threadCount>5</threadCount>
+ </configuration>
</plugin>
<plugin>
@@ -235,7 +236,7 @@
</plugin>
</plugins>
</build>
- <!--pour �viter de lancer les tests d'int�gration-->
+ <!--pour eviter de lancer les tests d'integration-->
<profiles>
<profile>
<id>noIntegrationTests</id>
@@ -245,7 +246,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludedGroups>org.fudaa.dodico.crue.common.TestIntegration.class</excludedGroups>
+ <excludedGroups>org.fudaa.dodico.crue.categories.TestIntegration.class</excludedGroups>
<parallel>methods</parallel>
<threadCount>5</threadCount>
</configuration>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2012-05-25 17:29:59 UTC (rev 7237)
@@ -31,11 +31,11 @@
<artifactId>ui-wrapper</artifactId>
<type>nbm</type>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ui-planimetry</artifactId>
<type>nbm</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/post-outputWsmode.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/post-outputWsmode.xml 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/post-outputWsmode.xml 2012-05-25 17:29:59 UTC (rev 7237)
@@ -5,10 +5,10 @@
<kind type="view" />
<state type="joined" />
<constraints>
- <path orientation="horizontal" number="60" weight="0.7"/>
+ <path orientation="horizontal" number="102" weight="0.80"/>
<path orientation="vertical" number="40" weight="0.7"/>
- <path orientation="horizontal" number="40" weight="0.7"/>
- <path orientation="vertical" number="1" weight="0.25"/>
+ <path orientation="horizontal" number="41" weight="0.7"/>
+ <path orientation="vertical" number="1" weight="0.5"/>
</constraints>
<bounds x="0" y="0" width="0" height="0"/>
<frame state="0"/>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2012-05-25 17:29:59 UTC (rev 7237)
@@ -102,7 +102,12 @@
<artifactId>org-openide-filesystems</artifactId>
<version>${netbeans.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -176,4 +181,12 @@
</plugins>
</pluginManagement>
</build>
+ <repositories>
+ <repository>
+ <url>http://repo1.maven.org/maven2/</url>
+ <id>junit_4</id>
+ <layout>default</layout>
+ <name>Repository for library Library[junit_4]</name>
+ </repository>
+ </repositories>
</project>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2012-05-25 17:29:59 UTC (rev 7237)
@@ -30,11 +30,11 @@
<artifactId>ui-wrapper</artifactId>
<type>nbm</type>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ui-planimetry</artifactId>
<type>nbm</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfiguration.java 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfiguration.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -14,7 +14,7 @@
*
* @author deniger ( genesis)
*/
-public class BrancheConfiguration {
+public class BrancheConfiguration extends LigneBriseeConfiguration {
TraceLigneModel lineForBranche = new TraceLigneModel(TraceLigne.LISSE, 4f, Color.BLACK);//la couleur n'a pas d'importance.
TraceIconModel iconForLinePoints = new TraceIconModel(TraceIcon.CARRE_PLEIN, 4, Color.BLACK);
Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfiguration.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfiguration.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,20 @@
+package org.fudaa.fudaa.crue.planimetry.configuration;
+
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigneModel;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public abstract class LigneBriseeConfiguration {
+
+ /**
+ * Appele par le calque pour intialiser le trace de la ligne
+ * @param _ligne le modele à modifier
+ * @param _idxPoly l'indice dans le model de calque.
+ */
+ public abstract void initTraceLigne(final TraceLigneModel _ligne, final int _idxPoly);
+
+ public abstract void initTraceAtomicIcon(final TraceIconModel _ligne, final int _idxPoly);
+}
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-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfiguration.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -11,7 +11,7 @@
*
* @author deniger ( genesis)
*/
-public class NodeConfiguration {
+public class NodeConfiguration extends PointConfiguration {
TraceIconModel iconModel = new TraceIconModel(TraceIcon.CERCLE, 4, Color.BLACK);//cette couleur n'est pas prise en compte
TraceLigne lineUsedForIcon = new TraceLigne(TraceLigne.LISSE, 1.5f, Color.BLACK);
Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfiguration.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfiguration.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,12 @@
+package org.fudaa.fudaa.crue.planimetry.configuration;
+
+import org.fudaa.ebli.trace.TraceIconModel;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public abstract class PointConfiguration {
+
+ public abstract void initTraceIcon(final TraceIconModel _ligne, final int _idxPoint);
+}
Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/LayerModelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/LayerModelController.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/LayerModelController.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,15 @@
+package org.fudaa.fudaa.crue.planimetry.layer;
+
+import org.fudaa.ebli.calque.edition.ZModeleEditable;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public interface LayerModelController {
+
+ /**
+ * Appele avant chaq
+ */
+ void changeWillBeDone(ZModeleEditable modele);
+}
Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/LayerModelControllerDefault.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/LayerModelControllerDefault.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/LayerModelControllerDefault.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,24 @@
+package org.fudaa.fudaa.crue.planimetry.layer;
+
+import org.fudaa.ebli.calque.edition.ZModeleEditable;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class LayerModelControllerDefault implements LayerModelController {
+
+ boolean edited;
+
+ @Override
+ public void changeWillBeDone(ZModeleEditable modele) {
+ //a copy must be done to undo changes
+ if(!edited){
+ modele.getGeomData().clone();
+
+ }
+ }
+
+
+
+}
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 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -1,35 +1,26 @@
package org.fudaa.fudaa.crue.planimetry.layer;
import java.awt.Graphics2D;
-import org.fudaa.ctulu.CtuluListSelection;
import org.fudaa.ctulu.gis.GISPolyligne;
import org.fudaa.ctulu.gis.GisAbscCurviligneToCoordinate;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrMorphisme;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.trace.TraceIcon;
-import org.fudaa.ebli.trace.TraceIconModel;
-import org.fudaa.ebli.trace.TraceLigneModel;
import org.fudaa.fudaa.crue.planimetry.PlanimetryCalqueContext;
import org.fudaa.fudaa.crue.planimetry.configuration.BrancheConfiguration;
import org.fudaa.fudaa.sig.layer.FSigEditor;
-import org.fudaa.fudaa.sig.layer.FSigLayerLineEditable;
/**
*
* @author deniger ( genesis)
*/
-public class PlanimetryBrancheLayer extends FSigLayerLineEditable {
+public class PlanimetryBrancheLayer extends PlanimetryLigneBriseeLayer<BrancheConfiguration> {
- BrancheConfiguration brancheConfiguration;
PlanimetryCalqueContext planimetryCalqueContext;
- public PlanimetryBrancheLayer() {
- }
-
- public PlanimetryBrancheLayer(ZModeleLigneBriseeEditable _modele, FSigEditor _editor) {
+ public PlanimetryBrancheLayer(PlanimetryBrancheModel _modele, FSigEditor _editor) {
super(_modele, _editor);
}
@@ -47,50 +38,6 @@
}
@Override
- protected void initTrace(TraceIconModel _icon, int _idxPoly) {
- //si non sélectionne on ne voit pas
- _icon.setType(TraceIcon.RIEN);
- if (isSelected(_idxPoly)) {
- TraceIconModel iconModel = brancheConfiguration.getIconForLinePoints();
- _icon.setTaille(iconModel.getTaille());
- _icon.setType(iconModel.getType());
- CatEMHBranche branche = planimetryCalqueContext.getHelper().getBranche(_idxPoly);
- _icon.setCouleur(brancheConfiguration.getColor(branche));
-
- }
- }
-
- private boolean isSelected(int idxBranche) {
- if (this.getSelectionMode() == SelectionMode.NORMAL && selection_ != null) {
- return selection_.isSelected(idxBranche);
- }
- if (selectionMulti_ != null) {
- final CtuluListSelection selection = selectionMulti_.get(idxBranche);
- return selection != null && !selection.isEmpty();
- }
- return false;
-
- }
-
- @Override
- protected void initTrace(final TraceLigneModel _ligne, final int _idxPoly) {
- TraceLigneModel ligneModel = brancheConfiguration.getLigneModel();
- _ligne.setEpaisseur(ligneModel.getEpaisseur());
- _ligne.setTypeTrait(ligneModel.getTypeTrait());
- CatEMHBranche branche = planimetryCalqueContext.getHelper().getBranche(_idxPoly);
- _ligne.setColor(brancheConfiguration.getColor(branche));
-
- }
-
- public BrancheConfiguration getBrancheConfiguration() {
- return brancheConfiguration;
- }
-
- public void setBrancheConfiguration(BrancheConfiguration brancheConfiguration) {
- this.brancheConfiguration = brancheConfiguration;
- }
-
- @Override
public boolean canAddForme(int _typeForme) {
return false;
}
@@ -119,9 +66,9 @@
if (_clipReel.contientXY(pt)) {
pt.autoApplique(_versEcran);
CatEMHBranche branche = planimetryCalqueContext.getHelper().getBranche(i);
- TraceIcon icon = brancheConfiguration.getMiddleIcon(branche);
+ TraceIcon icon = super.layerConfiguration.getMiddleIcon(branche);
icon.paintIconCentre(_g, pt.x_, pt.y_);
- labelPainter.paintLabels(_g, pt, branche.getNom(), brancheConfiguration.getLabelConfiguration());
+ labelPainter.paintLabels(_g, pt, branche.getNom(), layerConfiguration.getLabelConfiguration());
}
}
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -3,31 +3,24 @@
import gnu.trove.TObjectDoubleHashMap;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
-import org.fudaa.ctulu.gis.GISPolyligne;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
-import org.fudaa.ctulu.gis.GisAbscCurviligneToCoordinate;
import org.fudaa.dodico.crue.config.CrueConfigMetier;
import org.fudaa.dodico.crue.config.PropertyEpsilon;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
-import org.fudaa.dodico.crue.metier.emh.CatEMHSection;
import org.fudaa.dodico.crue.metier.emh.EnumPosSection;
import org.fudaa.dodico.crue.metier.emh.RelationEMHSectionDansBranche;
import org.fudaa.dodico.crue.metier.factory.PredicateFactory;
-import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
/**
*
* @author deniger ( genesis)
*/
-public class PlanimetryBrancheModel extends ZModeleLigneBriseeEditable {
+public class PlanimetryBrancheModel extends PlanimetryLigneBriseeLayerModel {
- public PlanimetryBrancheModel(GISZoneCollectionLigneBrisee _zone) {
- super(_zone);
+ public PlanimetryBrancheModel(GISZoneCollectionLigneBrisee _zone, LayerModelController modelController) {
+ super(_zone, modelController);
}
- public PlanimetryBrancheModel() {
- }
-
TObjectDoubleHashMap<RelationEMHSectionDansBranche> getRatio(int position, CatEMHBranche branche, double minRealDistance,
CrueConfigMetier confMetier) {
TObjectDoubleHashMap<RelationEMHSectionDansBranche> res = new TObjectDoubleHashMap<RelationEMHSectionDansBranche>();
Copied: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java (from rev 7230, 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/PlanimetryLigneBriseeLayer.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayer.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,52 @@
+package org.fudaa.fudaa.crue.planimetry.layer;
+
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.crue.planimetry.configuration.LigneBriseeConfiguration;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+import org.fudaa.fudaa.sig.layer.FSigLayerLineEditable;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class PlanimetryLigneBriseeLayer<T extends LigneBriseeConfiguration> extends FSigLayerLineEditable {
+
+ T layerConfiguration;
+
+ public PlanimetryLigneBriseeLayer(PlanimetryLigneBriseeLayerModel _modele, FSigEditor _editor) {
+ super(_modele, _editor);
+ }
+
+ @Override
+ protected void initTrace(TraceIconModel _icon, int _idxPoly) {
+ if (!isSelected(_idxPoly)) {
+ _icon.setType(TraceIcon.RIEN);
+ return;
+ }
+ layerConfiguration.initTraceLigne(ligneModel_, _idxPoly);
+ }
+
+ @Override
+ protected void initTrace(final TraceLigneModel _ligne, final int _idxPoly) {
+ layerConfiguration.initTraceLigne(ligneModel_, _idxPoly);
+ }
+
+ protected boolean isSelected(int idxGeometry) {
+ if (this.getSelectionMode() == SelectionMode.NORMAL && selection_ != null) {
+ return selection_.isSelected(idxGeometry);
+ }
+ if (selectionMulti_ != null) {
+ final CtuluListSelection selection = selectionMulti_.get(idxGeometry);
+ return selection != null && !selection.isEmpty();
+ }
+ return false;
+
+ }
+
+ public void setLayerConfiguration(T brancheConfiguration) {
+ this.layerConfiguration = brancheConfiguration;
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayerModel.java (from rev 7227, trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheModel.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayerModel.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryLigneBriseeLayerModel.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,111 @@
+package org.fudaa.fudaa.crue.planimetry.layer;
+
+import com.vividsolutions.jts.geom.Geometry;
+import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluListSelectionInterface;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ebli.calque.edition.ZEditionAttributesDataI;
+import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
+import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
+import org.fudaa.ebli.geometrie.GrPolygone;
+import org.fudaa.ebli.geometrie.GrPolyligne;
+
+/**
+ * Un modele que tous les modeles de calques éditables doivent utilsées. Permet de gérer les modifications, en faisant une copie
+ * des données avant toutes modifications via l'UI
+ *
+ * @author deniger ( genesis)
+ */
+public class PlanimetryLigneBriseeLayerModel extends ZModeleLigneBriseeEditable {
+
+ private LayerModelController modelController;
+
+ public PlanimetryLigneBriseeLayerModel(GISZoneCollectionLigneBrisee _zone, LayerModelController modelController) {
+ super(_zone);
+ }
+
+ public PlanimetryLigneBriseeLayerModel() {
+ }
+
+ @Override
+ public void addPoint(int _ligneIdx, int _idxBefore, double _x, double _y, Double _z, CtuluCommandContainer _cmd) {
+ modelController.changeWillBeDone(this);
+ super.addPoint(_ligneIdx, _idxBefore, _x, _y, _z, _cmd);
+ }
+
+ @Override
+ protected boolean removeAtomicObjects(EbliListeSelectionMultiInterface _selection, CtuluCommandContainer _cmd, CtuluUI _ui) {
+ modelController.changeWillBeDone(this);
+ return super.removeAtomicObjects(_selection, _cmd, _ui);
+ }
+
+ @Override
+ public boolean addGeometry(Geometry _p, CtuluCommandContainer _cmd, CtuluUI _ui, ZEditionAttributesDataI _d) {
+ modelController.changeWillBeDone(this);
+ return super.addGeometry(_p, _cmd, _ui, _d);
+ }
+
+ @Override
+ public boolean addGeometry(GrPolygone _p, CtuluCommandContainer _cmd, CtuluUI _ui, ZEditionAttributesDataI _d) {
+ modelController.changeWillBeDone(this);
+ return super.addGeometry(_p, _cmd, _ui, _d);
+ }
+
+ @Override
+ public boolean addGeometry(GrPolyligne _p, CtuluCommandContainer _cmd, CtuluUI _ui, ZEditionAttributesDataI _d) {
+ modelController.changeWillBeDone(this);
+ return super.addGeometry(_p, _cmd, _ui, _d);
+ }
+
+ @Override
+ public boolean closeGeometry(int _ligneIdx, CtuluCommandContainer _cmd) {
+ modelController.changeWillBeDone(this);
+ return super.closeGeometry(_ligneIdx, _cmd);
+ }
+
+ @Override
+ public void invertGeometry(int _idxGeom, CtuluCommandContainer _cmd) {
+ modelController.changeWillBeDone(this);
+ super.invertGeometry(_idxGeom, _cmd);
+ }
+
+ @Override
+ public void modifyProperty(String _key, Object _value, int[] _index, CtuluCommandContainer _cmd) {
+ modelController.changeWillBeDone(this);
+ super.modifyProperty(_key, _value, _index, _cmd);
+ }
+
+ @Override
+ public boolean moveAtomic(EbliListeSelectionMultiInterface _selection, double _dx, double _dy, double _dz,
+ CtuluCommandContainer _cmd, CtuluUI _ui) {
+ modelController.changeWillBeDone(this);
+ return super.moveAtomic(_selection, _dx, _dy, _dz, _cmd, _ui);
+ }
+
+ @Override
+ public boolean moveGlobal(CtuluListSelectionInterface _selection, double _dx, double _dy, double _dz, CtuluCommandContainer _cmd) {
+ modelController.changeWillBeDone(this);
+ return super.moveGlobal(_selection, _dx, _dy, _dz, _cmd);
+ }
+
+ @Override
+ public boolean removeLigneBrisee(int[] _idx, CtuluCommandContainer _cmd) {
+ modelController.changeWillBeDone(this);
+ return super.removeLigneBrisee(_idx, _cmd);
+ }
+
+ @Override
+ public boolean rotateAtomic(EbliListeSelectionMultiInterface _selection, double _angRad, double _xreel0, double _yreel0,
+ CtuluCommandContainer _cmd, CtuluUI _ui) {
+ modelController.changeWillBeDone(this);
+ return super.rotateAtomic(_selection, _angRad, _xreel0, _yreel0, _cmd, _ui);
+ }
+
+ @Override
+ public boolean rotateGlobal(CtuluListSelectionInterface _selection, double _angRad, double _xreel0, double _yreel0,
+ CtuluCommandContainer _cmd) {
+ modelController.changeWillBeDone(this);
+ return super.rotateGlobal(_selection, _angRad, _xreel0, _yreel0, _cmd);
+ }
+}
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-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -2,25 +2,21 @@
import java.awt.Graphics2D;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
-import org.fudaa.ebli.calque.edition.ZModelePointEditable;
import org.fudaa.ebli.geometrie.GrPoint;
-import org.fudaa.ebli.trace.TraceIcon;
import org.fudaa.fudaa.crue.planimetry.PlanimetryCalqueContext;
import org.fudaa.fudaa.crue.planimetry.configuration.LabelConfiguration;
import org.fudaa.fudaa.crue.planimetry.configuration.NodeConfiguration;
import org.fudaa.fudaa.sig.layer.FSigEditor;
-import org.fudaa.fudaa.sig.layer.FSigLayerPointEditable;
/**
*
* @author deniger ( genesis)
*/
-public class PlanimetryNodeLayer extends FSigLayerPointEditable {
+public class PlanimetryNodeLayer extends PlanimetryPointLayer<NodeConfiguration> {
- private NodeConfiguration nodeConfiguration;
PlanimetryCalqueContext planimetryCalqueContext;
- public PlanimetryNodeLayer(ZModelePointEditable _modele, FSigEditor _editor) {
+ public PlanimetryNodeLayer(PlanimetryPointLayerModel _modele, FSigEditor _editor) {
super(_modele, _editor);
}
@@ -32,23 +28,7 @@
this.planimetryCalqueContext = planimetryCalqueContext;
}
- public NodeConfiguration getNodeConfiguration() {
- return nodeConfiguration;
- }
-
- public void setNodeConfiguration(NodeConfiguration nodeConfiguration) {
- this.nodeConfiguration = nodeConfiguration;
- }
-
@Override
- protected TraceIcon getTraceIcon() {
- if (nodeConfiguration != null) {
- return nodeConfiguration.createTraceIcon();
- }
- return super.getTraceIcon();
- }
-
- @Override
public boolean canAddForme(int _typeForme) {
return false;
}
@@ -56,7 +36,7 @@
@Override
protected void paintLabels(final Graphics2D g2d, int idx, GrPoint pEcran) {
- LabelConfiguration labelConfiguration = nodeConfiguration.getLabelConfiguration();
+ LabelConfiguration labelConfiguration = layerConfiguration.getLabelConfiguration();
CatEMHNoeud noeud = planimetryCalqueContext.getHelper().getNoeud(idx);
painter.paintLabels(g2d, pEcran, noeud.getNom(), labelConfiguration);
}
Copied: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayer.java (from rev 7230, 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/PlanimetryPointLayer.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayer.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,24 @@
+package org.fudaa.fudaa.crue.planimetry.layer;
+
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.fudaa.crue.planimetry.configuration.PointConfiguration;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+import org.fudaa.fudaa.sig.layer.FSigLayerPointEditable;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class PlanimetryPointLayer<T extends PointConfiguration> extends FSigLayerPointEditable {
+
+ protected T layerConfiguration;
+
+ public PlanimetryPointLayer(PlanimetryPointLayerModel _modele, FSigEditor _editor) {
+ super(_modele, _editor);
+ }
+
+ @Override
+ protected void initTrace(TraceIconModel model, int i, double z) {
+ layerConfiguration.initTraceIcon(model, i);
+ }
+}
Added: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayerModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayerModel.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryPointLayerModel.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -0,0 +1,43 @@
+package org.fudaa.fudaa.crue.planimetry.layer;
+
+import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluListSelectionInterface;
+import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
+import org.fudaa.ebli.calque.edition.ZEditionAttributesDataI;
+import org.fudaa.ebli.calque.edition.ZModelePointEditable;
+import org.fudaa.ebli.geometrie.GrPoint;
+
+/**
+ *Un modele que tous les modeles de calques éditables doivent utilsées. Permet de gérer les modifications, en faisant une copie des données
+ * avant toutes modifications via l'UI
+ *
+ * @author deniger ( genesis)
+ */
+public class PlanimetryPointLayerModel extends ZModelePointEditable {
+
+ private final LayerModelController layerModelController;
+
+ public PlanimetryPointLayerModel(GISZoneCollectionPoint _zone, final LayerModelController layerModelController) {
+ super(_zone);
+ this.layerModelController = layerModelController;
+ }
+
+ @Override
+ public boolean copyGlobal(CtuluListSelectionInterface _selection, double _dx, double _dy, CtuluCommandContainer _cmd) {
+ layerModelController.changeWillBeDone(this);
+ return super.copyGlobal(_selection, _dx, _dy, _cmd);
+ }
+
+ @Override
+ public void addPoint(GrPoint _p, ZEditionAttributesDataI _data, CtuluCommandContainer _cmd) {
+ layerModelController.changeWillBeDone(this);
+ super.addPoint(_p, _data, _cmd);
+ }
+
+ @Override
+ public boolean removePoint(int[] _idx, CtuluCommandContainer _cmd) {
+ layerModelController.changeWillBeDone(this);
+ return super.removePoint(_idx, _cmd);
+ }
+
+}
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -27,7 +27,7 @@
@TopComponent.Description(preferredID = PostEmhExplorerTopComponent.TOPCOMPONENT_ID,
iconBase = "org/fudaa/fudaa/crue/post/carre-vert_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
-@TopComponent.Registration(mode = "post-topLeft", openAtStartup = false)
+@TopComponent.Registration(mode = "post-topRight", openAtStartup = false)
@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.post.PostEmhExplorerTopComponent")
@TopComponent.OpenActionRegistration(displayName = "#CTL_PostEmhExplorerTopComponent",
preferredID = PostEmhExplorerTopComponent.TOPCOMPONENT_ID)
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java 2012-05-25 17:17:37 UTC (rev 7236)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java 2012-05-25 17:29:59 UTC (rev 7237)
@@ -11,7 +11,6 @@
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.dodico.crue.config.SeveriteManager;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
-import org.fudaa.fudaa.crue.common.RoleNames;
import org.fudaa.fudaa.crue.common.log.CtuluLogGroupChildFactory;
import org.fudaa.fudaa.crue.common.log.CtuluLogsTopComponent;
import org.fudaa.fudaa.crue.common.services.PostRunService;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
