fudaa-svn-commit — svn commit with diffs

[Fudaa-svn-commit] SF.net SVN: fudaa:[9573] trunk/soft/fudaa-crue/ui-views/pom.xml

[<de...@us...>]

Revision: 9573
          http://sourceforge.net/p/fudaa/svn/9573
Author:   deniger
Date:     2017-05-21 20:01:18 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.3

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-views/pom.xml

Modified: trunk/soft/fudaa-crue/ui-views/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-views/pom.xml	2017-05-21 20:01:08 UTC (rev 9572)
+++ trunk/soft/fudaa-crue/ui-views/pom.xml	2017-05-21 20:01:18 UTC (rev 9573)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-views</artifactId>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9572] trunk/soft/fudaa-crue/crue-compare/pom.xml

[<de...@us...>]

Revision: 9572
          http://sourceforge.net/p/fudaa/svn/9572
Author:   deniger
Date:     2017-05-21 20:01:08 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.3

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-compare/pom.xml

Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml	2017-05-21 19:59:56 UTC (rev 9571)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml	2017-05-21 20:01:08 UTC (rev 9572)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3</version>
   </parent>
   <artifactId>crue-compare</artifactId>
   <name>Crue Compare</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9571] trunk/soft/fudaa-crue/pom.xml

[<de...@us...>]

Revision: 9571
          http://sourceforge.net/p/fudaa/svn/9571
Author:   deniger
Date:     2017-05-21 19:59:56 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.3

Modified Paths:
--------------
    trunk/soft/fudaa-crue/pom.xml

Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml	2017-05-21 19:44:48 UTC (rev 9570)
+++ trunk/soft/fudaa-crue/pom.xml	2017-05-21 19:59:56 UTC (rev 9571)
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-crue</groupId>
   <artifactId>fudaa-crue</artifactId>
-  <version>1.3-SNAPSHOT</version>
+  <version>1.3</version>
   <name>Fudaa-Crue</name>
   <packaging>pom</packaging>
   <ciManagement>
@@ -20,7 +20,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <javaCompiler>1.8</javaCompiler>
     <targetJdk>1.8</targetJdk>
-    <fudaa-sig.version>1.9-SNAPSHOT</fudaa-sig.version>
+    <fudaa-sig.version>1.9</fudaa-sig.version>
     <netbeans.run.params.ide />
     <netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
     <!--<netbeans.version>RELEASE731</netbeans.version>-->

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9570] tags/business

[<de...@us...>]

Revision: 9570
          http://sourceforge.net/p/fudaa/svn/9570
Author:   deniger
Date:     2017-05-21 19:44:48 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.9

Added Paths:
-----------
    tags/business/fudaa-sig-1.9/
    tags/business/fudaa-sig-1.9/fudaa-sig/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9569] trunk/business/fudaa-sig/pom.xml

[<de...@us...>]

Revision: 9569
          http://sourceforge.net/p/fudaa/svn/9569
Author:   deniger
Date:     2017-05-21 19:43:50 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.9

Modified Paths:
--------------
    trunk/business/fudaa-sig/pom.xml

Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml	2017-05-21 19:41:11 UTC (rev 9568)
+++ trunk/business/fudaa-sig/pom.xml	2017-05-21 19:43:50 UTC (rev 9569)
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <properties>
-    <dodico-h2d.version>1.9-SNAPSHOT</dodico-h2d.version>
+    <dodico-h2d.version>1.9</dodico-h2d.version>
     <javaCompiler>1.7</javaCompiler>
     <targetJdk>1.7</targetJdk>
   </properties>
@@ -14,7 +14,7 @@
   </parent>
   <groupId>org.fudaa.business.fudaa-sig</groupId>
   <artifactId>fudaa-sig</artifactId>
-  <version>1.9-SNAPSHOT</version>
+  <version>1.9</version>
   <name>fudaa-sig</name>
   <dependencyManagement>
     <dependencies>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9568] tags/business

[<de...@us...>]

Revision: 9568
          http://sourceforge.net/p/fudaa/svn/9568
Author:   deniger
Date:     2017-05-21 19:41:11 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.9

Added Paths:
-----------
    tags/business/dodico-h2d-1.9/
    tags/business/dodico-h2d-1.9/dodico-h2d/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9567] trunk/business/dodico-h2d/io/pom.xml

[<de...@us...>]

Revision: 9567
          http://sourceforge.net/p/fudaa/svn/9567
Author:   deniger
Date:     2017-05-21 19:40:10 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.9

Modified Paths:
--------------
    trunk/business/dodico-h2d/io/pom.xml

Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml	2017-05-21 19:39:37 UTC (rev 9566)
+++ trunk/business/dodico-h2d/io/pom.xml	2017-05-21 19:40:10 UTC (rev 9567)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.business.dodico-h2d</groupId>
 		<artifactId>dodico-h2d</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<artifactId>h2d-io</artifactId>
 	<name>I/O pour h2d</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9566] trunk/business/dodico-h2d/core/pom.xml

[<de...@us...>]

Revision: 9566
          http://sourceforge.net/p/fudaa/svn/9566
Author:   deniger
Date:     2017-05-21 19:39:37 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.9

Modified Paths:
--------------
    trunk/business/dodico-h2d/core/pom.xml

Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml	2017-05-21 19:39:09 UTC (rev 9565)
+++ trunk/business/dodico-h2d/core/pom.xml	2017-05-21 19:39:37 UTC (rev 9566)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.business.dodico-h2d</groupId>
 		<artifactId>dodico-h2d</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<artifactId>h2d-core</artifactId>
 	<name>Core h2d</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9565] trunk/business/dodico-h2d/pom.xml

[<de...@us...>]

Revision: 9565
          http://sourceforge.net/p/fudaa/svn/9565
Author:   deniger
Date:     2017-05-21 19:39:09 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.9

Modified Paths:
--------------
    trunk/business/dodico-h2d/pom.xml

Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml	2017-05-21 19:33:18 UTC (rev 9564)
+++ trunk/business/dodico-h2d/pom.xml	2017-05-21 19:39:09 UTC (rev 9565)
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<properties>
-		<fudaa-ef.version>1.9-SNAPSHOT</fudaa-ef.version>
+		<fudaa-ef.version>1.9</fudaa-ef.version>
 		<projetEncoding>ISO-8859-15</projetEncoding>
 		<!-- la version du compiler -->
 		<javaCompiler>1.7</javaCompiler>
@@ -16,7 +16,7 @@
 	</parent>
 	<groupId>org.fudaa.business.dodico-h2d</groupId>
 	<artifactId>dodico-h2d</artifactId>
-	<version>1.9-SNAPSHOT</version>
+	<version>1.9</version>
 	<name>Fudaa Hydraulique 2d</name>
 	<packaging>pom</packaging>
 	<modules>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9564] tags/business

[<de...@us...>]

Revision: 9564
          http://sourceforge.net/p/fudaa/svn/9564
Author:   deniger
Date:     2017-05-21 19:33:18 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.9

Added Paths:
-----------
    tags/business/fudaa-ef-1.9/
    tags/business/fudaa-ef-1.9/fudaa-ef/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9563] trunk/business/fudaa-ef/core/pom.xml

[<de...@us...>]

Revision: 9563
          http://sourceforge.net/p/fudaa/svn/9563
Author:   deniger
Date:     2017-05-21 19:31:58 +0000 (Sun, 21 May 2017)
Log Message:
-----------
dsfdsf

Modified Paths:
--------------
    trunk/business/fudaa-ef/core/pom.xml

Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml	2017-05-21 19:31:49 UTC (rev 9562)
+++ trunk/business/fudaa-ef/core/pom.xml	2017-05-21 19:31:58 UTC (rev 9563)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.business.fudaa-ef</groupId>
     <artifactId>fudaa-ef</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
   </parent>
   <groupId>org.fudaa.business.fudaa-ef</groupId>
   <artifactId>ef-core</artifactId>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9562] trunk/business/fudaa-ef/io/pom.xml

[<de...@us...>]

Revision: 9562
          http://sourceforge.net/p/fudaa/svn/9562
Author:   deniger
Date:     2017-05-21 19:31:49 +0000 (Sun, 21 May 2017)
Log Message:
-----------
dsfdsf

Modified Paths:
--------------
    trunk/business/fudaa-ef/io/pom.xml

Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml	2017-05-21 19:30:56 UTC (rev 9561)
+++ trunk/business/fudaa-ef/io/pom.xml	2017-05-21 19:31:49 UTC (rev 9562)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.business.fudaa-ef</groupId>
 		<artifactId>fudaa-ef</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.business.fudaa-ef</groupId>
 	<artifactId>ef-io</artifactId>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9561] trunk/business/fudaa-ef/pom.xml

[<de...@us...>]

Revision: 9561
          http://sourceforge.net/p/fudaa/svn/9561
Author:   deniger
Date:     2017-05-21 19:30:56 +0000 (Sun, 21 May 2017)
Log Message:
-----------


Modified Paths:
--------------
    trunk/business/fudaa-ef/pom.xml

Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml	2017-05-21 19:22:20 UTC (rev 9560)
+++ trunk/business/fudaa-ef/pom.xml	2017-05-21 19:30:56 UTC (rev 9561)
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<properties>
-		<fudaa-framework.version>1.9-SNAPSHOT</fudaa-framework.version>
+		<fudaa-framework.version>1.9</fudaa-framework.version>
 		<projetEncoding>ISO-8859-15</projetEncoding>
 		<!-- la version du compiler -->
 		<javaCompiler>1.7</javaCompiler>
@@ -16,7 +16,7 @@
 	</parent>
 	<groupId>org.fudaa.business.fudaa-ef</groupId>
 	<artifactId>fudaa-ef</artifactId>
-	<version>1.9-SNAPSHOT</version>
+	<version>1.9</version>
 	<name>Fudaa-Ef Elements finis</name>
 	<packaging>pom</packaging>
 	<modules>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9560] tags/framework

[<de...@us...>]

Revision: 9560
          http://sourceforge.net/p/fudaa/svn/9560
Author:   deniger
Date:     2017-05-21 19:22:20 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 1.9 livraison fudaa-crue

Added Paths:
-----------
    tags/framework/fudaa-framework-1.9/
    tags/framework/fudaa-framework-1.9/framework/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9559] trunk/framework

[<de...@us...>]

Revision: 9559
          http://sourceforge.net/p/fudaa/svn/9559
Author:   deniger
Date:     2017-05-21 19:18:29 +0000 (Sun, 21 May 2017)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-bu/pom.xml
    trunk/framework/ctulu-common/pom.xml
    trunk/framework/ctulu-fu/pom.xml
    trunk/framework/ctulu-gis/pom.xml
    trunk/framework/ctulu-ui/pom.xml
    trunk/framework/ctulu-video/pom.xml
    trunk/framework/dodico-common/pom.xml
    trunk/framework/ebli-1d/pom.xml
    trunk/framework/ebli-2d/pom.xml
    trunk/framework/ebli-3d/pom.xml
    trunk/framework/ebli-common/pom.xml
    trunk/framework/ebli-graphe/pom.xml
    trunk/framework/ebli-graphe-3D/pom.xml
    trunk/framework/ebli-network/pom.xml
    trunk/framework/ebli-visuallibrary/pom.xml
    trunk/framework/fudaa-common/pom.xml
    trunk/framework/fudaa-common-courbe/pom.xml
    trunk/framework/fudaa-common-save/pom.xml
    trunk/framework/fudaa-dico/pom.xml
    trunk/framework/fudaa-dico/server/pom.xml
    trunk/framework/fudaa-dico/ui/pom.xml

Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-bu/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.ctulu</groupId>
 	<artifactId>ctulu-bu</artifactId>

Modified: trunk/framework/ctulu-common/pom.xml
===================================================================
--- trunk/framework/ctulu-common/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-common/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
   </parent>
   <groupId>org.fudaa.framework.ctulu</groupId>
   <artifactId>ctulu-common</artifactId>

Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-fu/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.ctulu</groupId>
 	<artifactId>ctulu-fu</artifactId>

Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-gis/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
   </parent>
   <groupId>org.fudaa.framework.ctulu</groupId>
   <artifactId>ctulu-gis</artifactId>

Modified: trunk/framework/ctulu-ui/pom.xml
===================================================================
--- trunk/framework/ctulu-ui/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-ui/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
   </parent>
   <groupId>org.fudaa.framework.ctulu</groupId>
   <artifactId>ctulu-ui</artifactId>

Modified: trunk/framework/ctulu-video/pom.xml
===================================================================
--- trunk/framework/ctulu-video/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ctulu-video/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.ctulu</groupId>
 	<artifactId>ctulu-video</artifactId>

Modified: trunk/framework/dodico-common/pom.xml
===================================================================
--- trunk/framework/dodico-common/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/dodico-common/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.dodico</groupId>
 	<artifactId>dodico-common</artifactId>

Modified: trunk/framework/ebli-1d/pom.xml
===================================================================
--- trunk/framework/ebli-1d/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-1d/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
   </parent>
   <groupId>org.fudaa.framework.ebli</groupId>
   <artifactId>ebli-1d</artifactId>

Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-2d/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
   </parent>
   <groupId>org.fudaa.framework.ebli</groupId>
   <artifactId>ebli-2d</artifactId>

Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-3d/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.ebli</groupId>
 	<artifactId>ebli-3d</artifactId>

Modified: trunk/framework/ebli-common/pom.xml
===================================================================
--- trunk/framework/ebli-common/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-common/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.ebli</groupId>
 	<artifactId>ebli-common</artifactId>

Modified: trunk/framework/ebli-graphe/pom.xml
===================================================================
--- trunk/framework/ebli-graphe/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-graphe/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.ebli</groupId>
 	<artifactId>ebli-graphe</artifactId>

Modified: trunk/framework/ebli-graphe-3D/pom.xml
===================================================================
--- trunk/framework/ebli-graphe-3D/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-graphe-3D/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -3,7 +3,7 @@
   <parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
   <groupId>org.fudaa.framework.ebli</groupId>
   <artifactId>ebli-graphe-3D</artifactId>

Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-network/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.ebli</groupId>
 	<artifactId>ebli-network</artifactId>

Modified: trunk/framework/ebli-visuallibrary/pom.xml
===================================================================
--- trunk/framework/ebli-visuallibrary/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/ebli-visuallibrary/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.ebli</groupId>
 	<artifactId>ebli-visuallibrary</artifactId>

Modified: trunk/framework/fudaa-common/pom.xml
===================================================================
--- trunk/framework/fudaa-common/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-common/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
   </parent>
   <groupId>org.fudaa.framework.fudaa</groupId>
   <artifactId>fudaa-common</artifactId>

Modified: trunk/framework/fudaa-common-courbe/pom.xml
===================================================================
--- trunk/framework/fudaa-common-courbe/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-common-courbe/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.fudaa</groupId>
 	<artifactId>fudaa-common-courbe</artifactId>

Modified: trunk/framework/fudaa-common-save/pom.xml
===================================================================
--- trunk/framework/fudaa-common-save/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-common-save/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<groupId>org.fudaa.framework.fudaa</groupId>
 	<artifactId>fudaa-common-save</artifactId>

Modified: trunk/framework/fudaa-dico/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-dico/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 		<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
 	<artifactId>fudaa-dico</artifactId>

Modified: trunk/framework/fudaa-dico/server/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/server/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-dico/server/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 			<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
 		<artifactId>fudaa-dico</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 		<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
 	<artifactId>dico-server</artifactId>

Modified: trunk/framework/fudaa-dico/ui/pom.xml
===================================================================
--- trunk/framework/fudaa-dico/ui/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
+++ trunk/framework/fudaa-dico/ui/pom.xml	2017-05-21 19:18:29 UTC (rev 9559)
@@ -4,7 +4,7 @@
 	<parent>
 			<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
 		<artifactId>fudaa-dico</artifactId>
-		<version>1.9-SNAPSHOT</version>
+		<version>1.9</version>
 	</parent>
 	<artifactId>dico-ui</artifactId>
 	<name>Dico UI</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9558] trunk/framework/pom.xml

[<de...@us...>]

Revision: 9558
          http://sourceforge.net/p/fudaa/svn/9558
Author:   deniger
Date:     2017-05-21 19:17:46 +0000 (Sun, 21 May 2017)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/pom.xml

Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml	2017-05-15 20:58:57 UTC (rev 9557)
+++ trunk/framework/pom.xml	2017-05-21 19:17:46 UTC (rev 9558)
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.fudaa.framework</groupId>
   <artifactId>fudaa-framework</artifactId>
-  <version>1.9-SNAPSHOT</version>
+  <version>1.9</version>
   <url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
   <properties>
     <projetEncoding>ISO-8859-15</projetEncoding>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9557] trunk/framework

[<bma...@us...>]

Revision: 9557
          http://sourceforge.net/p/fudaa/svn/9557
Author:   bmarchan
Date:     2017-05-15 20:58:57 +0000 (Mon, 15 May 2017)
Log Message:
-----------
Edition de geometrie : Les tableaux supportent le Cut/Paste

Modified Paths:
--------------
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesMultiEditorPanel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java
    trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliFormatter.java

Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesMultiEditorPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesMultiEditorPanel.java	2017-05-15 20:56:41 UTC (rev 9556)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesMultiEditorPanel.java	2017-05-15 20:58:57 UTC (rev 9557)
@@ -11,16 +11,13 @@
  */
 package org.fudaa.ctulu.gui;
 
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuScrollPane;
-import java.awt.Color;
-import java.awt.Component;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.swing.JTable;
-import javax.swing.SwingConstants;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableColumnModel;
+
 import org.fudaa.ctulu.CtuluCommandComposite;
 import org.fudaa.ctulu.CtuluCommandContainer;
 import org.fudaa.ctulu.CtuluLib;
@@ -29,6 +26,9 @@
 import org.fudaa.ctulu.editor.CtuluValueEditorI;
 import org.fudaa.ctulu.table.CtuluTable;
 
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuScrollPane;
+
 /**
  * Un editeur de collections de valeurs.
  * 
@@ -251,29 +251,16 @@
 
     model_ = new ValueTableModel();
     table_ = new CtuluTable();
-    table_.setRowSelectionAllowed(true);
+    // Pour permettre le copy/paste facilement surle tableau.
+    table_.setCellSelectionEnabled(true);
     table_.setModel(model_);
-    final TableColumnModel model = table_.getColumnModel();
-    final CtuluCellTextRenderer render = new CtuluCellTextRenderer() {
 
-      @Override
-      public Component getTableCellRendererComponent(JTable _table, Object _value, boolean _isSelected, boolean _hasFocus, int _row, int _column) {
-
-        String affValue = editors_[_column - 1].toString(_value);
-        final Component r = super.getTableCellRendererComponent(_table, affValue, _isSelected, _hasFocus, _row, _column);
-        setForeground(model_.isModified(_row, _column) ? Color.BLUE : _table.getForeground());
-        return r;
-      }
-    };
-    render.setHorizontalAlignment(SwingConstants.RIGHT);
+    TableColumnModel model = table_.getColumnModel();
     // on construit les labels et les editeurs
     for (int i = 0; i < title_.length; i++) {
       model.getColumn(i + 1).setCellEditor(editors_[i].createTableEditorComponent());
-      model.getColumn(i + 1).setCellRenderer(render);
     }
-    final CtuluCellTextRenderer intRenderer = new CtuluCellTextRenderer();
-    intRenderer.setHorizontalAlignment(SwingConstants.RIGHT);
-    model.getColumn(0).setCellRenderer(intRenderer);
+    
     add(new BuScrollPane(table_), BuBorderLayout.CENTER);
   }
 

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2017-05-15 20:56:41 UTC (rev 9556)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2017-05-15 20:58:57 UTC (rev 9557)
@@ -135,6 +135,8 @@
         setLayout(new BuBorderLayout());
         // Construction de la table
         table_ = new CtuluTable();
+        // Pour permettre le copy/paste facilement surle tableau.
+        table_.setCellSelectionEnabled(true);
         table_.setModel(modelData_);
         modelData_.updateEditorAndRenderer(table_);
         // Gestion des erreurs

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java	2017-05-15 20:56:41 UTC (rev 9556)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java	2017-05-15 20:58:57 UTC (rev 9557)
@@ -7,10 +7,6 @@
  */
 package org.fudaa.ebli.calque.edition;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LinearRing;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -18,6 +14,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.swing.JTable;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
@@ -24,6 +21,7 @@
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableColumnModel;
 import javax.swing.table.TableModel;
+
 import org.fudaa.ctulu.CtuluAnalyze;
 import org.fudaa.ctulu.CtuluCommandComposite;
 import org.fudaa.ctulu.CtuluCommandContainer;
@@ -39,13 +37,18 @@
 import org.fudaa.ctulu.gis.GISZoneAttributeFactory;
 import org.fudaa.ctulu.gis.GISZoneCollection;
 import org.fudaa.ctulu.gis.GISZoneCollectionGeometry;
-import org.fudaa.ctulu.gui.CtuluCellBooleanRenderer;
-import org.fudaa.ctulu.gui.CtuluCellDoubleRenderer;
 import org.fudaa.ebli.calque.ZModelGeometryListener;
 import org.fudaa.ebli.calque.ZModeleGeometry;
 import org.fudaa.ebli.commun.EbliCoordinateDefinition;
+import org.fudaa.ebli.commun.EbliFormatter;
 import org.fudaa.ebli.commun.EbliLib;
 
+import com.memoire.bu.BuTableCellRenderer;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.CoordinateSequence;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LinearRing;
+
 /**
  * Cette classe permet d'adapter l'interface d'un ZModeleGeometry sur une g\xE9om\xE9trie sp\xE9cifique. C'est \xE0 dire que l'adapter se greffe sur le mod\xE8le et
  * selectionne une des g\xE9om\xE9tries. Toutes les m\xE9thodes propos\xE9es par cette interface seront r\xE9alis\xE9es sur cette g\xE9om\xE9trie.
@@ -1035,11 +1038,18 @@
     TableCellEditor editorXY = CtuluValueEditorDefaults.DOUBLE_EDITOR.createTableEditorComponent();
     cols.getColumn(1).setCellEditor(editorXY);
     cols.getColumn(2).setCellEditor(editorXY);
-    cols.getColumn(1).setCellRenderer(new CtuluCellDoubleRenderer(coordDefs_[0].getFormatter().getXYFormatter()));
-    cols.getColumn(2).setCellRenderer(new CtuluCellDoubleRenderer(coordDefs_[1].getFormatter().getXYFormatter()));
+    BuTableCellRenderer xRenderer = new BuTableCellRenderer();
+    BuTableCellRenderer yRenderer = new BuTableCellRenderer();
+    xRenderer.setNumberFormat(((EbliFormatter) coordDefs_[0].getFormatter()).getFmt());
+    yRenderer.setNumberFormat(((EbliFormatter) coordDefs_[1].getFormatter()).getFmt());
+    cols.getColumn(1).setCellRenderer(xRenderer);
+    cols.getColumn(2).setCellRenderer(yRenderer);
 
     // Colonnes des attributs
     if (modele_ != null) {
+      BuTableCellRenderer otherRenderer = new BuTableCellRenderer();
+      otherRenderer.setNumberFormat(((EbliFormatter) coordDefs_[2].getFormatter()).getFmt());
+      
       for (int i = 0; i < lattrs_.size(); i++) {
         CtuluValueEditorI editor = lattrs_.get(i).getEditor();
         if (editor != null) {
@@ -1046,13 +1056,8 @@
           final TableCellEditor createTableEditorComponent = editor.createTableEditorComponent();
           cols.getColumn(3 + i).setCellEditor(createTableEditorComponent);
         }
-        // Le renderer pour les Double
-        if (lattrs_.get(i).getDataClass().equals(Double.class)) {
-          cols.getColumn(3 + i).setCellRenderer(new CtuluCellDoubleRenderer(coordDefs_[2].getFormatter().getXYFormatter()));
-        } // Pour un Boolean
-        else if (lattrs_.get(i).getDataClass().equals(Boolean.class)) {
-          cols.getColumn(3 + i).setCellRenderer(new CtuluCellBooleanRenderer());
-        }
+        // Le renderer pour les colonnes attributs
+        cols.getColumn(3 + i).setCellRenderer(otherRenderer);
       }
     }
   }

Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliFormatter.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliFormatter.java	2017-05-15 20:56:41 UTC (rev 9556)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliFormatter.java	2017-05-15 20:58:57 UTC (rev 9557)
@@ -47,6 +47,11 @@
     buildDefaultXYFormatter();
     ((CtuluNumberFormatDefault) formatter_).setFmt(_fmt);
   }
+  
+  public NumberFormat getFmt() {
+    buildDefaultXYFormatter();
+    return ((CtuluNumberFormatDefault) formatter_).getFmt();
+  }
 
   protected void buildDefaultXYFormatter() {
     if (formatter_ == null) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9556] trunk/framework

[<bma...@us...>]

Revision: 9556
          http://sourceforge.net/p/fudaa/svn/9556
Author:   bmarchan
Date:     2017-05-15 20:56:41 +0000 (Mon, 15 May 2017)
Log Message:
-----------
TableEditors : Flag d'edition seulement lors d'un doubleclick

Modified Paths:
--------------
    trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuTableCellEditor.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluNumberFormatDefault.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorDouble.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorInteger.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorLong.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorString.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorTime.java

Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuTableCellEditor.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuTableCellEditor.java	2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuTableCellEditor.java	2017-05-15 20:56:41 UTC (rev 9556)
@@ -11,9 +11,11 @@
 package com.memoire.bu;
 
 import java.awt.Component;
+import java.awt.event.MouseEvent;
 import java.util.Enumeration;
 import java.util.EventObject;
 import java.util.Vector;
+
 import javax.swing.JTable;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
@@ -30,6 +32,7 @@
   Object oldValue_;
   BuTextField tf_;
   Vector listeners_;
+  boolean editOnDblClick_=false;
 
   public BuTableCellEditor(BuTextField _tf) {
     if (_tf == null) {
@@ -39,6 +42,11 @@
     tf_ = _tf;
     listeners_ = new Vector(1, 1);
   }
+  
+  public BuTableCellEditor(BuTextField _tf, boolean _editOnDblClick) {
+    this(_tf);
+    editOnDblClick_=_editOnDblClick;
+  }
 
   public void setSelectAll(boolean selectAll) {
     tf_.setSelectAllIsGainFocus(selectAll);
@@ -72,6 +80,12 @@
   }
 
   public boolean isCellEditable(EventObject _evt) {
+    if (!editOnDblClick_)
+      return true;
+    
+    if (_evt instanceof MouseEvent) {
+      return ((MouseEvent) _evt).getClickCount()>=2;
+    }
     return true;
   }
 

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluNumberFormatDefault.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluNumberFormatDefault.java	2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluNumberFormatDefault.java	2017-05-15 20:56:41 UTC (rev 9556)
@@ -118,6 +118,10 @@
     fmt_ = _fmt == null ? DEFAULT : _fmt;
   }
 
+  public NumberFormat getFmt() {
+    return fmt_;
+  }
+  
   @Override
   public String toLocalizedPattern() {
     return fmt_ instanceof DecimalFormat ? ((DecimalFormat) fmt_).toLocalizedPattern() : null;

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorDouble.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorDouble.java	2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorDouble.java	2017-05-15 20:56:41 UTC (rev 9556)
@@ -103,12 +103,12 @@
 
   @Override
   public TableCellEditor createTableEditorComponent() {
-    return new BuTableCellEditor((BuTextField) createEditorComponent());
+    return new BuTableCellEditor((BuTextField) createEditorComponent(), true);
   }
   
   @Override
   public TableCellEditor createCommonTableEditorComponent() {
-    return new BuTableCellEditor((BuTextField) createCommonEditorComponent());
+    return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true);
   }
 
   public final CtuluNumberFormatI getFormatter() {

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorInteger.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorInteger.java	2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorInteger.java	2017-05-15 20:56:41 UTC (rev 9556)
@@ -80,12 +80,12 @@
 
   @Override
   public TableCellEditor createTableEditorComponent() {
-    return new BuTableCellEditor((BuTextField) createEditorComponent());
+    return new BuTableCellEditor((BuTextField) createEditorComponent(), true);
   }
 
   @Override
   public TableCellEditor createCommonTableEditorComponent() {
-    return new BuTableCellEditor((BuTextField) createCommonEditorComponent());
+    return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true);
   }
   
   @Override

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorLong.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorLong.java	2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorLong.java	2017-05-15 20:56:41 UTC (rev 9556)
@@ -83,12 +83,12 @@
 
   @Override
   public TableCellEditor createTableEditorComponent() {
-    return new BuTableCellEditor((BuTextField) createEditorComponent());
+    return new BuTableCellEditor((BuTextField) createEditorComponent(), true);
   }
 
   @Override
   public TableCellEditor createCommonTableEditorComponent() {
-    return new BuTableCellEditor((BuTextField) createCommonEditorComponent());
+    return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true);
   }
 
   @Override

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorString.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorString.java	2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorString.java	2017-05-15 20:56:41 UTC (rev 9556)
@@ -164,12 +164,12 @@
 
   @Override
   public TableCellEditor createTableEditorComponent(){
-    return new BuTableCellEditor((BuTextField) createEditorComponent());
+    return new BuTableCellEditor((BuTextField) createEditorComponent(), true);
   }
 
   @Override
   public TableCellEditor createCommonTableEditorComponent(){
-    return new BuTableCellEditor((BuTextField) createCommonEditorComponent());
+    return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true);
   }
   
   @Override

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorTime.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorTime.java	2017-05-15 10:42:34 UTC (rev 9555)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/editor/CtuluValueEditorTime.java	2017-05-15 20:56:41 UTC (rev 9556)
@@ -91,7 +91,7 @@
 
   @Override
   public TableCellEditor createTableEditorComponent() {
-    return new BuTableCellEditor((BuTextField) createEditorComponent()) {
+    return new BuTableCellEditor((BuTextField) createEditorComponent(), true) {
 
       @Override
       public Component getTableCellEditorComponent(final JTable _table, final Object _value, final boolean _selected,
@@ -103,14 +103,6 @@
       }
 
       @Override
-      public boolean isCellEditable(final EventObject _evt) {
-        if (_evt instanceof MouseEvent) {
-          return ((MouseEvent) _evt).getClickCount() >= 2;
-        }
-        return true;
-      }
-
-      @Override
       public boolean stopCellEditing() {
         if (getCellEditorValue() == null) {
           return false;
@@ -122,7 +114,7 @@
 
   @Override
   public TableCellEditor createCommonTableEditorComponent() {
-    return new BuTableCellEditor((BuTextField) createCommonEditorComponent()) {
+    return new BuTableCellEditor((BuTextField) createCommonEditorComponent(), true) {
 
       @Override
       public Component getTableCellEditorComponent(final JTable _table, final Object _value, final boolean _selected,
@@ -133,14 +125,6 @@
       }
 
       @Override
-      public boolean isCellEditable(final EventObject _evt) {
-        if (_evt instanceof MouseEvent) {
-          return ((MouseEvent) _evt).getClickCount() >= 2;
-        }
-        return true;
-      }
-
-      @Override
       public boolean stopCellEditing() {
         if (getCellEditorValue() == null) {
           return false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9555] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv

[<bma...@us...>]

Revision: 9555
          http://sourceforge.net/p/fudaa/svn/9555
Author:   bmarchan
Date:     2017-05-15 10:42:34 +0000 (Mon, 15 May 2017)
Log Message:
-----------
Pas de valeur par defaut pour le niveau d'eau

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivOrthoParameters.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java	2017-05-15 09:32:49 UTC (rev 9554)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java	2017-05-15 10:42:34 UTC (rev 9555)
@@ -64,7 +64,7 @@
     tfYmin.setText("" + _params.getYmin());
     tfYmax.setText("" + _params.getYmax());
     tfResolution.setText("" + _params.getResolution());
-    tfNivEau.setText("" + _params.getWaterElevation());
+    tfNivEau.setText("" + (_params.getWaterElevation()==null ? "":_params.getWaterElevation()));
     btPositionSaisie.setEnabled(false);
   }
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivOrthoParameters.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivOrthoParameters.java	2017-05-15 09:32:49 UTC (rev 9554)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivOrthoParameters.java	2017-05-15 10:42:34 UTC (rev 9555)
@@ -19,8 +19,8 @@
   protected double ymax;
   /** La resolution pour la transformation */
   protected double resolution;
-  /** Cote du plan d'eau */
-  protected double waterElevation;
+  /** Cote du plan d'eau (est null au depart, indiquant qu'aucune valeur n'a \xE9t\xE9 donn\xE9e) */
+  protected Double waterElevation;
   /** Mise a l'echelle : Les 2 points pour la transformation ([0] si aucune transformation de repere) */
   protected GrPoint[] scalingImgPoints=new GrPoint[0];
   /** Mise a l'echelle : Les 2 points pour la transformation ([0] si aucune transformation de repere) */
@@ -101,7 +101,7 @@
   /**
    * @return the waterElevation
    */
-  public double getWaterElevation() {
+  public Double getWaterElevation() {
     return waterElevation;
   }
 
@@ -108,7 +108,7 @@
   /**
    * @param waterElevation the waterElevation to set
    */
-  public void setWaterElevation(double waterElevation) {
+  public void setWaterElevation(Double waterElevation) {
     this.waterElevation = waterElevation;
   }
   

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9553] trunk/soft/fudaa-crue/ui-report/src/main/java/org /fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java

[<de...@us...>]

Revision: 9553
          http://sourceforge.net/p/fudaa/svn/9553
Author:   deniger
Date:     2017-05-04 21:16:55 +0000 (Thu, 04 May 2017)
Log Message:
-----------
CRUE-677

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java	2017-05-04 20:47:55 UTC (rev 9552)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java	2017-05-04 21:16:55 UTC (rev 9553)
@@ -47,256 +47,249 @@
  */
 public class ReportLongitudinalGrapheBuilder extends AbstractReportGrapheBuilder<CourbesUiController, ReportLongitudinalConfig> {
 
-    public ReportLongitudinalGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
-        super(uiController, loiLabelsManager);
-    }
+  public ReportLongitudinalGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
+    super(uiController, loiLabelsManager);
+  }
 
-    protected EGAxeVertical getOrCreateAxeVerticalZ(ReportLongitudinalConfig content, Map<String, EGAxeVertical> saved) {
-        return getOrCreateAxeVerticalConfigured(getVariableZ().getNature(), content, saved);
-    }
-    ReportLongitudinalPositionBrancheContent result;
+  protected EGAxeVertical getOrCreateAxeVerticalZ(ReportLongitudinalConfig content, Map<String, EGAxeVertical> saved) {
+    return getOrCreateAxeVerticalConfigured(getVariableZ().getNature(), content, saved);
+  }
+  ReportLongitudinalPositionBrancheContent result;
 
-    @Override
-    public void runUnloaded() {
-        super.runUnloaded();
-        result = null;
-    }
+  @Override
+  public void runUnloaded() {
+    super.runUnloaded();
+    result = null;
+  }
 
-    @Override
-    public ReportResultProviderService getReportResultProviderService() {
-        return reportResultProviderService;
-    }
+  @Override
+  public ReportResultProviderService getReportResultProviderService() {
+    return reportResultProviderService;
+  }
 
-    @Override
-    public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
-        Map<String, EGAxeVertical> saved = new HashMap<>();
-        ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
-        EGAxeVertical axeZ = courbeBuilder.getAxeZ();
-        uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP), true);
-        double xpInit = 0;
-        result = new ReportLongitudinalPositionBrancheContent();
-        ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(reportResultProviderService, reportService.getCcm());
-        Set<ReportRunKey> keys = getRunKeysToUse(content);
-        for (ReportLongitudinalBrancheConfig brancheConfig : content.getBranchesConfig()) {
-            if (progress != null) {
-                progress.setDisplayName(brancheConfig.getName());
-            }
-            xpInit = xpInit + brancheConfig.getDecalXp();
-            positionBuilder.buildPositions(xpInit, brancheConfig, result, keys);
-            xpInit = xpInit + brancheConfig.getLength();
-        }
-        uiController.getGraphe().setHorizontalBanner(new ReportLongitudinalBanner(content, result));
-        final List<EGCourbeSimple> res = createNonTimeStepCourbes(content, axeZ, courbeBuilder, progress);
-        res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
-        return res;
+  @Override
+  public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
+    Map<String, EGAxeVertical> saved = new HashMap<>();
+    ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
+    EGAxeVertical axeZ = courbeBuilder.getAxeZ();
+    uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP), true);
+    double xpInit = 0;
+    result = new ReportLongitudinalPositionBrancheContent();
+    ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(reportResultProviderService, reportService.getCcm());
+    Set<ReportRunKey> keys = getRunKeysToUse(content);
+    for (ReportLongitudinalBrancheConfig brancheConfig : content.getBranchesConfig()) {
+      if (progress != null) {
+        progress.setDisplayName(brancheConfig.getName());
+      }
+      xpInit = xpInit + brancheConfig.getDecalXp();
+      positionBuilder.buildPositions(xpInit, brancheConfig, result, keys);
+      xpInit = xpInit + brancheConfig.getLength();
     }
+    uiController.getGraphe().setHorizontalBanner(new ReportLongitudinalBanner(content, result));
+    final List<EGCourbeSimple> res = createNonTimeStepCourbes(content, axeZ, courbeBuilder, progress);
+    res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
+    return res;
+  }
 
-    @Override
-    public void applyLabelsConfigChanged(ReportLongitudinalConfig content) {
-        List<LabelConfig> labels = content.getLoiLegendConfig().getLabels();
-        ReportRunKey runKey = reportService.getRunCourant() == null ? null : reportService.getRunCourant().getRunKey();
-        for (LabelConfig config : labels) {
-            ReportLabelContent labelContent = (ReportLabelContent) config.getKey();
-            String text = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
-                    DecimalFormatEpsilonEnum.PRESENTATION, content.getSelectedTimeStepInReport());
-            String tltip = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
-                    DecimalFormatEpsilonEnum.COMPARISON, content.getSelectedTimeStepInReport());
-            config.setText(text);
-            config.setTooltipText(tltip);
-        }
-        this.loiLabelsManager.getLoiLabelsManager().applyConfig();
+  @Override
+  public void applyLabelsConfigChanged(ReportLongitudinalConfig content) {
+    List<LabelConfig> labels = content.getLoiLegendConfig().getLabels();
+    ReportRunKey runKey = reportService.getRunCourant() == null ? null : reportService.getRunCourant().getRunKey();
+    for (LabelConfig config : labels) {
+      ReportLabelContent labelContent = (ReportLabelContent) config.getKey();
+      String text = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
+              DecimalFormatEpsilonEnum.PRESENTATION, content.getSelectedTimeStepInReport());
+      String tltip = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
+              DecimalFormatEpsilonEnum.COMPARISON, content.getSelectedTimeStepInReport());
+      config.setText(text);
+      config.setTooltipText(tltip);
     }
+    this.loiLabelsManager.getLoiLabelsManager().applyConfig();
+  }
 
-    protected List<EGCourbeSimple> retrieveCourbesNonTimeStep() {
-        EGGrapheSimpleModel model = uiController.getEGGrapheSimpleModel();
-        List<EGCourbeSimple> res = new ArrayList<>();
-        EGCourbeSimple[] courbes = model.getCourbes();
-        for (int i = 0; i < courbes.length; i++) {
-            EGCourbeSimple courbe = courbes[i];
-            Object key = ((CourbeModelWithKey) courbe.getModel()).getKey();
-            if (key != null && ReportRunVariableTimeKey.class.equals(key.getClass())) {
-                ReportRunVariableTimeKey reportKey = (ReportRunVariableTimeKey) key;
-                if (!reportKey.isDefinedOnSelectedTimeStep() || reportKey.isLimitProfilVariable() || reportKey.isRPTIVariable() || isExpressionNotTimeDependant(
-                        reportKey.getRunVariableKey())) {
-                    res.add(courbe);
-                }
-            }
+  protected List<EGCourbeSimple> retrieveCourbesNonTimeStep() {
+    EGGrapheSimpleModel model = uiController.getEGGrapheSimpleModel();
+    List<EGCourbeSimple> res = new ArrayList<>();
+    EGCourbeSimple[] courbes = model.getCourbes();
+    for (int i = 0; i < courbes.length; i++) {
+      EGCourbeSimple courbe = courbes[i];
+      Object key = ((CourbeModelWithKey) courbe.getModel()).getKey();
+      if (key != null && ReportRunVariableTimeKey.class.equals(key.getClass())) {
+        ReportRunVariableTimeKey reportKey = (ReportRunVariableTimeKey) key;
+        if (!reportKey.isDefinedOnSelectedTimeStep() || reportKey.isLimitProfilVariable() || reportKey.isRPTIVariable() || isExpressionNotTimeDependant(
+                reportKey.getRunVariableKey())) {
+          res.add(courbe);
         }
-        return res;
+      }
     }
+    return res;
+  }
 
-    @Override
-    public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportLongitudinalConfig content, ProgressHandle progress) {
-        Map<String, EGAxeVertical> saved = new HashMap<>();
-        List<EGCourbeSimple> res = retrieveCourbesNonTimeStep();
-        res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
-        return res;
+  @Override
+  public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportLongitudinalConfig content, ProgressHandle progress) {
+    Map<String, EGAxeVertical> saved = new HashMap<>();
+    List<EGCourbeSimple> res = retrieveCourbesNonTimeStep();
+    res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
+    return res;
+  }
+
+  private List<EGCourbeSimple> createCourbesOnCurrentTimeStep(ReportLongitudinalConfig content, ProgressHandle progress,
+          Map<String, EGAxeVertical> saved) {
+    if (Boolean.FALSE.equals(content.getCurrentTimeDisplayed())) {
+      return Collections.emptyList();
     }
-
-    private List<EGCourbeSimple> createCourbesOnCurrentTimeStep(ReportLongitudinalConfig content, ProgressHandle progress,
-            Map<String, EGAxeVertical> saved) {
-        if (Boolean.FALSE.equals(content.getCurrentTimeDisplayed())) {
-            return Collections.emptyList();
+    ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
+    if (result == null) {
+      return Collections.emptyList();
+    }
+    List<ReportRunVariableKey> var = content.getProfilVariables();
+    List<EGCourbeSimple> courbes = new ArrayList<>();
+    ResultatTimeKey selectedTime = reportService.getSelectedTime();
+    if (selectedTime != null) {
+      for (ReportRunVariableKey reportRunVariableKey : var) {
+        if (reportRunVariableKey.isReadOrVariable() && !isExpressionNotTimeDependant(reportRunVariableKey)) {
+          if (progress != null) {
+            progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
+          }
+          EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, selectedTime, true);
+          courbes.add(courbe);
         }
-        ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
-        if (result == null) {
-            return Collections.emptyList();
-        }
-        List<ReportRunVariableKey> var = content.getProfilVariables();
-        List<EGCourbeSimple> courbes = new ArrayList<>();
-        ResultatTimeKey selectedTime = reportService.getSelectedTime();
-        if (selectedTime != null) {
-            for (ReportRunVariableKey reportRunVariableKey : var) {
-                if (reportRunVariableKey.isReadOrVariable() && !isExpressionNotTimeDependant(reportRunVariableKey)) {
-                    if (progress != null) {
-                        progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
-                    }
-                    EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, selectedTime, true);
-                    courbes.add(courbe);
-                }
-            }
-        }
-        return courbes;
+      }
     }
+    return courbes;
+  }
 
-    public EMHSectionProfil retrieveProfil(EMH emh) {
-        return ReportProfilHelper.retrieveProfil(emh);
-    }
+  public EMHSectionProfil retrieveProfil(EMH emh) {
+    return ReportProfilHelper.retrieveProfil(emh);
+  }
 
-    public ItemVariable getVariableZ() {
-        return reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_Z);
-    }
+  public ItemVariable getVariableZ() {
+    return reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_Z);
+  }
 
-    protected void updateReadCourbeName(EGCourbe courbe) {
-        ReportRunVariableTimeKey key = (ReportRunVariableTimeKey) ((CourbeModelWithKey) courbe.getModel()).getKey();
-        if (!key.isLimitProfilVariable()) {
-            courbe.getModel().setTitle(key.getDisplayName(getReportResultProviderService().getReportService().getReportTimeFormatter().
-                    getResulatKeyTempsSceToStringTransformer()));
-        }
+  protected void updateReadCourbeName(EGCourbe courbe) {
+    ReportRunVariableTimeKey key = (ReportRunVariableTimeKey) ((CourbeModelWithKey) courbe.getModel()).getKey();
+    if (!key.isLimitProfilVariable()) {
+      courbe.getModel().setTitle(key.getDisplayName(getReportResultProviderService().getReportService().getReportTimeFormatter().
+              getResulatKeyTempsSceToStringTransformer()));
     }
+  }
 
-    public Set<ReportRunKey> getRunKeysToUse(ReportLongitudinalConfig content) {
-        final List<ReportRunVariableKey> variables = content.getProfilVariables();
-        Set<ReportRunKey> keys = new HashSet<>();
-        if (reportService.getRunCourant() != null) {
-            keys.add(reportService.getRunCourant().getRunKey());
-        }
-        for (ReportRunVariableKey reportRunVariableKey : variables) {
-            keys.add(reportRunVariableKey.getRunKey());
-        }
-        return keys;
+  public Set<ReportRunKey> getRunKeysToUse(ReportLongitudinalConfig content) {
+    final List<ReportRunVariableKey> variables = content.getProfilVariables();
+    Set<ReportRunKey> keys = new HashSet<>();
+    if (reportService.getRunCourant() != null) {
+      keys.add(reportService.getRunCourant().getRunKey());
     }
+    for (ReportRunVariableKey reportRunVariableKey : variables) {
+      keys.add(reportRunVariableKey.getRunKey());
+    }
+    return keys;
+  }
 
-    EGAxeVertical getRightAxis(ReportLongitudinalConfig content, Map<String, EGAxeVertical> savedAxed) {
-        String variableDrawnOnRightAxis = content.getVariableDrawnOnRightAxis(reportResultProviderService);
-        EGAxeVertical rightAxis = null;
-        if (StringUtils.isNotBlank(variableDrawnOnRightAxis)) {
-            rightAxis = getOrCreateAxeVerticalConfigured(reportResultProviderService.getPropertyNature(variableDrawnOnRightAxis), content, savedAxed);
-        }
-        if (rightAxis != null) {
-            rightAxis.setDroite(true);
-        }
-        return rightAxis;
+  EGAxeVertical getRightAxis(ReportLongitudinalConfig content, Map<String, EGAxeVertical> savedAxed) {
+    String variableDrawnOnRightAxis = content.getVariableDrawnOnRightAxis(reportResultProviderService);
+    EGAxeVertical rightAxis = null;
+    if (StringUtils.isNotBlank(variableDrawnOnRightAxis)) {
+      rightAxis = getOrCreateAxeVerticalConfigured(reportResultProviderService.getPropertyNature(variableDrawnOnRightAxis), content, savedAxed);
     }
+    if (rightAxis != null) {
+      rightAxis.setDroite(true);
+    }
+    return rightAxis;
+  }
 
-    void updateCourbeNames(ReportLongitudinalConfig content) {
-        EGCourbeSimple[] courbes = uiController.getEGGrapheSimpleModel().getCourbes();
-        for (EGCourbeSimple courbe : courbes) {
-            updateReadCourbeName(courbe);
+  void updateCourbeNames(ReportLongitudinalConfig content) {
+    EGCourbeSimple[] courbes = uiController.getEGGrapheSimpleModel().getCourbes();
+    for (EGCourbeSimple courbe : courbes) {
+      updateReadCourbeName(courbe);
 
-        }
     }
+  }
 
-    public EGGraphe getGraphe() {
-        return uiController.getGraphe();
-    }
+  public EGGraphe getGraphe() {
+    return uiController.getGraphe();
+  }
 
-    /**
-     *
-     * @param content
-     * @param axeZ
-     * @param courbeBuilder
-     * @param progress
-     * @return les courbes non dépendants du temps sélectionné.
-     */
-    private List<EGCourbeSimple> createNonTimeStepCourbes(ReportLongitudinalConfig content, EGAxeVertical axeZ,
-            ReportLongitudinalGrapheBuilderCourbe courbeBuilder, ProgressHandle progress) {
-        List<EGCourbeSimple> courbes = new ArrayList<>();
-        ReportLongitudinalGrapheBuilderLimit limitBuilder = new ReportLongitudinalGrapheBuilderLimit(reportService.getCcm());
-        final List<ReportRunVariableKey> variables = content.getProfilVariables();
-        for (ReportRunVariableKey reportRunVariableKey : variables) {
-            if (isExpressionNotTimeDependant(reportRunVariableKey)) {
-                if (progress != null) {
-                    progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
-                }
-                EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, true);
-                courbes.add(courbe);
-            }
-            if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(reportRunVariableKey.getVariable().getVariableType())) {
-                if (progress != null) {
-                    progress.setDisplayName(reportRunVariableKey.getDisplayName());
-                }
-                LoiConstanteCourbeModel model = limitBuilder.build(reportRunVariableKey, result.getCartouches());
-                if (model != null && model.getKey() != null && content.getCourbeconfigs() != null) {
-                    EGCourbeSimple courbe = new EGCourbeSimple(axeZ, model);
+  /**
+   *
+   * @param content
+   * @param axeZ
+   * @param courbeBuilder
+   * @param progress
+   * @return les courbes non dépendants du temps sélectionné.
+   */
+  private List<EGCourbeSimple> createNonTimeStepCourbes(ReportLongitudinalConfig content, EGAxeVertical axeZ,
+          ReportLongitudinalGrapheBuilderCourbe courbeBuilder, ProgressHandle progress) {
+    List<EGCourbeSimple> courbes = new ArrayList<>();
+    ReportLongitudinalGrapheBuilderLimit limitBuilder = new ReportLongitudinalGrapheBuilderLimit(reportService.getCcm());
+    final List<ReportRunVariableKey> variables = content.getProfilVariables();
+    for (ReportRunVariableKey reportRunVariableKey : variables) {
 
-                    AbstractReportGrapheBuilder.applyPersistConfig(content.getCourbeconfigs().get(model.getKey()), courbe);
-                    courbes.add(courbe);
-                }
-            } else if (ReportVariableTypeEnum.RESULTAT_RPTI.equals(reportRunVariableKey.getVariable().getVariableType())) {
-                if (progress != null) {
-                    progress.setDisplayName(reportRunVariableKey.getDisplayName());
-                }
-                EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, false);
-                courbes.add(courbe);
-            }
+      if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(reportRunVariableKey.getVariable().getVariableType())) {
+        if (progress != null) {
+          progress.setDisplayName(reportRunVariableKey.getDisplayName());
         }
-        final List<ResultatTimeKey> times = content.getTimes();
-        //contient les clés des courbes qui ne dépendent pas du temps et donc à ne créer qu'une seule fois
-        Set<ReportRunVariableKey> timeIndependantVariable = new HashSet<>();
-        for (ResultatTimeKey timeKey : times) {
-            for (ReportRunVariableKey reportRunVariableKey : variables) {
-                ResultatTimeKey timeKeyToUse = timeKey;
-                if (reportRunVariableKey.isReadOrVariable()) {
-                    if (progress != null) {
-                        progress.setDisplayName(reportRunVariableKey.getDisplayName() + " " + timeKey.toString());
-                    }
-                    boolean isExpressionNotTimeDependant = isExpressionNotTimeDependant(reportRunVariableKey);
-                    boolean useCurrentTime = false;
-                    if (isExpressionNotTimeDependant) {
-                        //on ne construit pas la courbe si elle n'est pas dépendante du temps et déja construite
-                        //idem si le temps courant est affiché c'est pas la peine
-                        if (timeIndependantVariable.contains(reportRunVariableKey) || content.getCurrentTimeDisplayed()) {
-                            continue;
-                        }
-                        timeIndependantVariable.add(reportRunVariableKey);
-                        //si pas dépend du temps on utilise le temps courant: astuce pour ne pas afficher le temps dans le nom de la courbe
-                        useCurrentTime = true;
-                        timeKeyToUse = reportService.getSelectedTime();
-                    }
-                    EGCourbeSimple createCourbe = courbeBuilder.createCourbe(reportRunVariableKey, timeKeyToUse, useCurrentTime);
-                    courbes.add(createCourbe);
-                }
+        LoiConstanteCourbeModel model = limitBuilder.build(reportRunVariableKey, result.getCartouches());
+        if (model != null && model.getKey() != null && content.getCourbeconfigs() != null) {
+          EGCourbeSimple courbe = new EGCourbeSimple(axeZ, model);
+
+          AbstractReportGrapheBuilder.applyPersistConfig(content.getCourbeconfigs().get(model.getKey()), courbe);
+          courbes.add(courbe);
+        }
+      } else if (ReportVariableTypeEnum.RESULTAT_RPTI.equals(reportRunVariableKey.getVariable().getVariableType())) {
+        if (progress != null) {
+          progress.setDisplayName(reportRunVariableKey.getDisplayName());
+        }
+        EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, false);
+        courbes.add(courbe);
+      }
+    }
+    final List<ResultatTimeKey> times = content.getTimes();
+    //contient les clés des courbes qui ne dépendent pas du temps et donc à ne créer qu'une seule fois
+    Set<ReportRunVariableKey> timeIndependantVariable = new HashSet<>();
+    for (ResultatTimeKey timeKey : times) {
+      for (ReportRunVariableKey reportRunVariableKey : variables) {
+        ResultatTimeKey timeKeyToUse = timeKey;
+        if (reportRunVariableKey.isReadOrVariable()) {
+          boolean isExpressionNotTimeDependant = isExpressionNotTimeDependant(reportRunVariableKey);
+          boolean useCurrentTime = false;
+          //on construit les courbes pour les expressions non dépendantes du temps
+          if (isExpressionNotTimeDependant) {
+            //la variable a déjà été affichée: on annule
+            if(timeIndependantVariable.contains(reportRunVariableKey)){
+              continue;
             }
+            timeIndependantVariable.add(reportRunVariableKey);
+            //si pas dépend du temps on utilise le temps courant: astuce pour ne pas afficher le temps dans le nom de la courbe
+            useCurrentTime = true;
+            timeKeyToUse = reportService.getSelectedTime();
+          }
+          if (progress != null) {
+            progress.setDisplayName(reportRunVariableKey.getDisplayName() + " " + timeKey.toString());
+          }
+          EGCourbeSimple createCourbe = courbeBuilder.createCourbe(reportRunVariableKey, timeKeyToUse, useCurrentTime);
+          courbes.add(createCourbe);
         }
-        return courbes;
+      }
     }
+    return courbes;
+  }
 
-    /**
-     *
-     * @param reportRunVariableKey
-     * @return true si la variable n'est pas dépendante du temps. C'est le cas
-     * des MaxSurTous..., MaxSurSelection,...
-     */
-    protected boolean isExpressionNotTimeDependant(ReportRunVariableKey reportRunVariableKey) {
-        boolean isExpressionNotTimeDependant = false;
-        if (reportRunVariableKey.getVariable().getVariableType().equals(ReportVariableTypeEnum.FORMULE)) {
-            boolean containsTimeDependantVariable = reportResultProviderService.containsTimeDependantVariable(reportRunVariableKey.getVariable().
-                    getVariableName());
-            isExpressionNotTimeDependant = !containsTimeDependantVariable;
+  /**
+   *
+   * @param reportRunVariableKey
+   * @return true si la variable n'est pas dépendante du temps. C'est le cas des MaxSurTous..., MaxSurSelection,...
+   */
+  protected boolean isExpressionNotTimeDependant(ReportRunVariableKey reportRunVariableKey) {
+    boolean isExpressionNotTimeDependant = false;
+    if (reportRunVariableKey.getVariable().getVariableType().equals(ReportVariableTypeEnum.FORMULE)) {
+      boolean containsTimeDependantVariable = reportResultProviderService.containsTimeDependantVariable(reportRunVariableKey.getVariable().
+              getVariableName());
+      isExpressionNotTimeDependant = !containsTimeDependantVariable;
 
-        }
-        return isExpressionNotTimeDependant;
     }
+    return isExpressionNotTimeDependant;
+  }
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9552] trunk/soft/fudaa-crue/ui-report/src/main/java/org /fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java

[<de...@us...>]

Revision: 9552
          http://sourceforge.net/p/fudaa/svn/9552
Author:   deniger
Date:     2017-05-04 20:47:55 +0000 (Thu, 04 May 2017)
Log Message:
-----------
CRUE-677

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java	2017-05-04 14:36:08 UTC (rev 9551)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java	2017-05-04 20:47:55 UTC (rev 9552)
@@ -46,248 +46,257 @@
  * @author Frederic Deniger
  */
 public class ReportLongitudinalGrapheBuilder extends AbstractReportGrapheBuilder<CourbesUiController, ReportLongitudinalConfig> {
-  
-  public ReportLongitudinalGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
-    super(uiController, loiLabelsManager);
-  }
-  
-  protected EGAxeVertical getOrCreateAxeVerticalZ(ReportLongitudinalConfig content, Map<String, EGAxeVertical> saved) {
-    return getOrCreateAxeVerticalConfigured(getVariableZ().getNature(), content, saved);
-  }
-  ReportLongitudinalPositionBrancheContent result;
-  
-  @Override
-  public void runUnloaded() {
-    super.runUnloaded();
-    result = null;
-  }
-  
-  @Override
-  public ReportResultProviderService getReportResultProviderService() {
-    return reportResultProviderService;
-  }
-  
-  @Override
-  public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
-    Map<String, EGAxeVertical> saved = new HashMap<>();
-    ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
-    EGAxeVertical axeZ = courbeBuilder.getAxeZ();
-    uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP), true);
-    double xpInit = 0;
-    result = new ReportLongitudinalPositionBrancheContent();
-    ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(reportResultProviderService, reportService.getCcm());
-    Set<ReportRunKey> keys = getRunKeysToUse(content);
-    for (ReportLongitudinalBrancheConfig brancheConfig : content.getBranchesConfig()) {
-      if (progress != null) {
-        progress.setDisplayName(brancheConfig.getName());
-      }
-      xpInit = xpInit + brancheConfig.getDecalXp();
-      positionBuilder.buildPositions(xpInit, brancheConfig, result, keys);
-      xpInit = xpInit + brancheConfig.getLength();
+
+    public ReportLongitudinalGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
+        super(uiController, loiLabelsManager);
     }
-    uiController.getGraphe().setHorizontalBanner(new ReportLongitudinalBanner(content, result));
-    final List<EGCourbeSimple> res = createNonTimeStepCourbes(content, axeZ, courbeBuilder, progress);
-    res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
-    return res;
-  }
-  
-  @Override
-  public void applyLabelsConfigChanged(ReportLongitudinalConfig content) {
-    List<LabelConfig> labels = content.getLoiLegendConfig().getLabels();
-    ReportRunKey runKey = reportService.getRunCourant() == null ? null : reportService.getRunCourant().getRunKey();
-    for (LabelConfig config : labels) {
-      ReportLabelContent labelContent = (ReportLabelContent) config.getKey();
-      String text = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
-              DecimalFormatEpsilonEnum.PRESENTATION, content.getSelectedTimeStepInReport());
-      String tltip = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
-              DecimalFormatEpsilonEnum.COMPARISON, content.getSelectedTimeStepInReport());
-      config.setText(text);
-      config.setTooltipText(tltip);
+
+    protected EGAxeVertical getOrCreateAxeVerticalZ(ReportLongitudinalConfig content, Map<String, EGAxeVertical> saved) {
+        return getOrCreateAxeVerticalConfigured(getVariableZ().getNature(), content, saved);
     }
-    this.loiLabelsManager.getLoiLabelsManager().applyConfig();
-  }
-  
-  protected List<EGCourbeSimple> retrieveCourbesNonTimeStep() {
-    EGGrapheSimpleModel model = uiController.getEGGrapheSimpleModel();
-    List<EGCourbeSimple> res = new ArrayList<>();
-    EGCourbeSimple[] courbes = model.getCourbes();
-    for (int i = 0; i < courbes.length; i++) {
-      EGCourbeSimple courbe = courbes[i];
-      Object key = ((CourbeModelWithKey) courbe.getModel()).getKey();
-      if (key != null && ReportRunVariableTimeKey.class.equals(key.getClass())) {
-        ReportRunVariableTimeKey reportKey = (ReportRunVariableTimeKey) key;
-        if (!reportKey.isDefinedOnSelectedTimeStep() || reportKey.isLimitProfilVariable() || reportKey.isRPTIVariable() || isExpressionNotTimeDependant(
-                reportKey.getRunVariableKey())) {
-          res.add(courbe);
-        }
-      }
+    ReportLongitudinalPositionBrancheContent result;
+
+    @Override
+    public void runUnloaded() {
+        super.runUnloaded();
+        result = null;
     }
-    return res;
-  }
-  
-  @Override
-  public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportLongitudinalConfig content, ProgressHandle progress) {
-    Map<String, EGAxeVertical> saved = new HashMap<>();
-    List<EGCourbeSimple> res = retrieveCourbesNonTimeStep();
-    res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
-    return res;
-  }
-  
-  private List<EGCourbeSimple> createCourbesOnCurrentTimeStep(ReportLongitudinalConfig content, ProgressHandle progress,
-          Map<String, EGAxeVertical> saved) {
-    if (Boolean.FALSE.equals(content.getCurrentTimeDisplayed())) {
-      return Collections.emptyList();
+
+    @Override
+    public ReportResultProviderService getReportResultProviderService() {
+        return reportResultProviderService;
     }
-    ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
-    if (result == null) {
-      return Collections.emptyList();
+
+    @Override
+    public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
+        Map<String, EGAxeVertical> saved = new HashMap<>();
+        ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
+        EGAxeVertical axeZ = courbeBuilder.getAxeZ();
+        uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP), true);
+        double xpInit = 0;
+        result = new ReportLongitudinalPositionBrancheContent();
+        ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(reportResultProviderService, reportService.getCcm());
+        Set<ReportRunKey> keys = getRunKeysToUse(content);
+        for (ReportLongitudinalBrancheConfig brancheConfig : content.getBranchesConfig()) {
+            if (progress != null) {
+                progress.setDisplayName(brancheConfig.getName());
+            }
+            xpInit = xpInit + brancheConfig.getDecalXp();
+            positionBuilder.buildPositions(xpInit, brancheConfig, result, keys);
+            xpInit = xpInit + brancheConfig.getLength();
+        }
+        uiController.getGraphe().setHorizontalBanner(new ReportLongitudinalBanner(content, result));
+        final List<EGCourbeSimple> res = createNonTimeStepCourbes(content, axeZ, courbeBuilder, progress);
+        res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
+        return res;
     }
-    List<ReportRunVariableKey> var = content.getProfilVariables();
-    List<EGCourbeSimple> courbes = new ArrayList<>();
-    ResultatTimeKey selectedTime = reportService.getSelectedTime();
-    if (selectedTime != null) {
-      for (ReportRunVariableKey reportRunVariableKey : var) {
-        if (progress != null) {
-          progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
+
+    @Override
+    public void applyLabelsConfigChanged(ReportLongitudinalConfig content) {
+        List<LabelConfig> labels = content.getLoiLegendConfig().getLabels();
+        ReportRunKey runKey = reportService.getRunCourant() == null ? null : reportService.getRunCourant().getRunKey();
+        for (LabelConfig config : labels) {
+            ReportLabelContent labelContent = (ReportLabelContent) config.getKey();
+            String text = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
+                    DecimalFormatEpsilonEnum.PRESENTATION, content.getSelectedTimeStepInReport());
+            String tltip = runKey == null ? StringUtils.EMPTY : reportResultProviderService.getLabelString(labelContent, runKey, content.getMainEMHName(),
+                    DecimalFormatEpsilonEnum.COMPARISON, content.getSelectedTimeStepInReport());
+            config.setText(text);
+            config.setTooltipText(tltip);
         }
-        if (reportRunVariableKey.isReadOrVariable()) {
-          EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, selectedTime, true);
-          courbes.add(courbe);
+        this.loiLabelsManager.getLoiLabelsManager().applyConfig();
+    }
+
+    protected List<EGCourbeSimple> retrieveCourbesNonTimeStep() {
+        EGGrapheSimpleModel model = uiController.getEGGrapheSimpleModel();
+        List<EGCourbeSimple> res = new ArrayList<>();
+        EGCourbeSimple[] courbes = model.getCourbes();
+        for (int i = 0; i < courbes.length; i++) {
+            EGCourbeSimple courbe = courbes[i];
+            Object key = ((CourbeModelWithKey) courbe.getModel()).getKey();
+            if (key != null && ReportRunVariableTimeKey.class.equals(key.getClass())) {
+                ReportRunVariableTimeKey reportKey = (ReportRunVariableTimeKey) key;
+                if (!reportKey.isDefinedOnSelectedTimeStep() || reportKey.isLimitProfilVariable() || reportKey.isRPTIVariable() || isExpressionNotTimeDependant(
+                        reportKey.getRunVariableKey())) {
+                    res.add(courbe);
+                }
+            }
         }
-      }
+        return res;
     }
-    return courbes;
-  }
-  
-  public EMHSectionProfil retrieveProfil(EMH emh) {
-    return ReportProfilHelper.retrieveProfil(emh);
-  }
-  
-  public ItemVariable getVariableZ() {
-    return reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_Z);
-  }
-  
-  protected void updateReadCourbeName(EGCourbe courbe) {
-    ReportRunVariableTimeKey key = (ReportRunVariableTimeKey) ((CourbeModelWithKey) courbe.getModel()).getKey();
-    if (!key.isLimitProfilVariable()) {
-      courbe.getModel().setTitle(key.getDisplayName(getReportResultProviderService().getReportService().getReportTimeFormatter().
-              getResulatKeyTempsSceToStringTransformer()));
+
+    @Override
+    public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportLongitudinalConfig content, ProgressHandle progress) {
+        Map<String, EGAxeVertical> saved = new HashMap<>();
+        List<EGCourbeSimple> res = retrieveCourbesNonTimeStep();
+        res.addAll(createCourbesOnCurrentTimeStep(content, progress, saved));
+        return res;
     }
-  }
-  
-  public Set<ReportRunKey> getRunKeysToUse(ReportLongitudinalConfig content) {
-    final List<ReportRunVariableKey> variables = content.getProfilVariables();
-    Set<ReportRunKey> keys = new HashSet<>();
-    if (reportService.getRunCourant() != null) {
-      keys.add(reportService.getRunCourant().getRunKey());
+
+    private List<EGCourbeSimple> createCourbesOnCurrentTimeStep(ReportLongitudinalConfig content, ProgressHandle progress,
+            Map<String, EGAxeVertical> saved) {
+        if (Boolean.FALSE.equals(content.getCurrentTimeDisplayed())) {
+            return Collections.emptyList();
+        }
+        ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content, saved);
+        if (result == null) {
+            return Collections.emptyList();
+        }
+        List<ReportRunVariableKey> var = content.getProfilVariables();
+        List<EGCourbeSimple> courbes = new ArrayList<>();
+        ResultatTimeKey selectedTime = reportService.getSelectedTime();
+        if (selectedTime != null) {
+            for (ReportRunVariableKey reportRunVariableKey : var) {
+                if (reportRunVariableKey.isReadOrVariable() && !isExpressionNotTimeDependant(reportRunVariableKey)) {
+                    if (progress != null) {
+                        progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
+                    }
+                    EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, selectedTime, true);
+                    courbes.add(courbe);
+                }
+            }
+        }
+        return courbes;
     }
-    for (ReportRunVariableKey reportRunVariableKey : variables) {
-      keys.add(reportRunVariableKey.getRunKey());
+
+    public EMHSectionProfil retrieveProfil(EMH emh) {
+        return ReportProfilHelper.retrieveProfil(emh);
     }
-    return keys;
-  }
-  
-  EGAxeVertical getRightAxis(ReportLongitudinalConfig content, Map<String, EGAxeVertical> savedAxed) {
-    String variableDrawnOnRightAxis = content.getVariableDrawnOnRightAxis(reportResultProviderService);
-    EGAxeVertical rightAxis = null;
-    if (StringUtils.isNotBlank(variableDrawnOnRightAxis)) {
-      rightAxis = getOrCreateAxeVerticalConfigured(reportResultProviderService.getPropertyNature(variableDrawnOnRightAxis), content, savedAxed);
+
+    public ItemVariable getVariableZ() {
+        return reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_Z);
     }
-    if (rightAxis != null) {
-      rightAxis.setDroite(true);
+
+    protected void updateReadCourbeName(EGCourbe courbe) {
+        ReportRunVariableTimeKey key = (ReportRunVariableTimeKey) ((CourbeModelWithKey) courbe.getModel()).getKey();
+        if (!key.isLimitProfilVariable()) {
+            courbe.getModel().setTitle(key.getDisplayName(getReportResultProviderService().getReportService().getReportTimeFormatter().
+                    getResulatKeyTempsSceToStringTransformer()));
+        }
     }
-    return rightAxis;
-  }
-  
-  void updateCourbeNames(ReportLongitudinalConfig content) {
-    EGCourbeSimple[] courbes = uiController.getEGGrapheSimpleModel().getCourbes();
-    for (EGCourbeSimple courbe : courbes) {
-      updateReadCourbeName(courbe);
-      
+
+    public Set<ReportRunKey> getRunKeysToUse(ReportLongitudinalConfig content) {
+        final List<ReportRunVariableKey> variables = content.getProfilVariables();
+        Set<ReportRunKey> keys = new HashSet<>();
+        if (reportService.getRunCourant() != null) {
+            keys.add(reportService.getRunCourant().getRunKey());
+        }
+        for (ReportRunVariableKey reportRunVariableKey : variables) {
+            keys.add(reportRunVariableKey.getRunKey());
+        }
+        return keys;
     }
-  }
-  
-  public EGGraphe getGraphe() {
-    return uiController.getGraphe();
-  }
 
-  /**
-   *
-   * @param content
-   * @param axeZ
-   * @param courbeBuilder
-   * @param progress
-   * @return les courbes non dépendants du temps sélectionné.
-   */
-  private List<EGCourbeSimple> createNonTimeStepCourbes(ReportLongitudinalConfig content, EGAxeVertical axeZ,
-          ReportLongitudinalGrapheBuilderCourbe courbeBuilder, ProgressHandle progress) {
-    List<EGCourbeSimple> courbes = new ArrayList<>();
-    ReportLongitudinalGrapheBuilderLimit limitBuilder = new ReportLongitudinalGrapheBuilderLimit(reportService.getCcm());
-    final List<ReportRunVariableKey> variables = content.getProfilVariables();
-    for (ReportRunVariableKey reportRunVariableKey : variables) {
-      if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(reportRunVariableKey.getVariable().getVariableType())) {
-        if (progress != null) {
-          progress.setDisplayName(reportRunVariableKey.getDisplayName());
+    EGAxeVertical getRightAxis(ReportLongitudinalConfig content, Map<String, EGAxeVertical> savedAxed) {
+        String variableDrawnOnRightAxis = content.getVariableDrawnOnRightAxis(reportResultProviderService);
+        EGAxeVertical rightAxis = null;
+        if (StringUtils.isNotBlank(variableDrawnOnRightAxis)) {
+            rightAxis = getOrCreateAxeVerticalConfigured(reportResultProviderService.getPropertyNature(variableDrawnOnRightAxis), content, savedAxed);
         }
-        LoiConstanteCourbeModel model = limitBuilder.build(reportRunVariableKey, result.getCartouches());
-        if (model != null && model.getKey() != null && content.getCourbeconfigs() != null) {
-          EGCourbeSimple courbe = new EGCourbeSimple(axeZ, model);
-          
-          AbstractReportGrapheBuilder.applyPersistConfig(content.getCourbeconfigs().get(model.getKey()), courbe);
-          courbes.add(courbe);
+        if (rightAxis != null) {
+            rightAxis.setDroite(true);
         }
-      } else if (ReportVariableTypeEnum.RESULTAT_RPTI.equals(reportRunVariableKey.getVariable().getVariableType())) {
-        if (progress != null) {
-          progress.setDisplayName(reportRunVariableKey.getDisplayName());
+        return rightAxis;
+    }
+
+    void updateCourbeNames(ReportLongitudinalConfig content) {
+        EGCourbeSimple[] courbes = uiController.getEGGrapheSimpleModel().getCourbes();
+        for (EGCourbeSimple courbe : courbes) {
+            updateReadCourbeName(courbe);
+
         }
-        EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, false);
-        courbes.add(courbe);
-      }
     }
-    final List<ResultatTimeKey> times = content.getTimes();
-    //contient les clés des courbes qui ne dépendent pas du temps et donc à ne créer qu'une seule fois
-    Set<ReportRunVariableKey> timeIndependantVariable = new HashSet<>();
-    for (ResultatTimeKey timeKey : times) {
-      for (ReportRunVariableKey reportRunVariableKey : variables) {
-        ResultatTimeKey timeKeyToUse = timeKey;
-        if (reportRunVariableKey.isReadOrVariable()) {
-          if (progress != null) {
-            progress.setDisplayName(reportRunVariableKey.getDisplayName() + " " + timeKey.toString());
-          }
-          boolean isExpressionNotTimeDependant = isExpressionNotTimeDependant(reportRunVariableKey);
-          boolean useCurrentTime = false;
-          if (isExpressionNotTimeDependant) {
-            //on ne construit pas la courbe si elle n'est pas dépendante du temps et déja construite
-            //idem si le temps courant est affiché c'est pas la peine
-            if (timeIndependantVariable.contains(reportRunVariableKey) || content.getCurrentTimeDisplayed()) {
-              continue;
+
+    public EGGraphe getGraphe() {
+        return uiController.getGraphe();
+    }
+
+    /**
+     *
+     * @param content
+     * @param axeZ
+     * @param courbeBuilder
+     * @param progress
+     * @return les courbes non dépendants du temps sélectionné.
+     */
+    private List<EGCourbeSimple> createNonTimeStepCourbes(ReportLongitudinalConfig content, EGAxeVertical axeZ,
+            ReportLongitudinalGrapheBuilderCourbe courbeBuilder, ProgressHandle progress) {
+        List<EGCourbeSimple> courbes = new ArrayList<>();
+        ReportLongitudinalGrapheBuilderLimit limitBuilder = new ReportLongitudinalGrapheBuilderLimit(reportService.getCcm());
+        final List<ReportRunVariableKey> variables = content.getProfilVariables();
+        for (ReportRunVariableKey reportRunVariableKey : variables) {
+            if (isExpressionNotTimeDependant(reportRunVariableKey)) {
+                if (progress != null) {
+                    progress.setDisplayName(reportRunVariableKey.getVariableName() + ": " + reportRunVariableKey.getReportRunKey().getDisplayName());
+                }
+                EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, true);
+                courbes.add(courbe);
             }
-            timeIndependantVariable.add(reportRunVariableKey);
-            //si pas dépend du temps on utilise le temps courant: astuce pour ne pas afficher le temps dans le nom de la courbe
-            useCurrentTime = true;
-            timeKeyToUse = reportService.getSelectedTime();
-          }
-          EGCourbeSimple createCourbe = courbeBuilder.createCourbe(reportRunVariableKey, timeKeyToUse, useCurrentTime);
-          courbes.add(createCourbe);
+            if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(reportRunVariableKey.getVariable().getVariableType())) {
+                if (progress != null) {
+                    progress.setDisplayName(reportRunVariableKey.getDisplayName());
+                }
+                LoiConstanteCourbeModel model = limitBuilder.build(reportRunVariableKey, result.getCartouches());
+                if (model != null && model.getKey() != null && content.getCourbeconfigs() != null) {
+                    EGCourbeSimple courbe = new EGCourbeSimple(axeZ, model);
+
+                    AbstractReportGrapheBuilder.applyPersistConfig(content.getCourbeconfigs().get(model.getKey()), courbe);
+                    courbes.add(courbe);
+                }
+            } else if (ReportVariableTypeEnum.RESULTAT_RPTI.equals(reportRunVariableKey.getVariable().getVariableType())) {
+                if (progress != null) {
+                    progress.setDisplayName(reportRunVariableKey.getDisplayName());
+                }
+                EGCourbeSimple courbe = courbeBuilder.createCourbe(reportRunVariableKey, null, false);
+                courbes.add(courbe);
+            }
         }
-      }
+        final List<ResultatTimeKey> times = content.getTimes();
+        //contient les clés des courbes qui ne dépendent pas du temps et donc à ne créer qu'une seule fois
+        Set<ReportRunVariableKey> timeIndependantVariable = new HashSet<>();
+        for (ResultatTimeKey timeKey : times) {
+            for (ReportRunVariableKey reportRunVariableKey : variables) {
+                ResultatTimeKey timeKeyToUse = timeKey;
+                if (reportRunVariableKey.isReadOrVariable()) {
+                    if (progress != null) {
+                        progress.setDisplayName(reportRunVariableKey.getDisplayName() + " " + timeKey.toString());
+                    }
+                    boolean isExpressionNotTimeDependant = isExpressionNotTimeDependant(reportRunVariableKey);
+                    boolean useCurrentTime = false;
+                    if (isExpressionNotTimeDependant) {
+                        //on ne construit pas la courbe si elle n'est pas dépendante du temps et déja construite
+                        //idem si le temps courant est affiché c'est pas la peine
+                        if (timeIndependantVariable.contains(reportRunVariableKey) || content.getCurrentTimeDisplayed()) {
+                            continue;
+                        }
+                        timeIndependantVariable.add(reportRunVariableKey);
+                        //si pas dépend du temps on utilise le temps courant: astuce pour ne pas afficher le temps dans le nom de la courbe
+                        useCurrentTime = true;
+                        timeKeyToUse = reportService.getSelectedTime();
+                    }
+                    EGCourbeSimple createCourbe = courbeBuilder.createCourbe(reportRunVariableKey, timeKeyToUse, useCurrentTime);
+                    courbes.add(createCourbe);
+                }
+            }
+        }
+        return courbes;
     }
-    return courbes;
-  }
 
-  /**
-   *
-   * @param reportRunVariableKey
-   * @return true si la variable n'est pas dépendante du temps. C'est le cas des MaxSurTous..., MaxSurSelection,...
-   */
-  protected boolean isExpressionNotTimeDependant(ReportRunVariableKey reportRunVariableKey) {
-    boolean isExpressionNotTimeDependant = false;
-    if (reportRunVariableKey.getVariable().getVariableType().equals(ReportVariableTypeEnum.FORMULE)) {
-      boolean containsTimeDependantVariable = reportResultProviderService.containsTimeDependantVariable(reportRunVariableKey.getVariable().
-              getVariableName());
-      isExpressionNotTimeDependant = !containsTimeDependantVariable;
-      
+    /**
+     *
+     * @param reportRunVariableKey
+     * @return true si la variable n'est pas dépendante du temps. C'est le cas
+     * des MaxSurTous..., MaxSurSelection,...
+     */
+    protected boolean isExpressionNotTimeDependant(ReportRunVariableKey reportRunVariableKey) {
+        boolean isExpressionNotTimeDependant = false;
+        if (reportRunVariableKey.getVariable().getVariableType().equals(ReportVariableTypeEnum.FORMULE)) {
+            boolean containsTimeDependantVariable = reportResultProviderService.containsTimeDependantVariable(reportRunVariableKey.getVariable().
+                    getVariableName());
+            isExpressionNotTimeDependant = !containsTimeDependantVariable;
+
+        }
+        return isExpressionNotTimeDependant;
     }
-    return isExpressionNotTimeDependant;
-  }
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9551] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/layer/PivFlowResultsLayer.java

[<bma...@us...>]

Revision: 9551
          http://sourceforge.net/p/fudaa/svn/9551
Author:   bmarchan
Date:     2017-05-04 14:36:08 +0000 (Thu, 04 May 2017)
Log Message:
-----------
Chgt intitules legende vitesses verticales

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java	2017-05-04 14:27:45 UTC (rev 9550)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java	2017-05-04 14:36:08 UTC (rev 9551)
@@ -50,13 +50,13 @@
     plages[0].setMin(-0.5);
     plages[0].setMax(0.5);
     plages[0].setCouleur(Color.ORANGE);
-    plages[0].setLegende(PivResource.getS("Calcul\xE9es"));
+    plages[0].setLegende(PivResource.getS("Interpol\xE9es"));
 
     plages[1]=new BPlage();
     plages[1].setMin(0.5);
     plages[1].setMax(1.5);
     plages[1].setCouleur(new Color(200,120,0));
-    plages[1].setLegende(PivResource.getS("Interpol\xE9es"));
+    plages[1].setLegende(PivResource.getS("Extrapol\xE9es"));
     pal.setPlages(plages);
     setPaletteCouleurPlages(pal);
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9550] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv

[<bma...@us...>]

Revision: 9550
          http://sourceforge.net/p/fudaa/svn/9550
Author:   bmarchan
Date:     2017-05-04 14:27:45 +0000 (Thu, 04 May 2017)
Log Message:
-----------
Distinction vitesses transect calculees/interpolees

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivShow3DTransectPanel.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivDischargeReader.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsModel.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivFlowResults.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivGlobalFlowResults.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsI.java

Added Paths:
-----------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2017-05-04 12:21:04 UTC (rev 9549)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2017-05-04 14:27:45 UTC (rev 9550)
@@ -49,6 +49,7 @@
 import org.fudaa.fudaa.piv.action.PivRealViewAction;
 import org.fudaa.fudaa.piv.action.PivTransectParamAction;
 import org.fudaa.fudaa.piv.layer.PivControlPointsModel;
+import org.fudaa.fudaa.piv.layer.PivFlowResultsLayer;
 import org.fudaa.fudaa.piv.layer.PivFlowResultsModel;
 import org.fudaa.fudaa.piv.layer.PivImageRasterLayer;
 import org.fudaa.fudaa.piv.layer.PivOrthoPointsModel;
@@ -111,7 +112,7 @@
   /** L'affichage des vitesses filtr\xE9es instantan\xE9es */
   PivVelResultsLayer cqInstantVelFltResults_;
   /** L'affichage des r\xE9sultats de d\xE9bit */
-  ZCalqueFleche cqFlowResults;
+  PivFlowResultsLayer cqFlowResults;
   /** L'affichage des r\xE9sultats instantan\xE9s filtr\xE9s */
   PivResultsLayer cqInstantFltIso_;
   /** L'affichage des r\xE9sultats instantan\xE9s */
@@ -290,18 +291,13 @@
     cqInstantVelFltResults_.setVisible(false);
 
     // Layer des d\xE9bits.
-    cqFlowResults = new ZCalqueFleche() {
-      @Override
-      protected String getFlecheUnit() {
-        return "m/s";
-      }
-    };
+    cqFlowResults = new PivFlowResultsLayer();
     cqFlowResults.setTitle(PivResource.getS("Vit. moy. prof."));
     cqFlowResults.setLongTitle(PivResource.getS("Vitesses moyenn\xE9es sur la profondeur"));
     cqFlowResults.setTitleModifiable(true);
     cqFlowResults.setName("cqRealFlow");
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
-    cqFlowResults.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.ORANGE));
+    cqFlowResults.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 2, Color.ORANGE));
     
     // Layer des transect
     cqTransect_= new PivTransectLayer();

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivShow3DTransectPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivShow3DTransectPanel.java	2017-05-04 12:21:04 UTC (rev 9549)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivShow3DTransectPanel.java	2017-05-04 14:27:45 UTC (rev 9550)
@@ -28,8 +28,6 @@
 public class PivShow3DTransectPanel extends CtuluDialogPanel {
   PivImplementation impl_;
   EG3dGraph pnGraph_;
-  private EG3dDefaultDataRenderer transRenderer_;
-  private EG3dDefaultDataRenderer disRenderer_;
   /** Le morphisme pour passer des donn\xE9es data vers le repere courant */
   GrMorphisme toReal_;
   
@@ -149,31 +147,31 @@
       double vy;
       double lgFleche;
 
-      switch (_idx%5) {
+      switch (_idx % 5) {
       // Point d'origine
       case 0:
       default:
-        return (float)res_.getY(_idx/5);
+        return (float) res_.getY(_idx / 5);
       // Point extremit\xE9
       case 1:
       case 3:
-        return (float)(res_.getY(_idx/5)+res_.getValue(_idx/5,ResultType.VY)*ratio_);
-        // Point extremite 1 fleche
-        case 2:
-          vx=res_.getValue(_idx/5,ResultType.VX)*ratio_;
-          vy=res_.getValue(_idx/5,ResultType.VY)*ratio_;
-          lgFleche=Math.sqrt(vx*vx+vy*vy)/10.;
-          double angVit=Math.atan2(vy, vx);
-          double angFleche=angVit+5./6.*Math.PI;
-          return (float)(lgFleche*Math.sin(angFleche)+res_.getY(_idx/5)+vy);
-          // Point extremite 2 fleche
-        case 4:
-          vx=res_.getValue(_idx/5,ResultType.VX)*ratio_;
-          vy=res_.getValue(_idx/5,ResultType.VY)*ratio_;
-          lgFleche=Math.sqrt(vx*vx+vy*vy)/10.;
-          angVit=Math.atan2(vy, vx);
-          angFleche=angVit-5./6.*Math.PI;
-          return (float)(lgFleche*Math.sin(angFleche)+res_.getY(_idx/5)+vy);
+        return (float) (res_.getY(_idx / 5) + res_.getValue(_idx / 5, ResultType.VY) * ratio_);
+      // Point extremite 1 fleche
+      case 2:
+        vx=res_.getValue(_idx / 5, ResultType.VX) * ratio_;
+        vy=res_.getValue(_idx / 5, ResultType.VY) * ratio_;
+        lgFleche=Math.sqrt(vx * vx + vy * vy) / 10.;
+        double angVit=Math.atan2(vy, vx);
+        double angFleche=angVit + 5. / 6. * Math.PI;
+        return (float) (lgFleche * Math.sin(angFleche) + res_.getY(_idx / 5) + vy);
+      // Point extremite 2 fleche
+      case 4:
+        vx=res_.getValue(_idx / 5, ResultType.VX) * ratio_;
+        vy=res_.getValue(_idx / 5, ResultType.VY) * ratio_;
+        lgFleche=Math.sqrt(vx * vx + vy * vy) / 10.;
+        angVit=Math.atan2(vy, vx);
+        angFleche=angVit - 5. / 6. * Math.PI;
+        return (float) (lgFleche * Math.sin(angFleche) + res_.getY(_idx / 5) + vy);
       }
     }
 
@@ -181,8 +179,64 @@
     public float getZ(int _idx) {
       return (float)zniv_;
     }
+    
+    /**
+     * @return True, si le trac\xE9 entre le point pr\xE9c\xE9dent et celui ci correspondant \xE0 une vitesse extrapol\xE9e.
+     */
+    public boolean isExtrapolated(int _idx) {
+      // 1er point ligne horizontale
+      if (_idx<2) {
+        return false;
+      }
+      _idx-=2;
+      
+      return res_.getValue(_idx/5, ResultType.COMPUTE_MODE)!=0;
+    }
   }
   
+  class DischargeRenderer extends EG3dDefaultDataRenderer {
+    DischargeModel mdl_;
+    
+    public DischargeRenderer(DischargeModel _mdl) {
+      mdl_=_mdl;
+      
+      setLineColor(0, Color.ORANGE.darker());
+      setLineThickness(0, 1.f);
+    }
+    
+    @Override
+    public int getLineStyle(int _idx) {
+      if (_idx==0)
+        return TraceLigne.POINTILLE;
+      if (_idx==1)
+        return TraceLigne.INVISIBLE;
+      
+      if ((_idx-2)%5==4)
+        return TraceLigne.INVISIBLE;
+      else
+        return lm.getTypeTrait();
+    }
+
+    /* (non-Javadoc)
+     * @see org.fudaa.ebli.graphe3D.renderer.EG3dDefaultDataRenderer#getLineColor(int)
+     */
+    @Override
+    public Color getLineColor(int _idx) {
+      if (mdl_.isExtrapolated(_idx))
+        return new Color(200,120,0);
+      else
+        return Color.ORANGE;
+    }
+  }
+  
+  class TransectRenderer extends EG3dDefaultDataRenderer {
+    public TransectRenderer() {
+      
+      setLineColor(0, Color.BLUE);
+      setLineThickness(0, 1.f);
+    }
+  }
+  
   /**
    * Constructeur.
    */
@@ -194,28 +248,6 @@
   private void customize() {
     setLayout(new BorderLayout());
     
-    transRenderer_=new EG3dDefaultDataRenderer();
-    transRenderer_.setLineColor(0, Color.ORANGE);
-    transRenderer_.setLineThickness(0, 1.f);
-    
-    disRenderer_=new EG3dDefaultDataRenderer() {
-      @Override
-      public int getLineStyle(int _idx) {
-        if (_idx==0)
-          return TraceLigne.TIRETE;
-        if (_idx==1)
-          return TraceLigne.INVISIBLE;
-        
-        _idx-=2;
-        if (_idx%5==4)
-          return TraceLigne.INVISIBLE;
-        else
-          return lm.getTypeTrait();
-      }
-    };
-    disRenderer_.setLineColor(0, Color.BLUE.darker());
-    disRenderer_.setLineThickness(0, 1.f);
-    
     EG3dGraphPanel pn=new EG3dGraphPanel();
     pn.setPreferredSize(new Dimension(700,500));
     
@@ -245,7 +277,7 @@
     for (int i=0; i<_isels.length; i++) {
       TransectModel mdl=new TransectModel(transects[_isels[i]].getStraight().applique(toReal_));
       pnGraph_.addData(mdl);
-      pnGraph_.setDataRenderer(i, transRenderer_);
+      pnGraph_.setDataRenderer(i, new TransectRenderer());
     }
     
     PivFlowResults[] res=impl_.getCurrentProject().getFlowResults();
@@ -258,7 +290,7 @@
         DischargeModel mdl=new DischargeModel(pl,ptZ.z_,resAdapter);
         
         pnGraph_.addData(mdl);
-        pnGraph_.setDataRenderer(i+_isels.length, disRenderer_);
+        pnGraph_.setDataRenderer(i+_isels.length, new DischargeRenderer(mdl));
       }
     }
     

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivDischargeReader.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivDischargeReader.java	2017-05-04 12:21:04 UTC (rev 9549)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivDischargeReader.java	2017-05-04 14:27:45 UTC (rev 9550)
@@ -62,6 +62,7 @@
     TDoubleArrayList ly=new TDoubleArrayList();
     TDoubleArrayList lvx=new TDoubleArrayList();
     TDoubleArrayList lvy=new TDoubleArrayList();
+    TDoubleArrayList lmode=new TDoubleArrayList();
 
     if (super.in_ == null) {
       analyze_.addErrorFromFile(PivResource.getS("Flux d'entr\xE9e non trouv\xE9"), 0);
@@ -98,8 +99,6 @@
       while (true) {
         in_.readFields();
 
-        // Pour l'instant, pas de r\xE9cup\xE9ration des vitesses extrapol\xE9es.
-        if (in_.doubleField(8) == 0) {
           // X
           lx.add(in_.doubleField(2));
           // Y
@@ -108,7 +107,8 @@
           lvx.add(in_.doubleField(5));
           // VY
           lvy.add(in_.doubleField(6));
-        }
+          // Extrapolation
+          lmode.add(in_.doubleField(8));
 
         lu+=84; // Si le formattage en fortran
 
@@ -124,6 +124,7 @@
       res.setY(ly.toNativeArray());
       res.setVx(lvx.toNativeArray());
       res.setVy(lvy.toNativeArray());
+      res.setComputeMode(lmode.toNativeArray());
     }
     catch (final IOException e) {
       analyze_.addErrorFromFile(PivResource.getS("Une erreur de lecture s'est produite"), in_.getLineNumber());

Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java	                        (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java	2017-05-04 14:27:45 UTC (rev 9550)
@@ -0,0 +1,106 @@
+package org.fudaa.fudaa.piv.layer;
+
+import java.awt.Color;
+
+import org.fudaa.ebli.calque.ZCalqueFleche;
+import org.fudaa.ebli.commun.EbliUIProperties;
+import org.fudaa.ebli.geometrie.GrSegment;
+import org.fudaa.ebli.palette.BPalettePlage;
+import org.fudaa.ebli.palette.BPlage;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.piv.PivResource;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * Un modele pour le trac\xE9 des d\xE9bits sous forme de vecteurs vitesses.
+ * @author Bertrand Marchand (mar...@de...)
+ */
+public class PivFlowResultsLayer extends ZCalqueFleche {
+
+  /**
+   * Construction du calque.
+   */
+  public PivFlowResultsLayer() {
+    super();
+    
+    definePalette();
+  }
+
+  @Override
+  public void initFrom(final EbliUIProperties _p) {
+    if (_p != null) {
+      super.initFrom(_p);
+    }
+    
+    if (paletteCouleur_ == null || paletteCouleur_.getNbPlages() != 2) {
+      definePalette();
+    }
+  }
+  
+  /**
+   * Definition de la palette (utilis\xE9e pour les couleurs de trait et la l\xE9gende)
+   */
+  protected void definePalette() {
+    BPalettePlage pal=new BPalettePlage();
+    BPlage[] plages=new BPlage[2];
+    plages[0]=new BPlage();
+    plages[0].setMin(-0.5);
+    plages[0].setMax(0.5);
+    plages[0].setCouleur(Color.ORANGE);
+    plages[0].setLegende(PivResource.getS("Calcul\xE9es"));
+
+    plages[1]=new BPlage();
+    plages[1].setMin(0.5);
+    plages[1].setMax(1.5);
+    plages[1].setCouleur(new Color(200,120,0));
+    plages[1].setLegende(PivResource.getS("Interpol\xE9es"));
+    pal.setPlages(plages);
+    setPaletteCouleurPlages(pal);
+  }
+
+  @Override
+  public boolean isPaletteModifiable() {
+    return true;
+  }
+  
+  
+  /**
+   * On recupere la couleur des vecteurs suivant le mode de calcul du vecteur.
+   */
+  @Override
+  protected boolean updateTraceLigne(TraceLigneModel _ligne, TraceIconModel _icone, GrSegment _s, int _idx) {
+    Color color=getPaletteColorFor(modeleDonnees().getComputeMode(_idx));
+    if (color != null) {
+      _ligne.setCouleur(color);
+      _ligne.setTypeTrait(ligneModel_.getTypeTrait());
+    }
+    // Trait invisible
+    else {
+      _ligne.setCouleur(ligneModel_.getCouleur());
+      _ligne.setTypeTrait(TraceLigne.INVISIBLE);
+    }
+    return true;
+  }
+
+  @Override
+  public PivFlowResultsModel modeleDonnees() {
+    return (PivFlowResultsModel)modele_;
+  }
+  
+  public void setModele(PivFlowResultsModel _s) {
+    if (_s==null || _s instanceof PivFlowResultsModel)
+      setFlecheModele(_s);
+    else {
+      FuLog.error(new Throwable("PivFlowResultsModel is expected"));
+    }
+  }
+  
+  @Override
+  protected String getFlecheUnit() {
+    return "m/s";
+  }
+  
+}


Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsLayer.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsModel.java	2017-05-04 12:21:04 UTC (rev 9549)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivFlowResultsModel.java	2017-05-04 14:27:45 UTC (rev 9550)
@@ -147,6 +147,10 @@
   public double getZ2(int _i) {
     return 0;
   }
+  
+  public double getComputeMode(int _i) {
+    return res_.getComputeMode(_i);
+  }
 
   @Override
   public BuTable createValuesTable(ZCalqueAffichageDonneesInterface _layer) {

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivFlowResults.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivFlowResults.java	2017-05-04 12:21:04 UTC (rev 9549)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivFlowResults.java	2017-05-04 14:27:45 UTC (rev 9550)
@@ -29,6 +29,8 @@
   protected double[] vx;
   /** Les vitesses suivant Vy */
   protected double[] vy;
+  /** Mode de calcul : Si 1, la vitesse est extrapol\xE9e. 0 : Calcul\xE9e */
+  protected double[] computeMode;
 
   /**
    * @return Le debit
@@ -156,6 +158,14 @@
   public void setVy(double[] _vy) {
     vy=_vy;
   }
+  
+  /**
+   * Definit le caract\xE8re extrapol\xE9 ou calcul\xE9 des vitesses.
+   * @param _computeMode Si 1 : Extrapol\xE9e, 0 : Calcul\xE9e.
+   */
+  public void setComputeMode(double[] _computeMode) {
+    computeMode = _computeMode;
+  }
 
   @Override
   public boolean hasResult(ResultType _tpRes) {
@@ -164,7 +174,7 @@
 
   @Override
   public ResultType[] getResults() {
-    return new ResultType[]{ResultType.VX,ResultType.VY,ResultType.FULL_DISCHARGE, ResultType.WETTED_AREA, ResultType.MEAN_VELOCITY, ResultType.WATER_ELEVATION, ResultType.MEASURED_DISCHARGE};
+    return new ResultType[]{ResultType.VX, ResultType.VY, ResultType.COMPUTE_MODE, ResultType.FULL_DISCHARGE, ResultType.WETTED_AREA, ResultType.MEAN_VELOCITY, ResultType.WATER_ELEVATION, ResultType.MEASURED_DISCHARGE};
   }
 
   @Override
@@ -178,6 +188,8 @@
       return getVx(_ind);
     else if (ResultType.VY.equals(_tpRes))
       return getVy(_ind);
+    else if (ResultType.COMPUTE_MODE.equals(_tpRes))
+      return computeMode[_ind];
     else if (ResultType.FULL_DISCHARGE.equals(_tpRes))
       return discharge;
     else if (ResultType.WETTED_AREA.equals(_tpRes))
@@ -198,6 +210,8 @@
       return vy;
     else if (ResultType.VY.equals(_tpRes))
       return vy;
+    else if  (ResultType.COMPUTE_MODE.equals(_tpRes))
+      return computeMode;
     else if (ResultType.FULL_DISCHARGE.equals(_tpRes))
       return new double[]{discharge};
     else if (ResultType.WETTED_AREA.equals(_tpRes))
@@ -224,6 +238,8 @@
       vx[_ind] = _val;
     else if (ResultType.VY.equals(_tpRes))
       vy[_ind] = _val;
+    else if (ResultType.COMPUTE_MODE.equals(_tpRes))
+      computeMode[_ind] = _val;
     else if (ResultType.FULL_DISCHARGE.equals(_tpRes))
       discharge = _val;
     else if (ResultType.WETTED_AREA.equals(_tpRes))

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivGlobalFlowResults.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivGlobalFlowResults.java	2017-05-04 12:21:04 UTC (rev 9549)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivGlobalFlowResults.java	2017-05-04 14:27:45 UTC (rev 9550)
@@ -54,6 +54,14 @@
     return -1;
   }
   
+  public double getComputeMode(int _i) {
+    PivResultsI res=getRes(_i);
+    if (res!=null) 
+      return res.getValue(_i-cpt_,ResultType.COMPUTE_MODE);
+    
+    return -1;
+  }
+  
   /**
    * @return Le nombre de points de v\xE9locit\xE9.
    */

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsI.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsI.java	2017-05-04 12:21:04 UTC (rev 9549)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsI.java	2017-05-04 14:27:45 UTC (rev 9550)
@@ -22,6 +22,8 @@
     CORREL(true),
     OMEGA(true),
     DIVERG(true),
+    /** Mode de calcul des vitesses sur les transect : Extrapol\xE9e si valeur 1, calcul\xE9e si 0. */
+    COMPUTE_MODE(true),
     /** D\xE9bit total */
     FULL_DISCHARGE(false),
     /** D\xE9bit mesur\xE9 */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9549] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque

[<bma...@us...>]

Revision: 9549
          http://sourceforge.net/p/fudaa/svn/9549
Author:   bmarchan
Date:     2017-05-04 12:21:04 +0000 (Thu, 04 May 2017)
Log Message:
-----------
Amelioration affichage legende ZCalqueFleche

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFleche.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueSegment.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java	2017-04-26 08:33:05 UTC (rev 9548)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java	2017-05-04 12:21:04 UTC (rev 9549)
@@ -115,7 +115,9 @@
    * Les objets du calques sont-ils selectionnables
    */
   protected boolean isSelectable_ = true;
+  /** La palette de couleurs. Peut \xEAtre null */
   protected BPalettePlageAbstract paletteCouleur_;
+  /** Le panneau de l\xE9gende associ\xE9 au calque. Peut \xEAtre null */
   protected BPalettePlageLegende paletteLegende_;
 
   public ZCalqueAffichageDonneesAbstract() {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFleche.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFleche.java	2017-04-26 08:33:05 UTC (rev 9548)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFleche.java	2017-05-04 12:21:04 UTC (rev 9549)
@@ -205,7 +205,7 @@
     }
   }
 
-  private ZCalqueFlecheLegend flecheLegend_;
+  protected ZCalqueFlecheLegend flecheLegend_;
 
   final FlecheScaleData scale_ = new FlecheScaleData(this);
   final FlecheGrilleData grille_ = new FlecheGrilleData(this);
@@ -271,12 +271,18 @@
 
   @Override
   protected void construitLegende() {
+    final BCalqueLegende l = getLegende();
+    if (l == null) {
+      return;
+    }
+    
     if (paletteLegende_ == null) {
-      paletteCouleur_ = new BPalettePlage(new BPlageInterface[0]);
-      paletteCouleur_.setTitre(getTitle());
-      paletteLegende_ = new BPalettePlageLegende(paletteCouleur_);
+      paletteLegende_ = new BPalettePlageLegende();
       paletteLegende_.addUserComponent(flecheLegend_.getFlecheComponent());
     }
+    
+    paletteLegende_.setModel(paletteCouleur_);
+    
     super.construitLegende();
     updateLegendeTitre();
   }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueSegment.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueSegment.java	2017-04-26 08:33:05 UTC (rev 9548)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueSegment.java	2017-05-04 12:21:04 UTC (rev 9549)
@@ -239,11 +239,23 @@
   }
 
   protected final Color getPaletteColorFor(final GrSegment _s) {
-    return ((BPalettePlage) paletteCouleur_).getColorFor(_s.longueurXY());
+    // BM : Evite les traceback si la palette n'est pas une palette plage. 
+    if (paletteCouleur_ instanceof BPalettePlage) {
+      return ((BPalettePlage) paletteCouleur_).getColorFor(_s.longueurXY());
+    }
+    else {
+      return ligneModel_.getCouleur();
+    }
   }
 
   public final Color getPaletteColorFor(final double _l) {
-    return ((BPalettePlage) paletteCouleur_).getColorFor(_l);
+    // BM : Evite les traceback si la palette n'est pas une palette plage. 
+    if (paletteCouleur_ instanceof BPalettePlage) {
+      return ((BPalettePlage) paletteCouleur_).getColorFor(_l);
+    }
+    else {
+      return ligneModel_.getCouleur();
+    }
   }
 
   public final boolean isPaletteUsed() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[9548] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv

[<bma...@us...>]

Revision: 9548
          http://sourceforge.net/p/fudaa/svn/9548
Author:   bmarchan
Date:     2017-04-26 08:33:05 +0000 (Wed, 26 Apr 2017)
Log Message:
-----------
- Unite precisee pour les coordonnees reelles
- Palettes redimentionnables

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivChangeCoordinatesSystemAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivEnterLineAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivOrthoPointsModel.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java	2017-04-25 16:31:24 UTC (rev 9547)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java	2017-04-26 08:33:05 UTC (rev 9548)
@@ -82,8 +82,8 @@
     }
   };
   
-  /** L'attribut utilis\xE9 pour la saisie de Z r\xE9el. */
-  public static final GISAttributeDouble ATT_IND_ZR=new GISAttributeDouble(PivResource.getS("Z r\xE9el"),true) {
+  /** L'attribut utilis\xE9 pour la saisie de Z r\xE9el. L'unit\xE9 devrait \xEAtre dans CommonUnit, mais l'affichage ne se fait pas quand c'est le cas. */
+  public static final GISAttributeDouble ATT_IND_ZR=new GISAttributeDouble(PivResource.getS("Z r\xE9el")+" (m)",true) {
     @Override
     public String getID() {
       return "ATT_REAL_Z";

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivChangeCoordinatesSystemAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivChangeCoordinatesSystemAction.java	2017-04-25 16:31:24 UTC (rev 9547)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivChangeCoordinatesSystemAction.java	2017-04-26 08:33:05 UTC (rev 9548)
@@ -18,6 +18,8 @@
     super(PivResource.getS("Rep\xE8re"), EbliResource.EBLI.getIcon("repere"), "CHANGE_TRANSF");
     setDefaultToolTip(PivResource.getS("Transformations du rep\xE8re initial vers le rep\xE8re de calcul"));
     impl_=_impl;
+    
+    setPaletteResizable(true);
   }
 
   @Override

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java	2017-04-25 16:31:24 UTC (rev 9547)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeGridDefinitionAction.java	2017-04-26 08:33:05 UTC (rev 9548)
@@ -152,6 +152,8 @@
     pnCalques_=_pn;
     controller_=new EditionController();
     setCalqueInteraction(_pn.getEditionLayer());
+    
+    setPaletteResizable(true);
     setEnabled(false);
   }
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivEnterLineAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivEnterLineAction.java	2017-04-25 16:31:24 UTC (rev 9547)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivEnterLineAction.java	2017-04-26 08:33:05 UTC (rev 9548)
@@ -59,6 +59,7 @@
 //    };
     
     setCalqueInteraction(_pn.getEditionLayer());
+    setPaletteResizable(true);
   }
 
   /**

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java	2017-04-25 16:31:24 UTC (rev 9547)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java	2017-04-26 08:33:05 UTC (rev 9548)
@@ -188,6 +188,7 @@
     propListener_=new EditionLayerPropertyListener();
     setCalqueInteraction(_pn.getEditionLayer());
     
+    setPaletteResizable(true);
     setEnabled(false);
   }
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java	2017-04-25 16:31:24 UTC (rev 9547)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoGRPAction.java	2017-04-26 08:33:05 UTC (rev 9548)
@@ -197,6 +197,7 @@
     propListener_=new EditionLayerPropertyListener();
     setCalqueInteraction(_pn.getEditionLayer());
     
+    setPaletteResizable(true);
     setEnabled(false);
   }
 
@@ -306,7 +307,7 @@
               pnParams.replaceAddButton(btValider);
               pnParams.setCoordinateDefinitions(pnCalques_.getCoordinateDefinitions());
               pnParams.targetChanged(cqOrthoPoints_);
-              pnParams.setPreferredSize(new Dimension(300,300));
+              pnParams.setPreferredSize(new Dimension(360,300));
               palette_.setEditorPanel(pnParams.getComponent());
               cqEdition_.setFeatures(pnParams.getAttributeContainer());
             }
@@ -330,6 +331,7 @@
       final Container c = SwingUtilities.getAncestorOfClass(JInternalFrame.class, pnCalques_);
       if (c instanceof JInternalFrame)
         ((JInternalFrame) c).addInternalFrameListener(new Piv2dFrameListener());
+      
     }
     return palette_.getComponent();
   }

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivOrthoPointsModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivOrthoPointsModel.java	2017-04-25 16:31:24 UTC (rev 9547)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivOrthoPointsModel.java	2017-04-26 08:33:05 UTC (rev 9548)
@@ -26,8 +26,8 @@
  * @version $Id$
  */
 public class PivOrthoPointsModel extends ZModelePointEditable implements PivEditableModel {
-  /** L'attribut utilis\xE9 pour la saisie de X r\xE9el. */
-  public static final GISAttributeDouble ATT_IND_XR=new GISAttributeDouble(PivResource.getS("X r\xE9el"),true) {
+  /** L'attribut utilis\xE9 pour la saisie de X r\xE9el. L'unit\xE9 devrait \xEAtre dans CommonUnit, mais l'affichage ne se fait pas quand c'est le cas. */
+  public static final GISAttributeDouble ATT_IND_XR=new GISAttributeDouble(PivResource.getS("X r\xE9el")+" (m)",true) {
 
     @Override
     public String getID() {
@@ -34,8 +34,8 @@
       return "ATT_REAL_X";
     }
   };
-  /** L'attribut utilis\xE9 pour la saisie de Y r\xE9el. */
-  public static final GISAttributeDouble ATT_IND_YR=new GISAttributeDouble(PivResource.getS("Y r\xE9el"),true) {
+  /** L'attribut utilis\xE9 pour la saisie de Y r\xE9el. L'unit\xE9 devrait \xEAtre dans CommonUnit, mais l'affichage ne se fait pas quand c'est le cas. */
+  public static final GISAttributeDouble ATT_IND_YR=new GISAttributeDouble(PivResource.getS("Y r\xE9el")+" (m)",true) {
 
     @Override
     public String getID() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.