Menu
▾
▴
fudaa-svn-commit — svn commit with diffs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
| 2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
| 2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
| 2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
| 2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
| 2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
| 2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
| 2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
| 2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2016-04-11 21:53:43
|
Revision: 9344
http://sourceforge.net/p/fudaa/svn/9344
Author: deniger
Date: 2016-04-11 21:53:41 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
version 1.8
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2016-04-11 21:40:40 UTC (rev 9343)
+++ trunk/soft/fudaa-crue/pom.xml 2016-04-11 21:53:41 UTC (rev 9344)
@@ -20,7 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javaCompiler>1.7</javaCompiler>
<targetJdk>1.7</targetJdk>
- <fudaa-sig.version>1.7-SNAPSHOT</fudaa-sig.version>
+ <fudaa-sig.version>1.7</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.
|
|
From: <de...@us...> - 2016-04-11 21:40:43
|
Revision: 9343
http://sourceforge.net/p/fudaa/svn/9343
Author: deniger
Date: 2016-04-11 21:40:40 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2016-04-11 21:40:35 UTC (rev 9342)
+++ trunk/business/fudaa-sig/pom.xml 2016-04-11 21:40:40 UTC (rev 9343)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
@@ -59,8 +59,8 @@
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.7</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.7</developerConnection>
- <url>https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.7</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</developerConnection>
+ <url>https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</url>
</scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:40:36
|
Revision: 9342
http://sourceforge.net/p/fudaa/svn/9342
Author: deniger
Date: 2016-04-11 21:40:35 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] copy for tag fudaa-sig-1.7
Added Paths:
-----------
tags/business/fudaa-sig-1.7/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:40:28
|
Revision: 9341
http://sourceforge.net/p/fudaa/svn/9341
Author: deniger
Date: 2016-04-11 21:40:26 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-sig-1.7
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2016-04-11 21:39:36 UTC (rev 9340)
+++ trunk/business/fudaa-sig/pom.xml 2016-04-11 21:40:26 UTC (rev 9341)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
@@ -59,8 +59,8 @@
<scm>
- <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</developerConnection>
- <url>https://svn.code.sf.net/p/fudaa/svn/trunk/business/fudaa-sig</url>
+ <connection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.7</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.7</developerConnection>
+ <url>https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-sig-1.7</url>
</scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:39:37
|
Revision: 9340
http://sourceforge.net/p/fudaa/svn/9340
Author: deniger
Date: 2016-04-11 21:39:36 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
version 1.8
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2016-04-11 21:38:29 UTC (rev 9339)
+++ trunk/business/fudaa-sig/pom.xml 2016-04-11 21:39:36 UTC (rev 9340)
@@ -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.7-SNAPSHOT</dodico-h2d.version>
+ <dodico-h2d.version>1.7</dodico-h2d.version>
<javaCompiler>1.7</javaCompiler>
<targetJdk>1.7</targetJdk>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:38:31
|
Revision: 9339
http://sourceforge.net/p/fudaa/svn/9339
Author: deniger
Date: 2016-04-11 21:38:29 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
version 1.8
Modified Paths:
--------------
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2016-04-11 21:34:53 UTC (rev 9338)
+++ trunk/business/dodico-h2d/pom.xml 2016-04-11 21:38:29 UTC (rev 9339)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-ef.version>1.7</fudaa-ef.version>
+ <fudaa-ef.version>1.8-SNAPSHOT</fudaa-ef.version>
<projetEncoding>ISO-8859-15</projetEncoding>
<!-- la version du compiler -->
<javaCompiler>1.6</javaCompiler>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:34:56
|
Revision: 9338
http://sourceforge.net/p/fudaa/svn/9338
Author: deniger
Date: 2016-04-11 21:34:53 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2016-04-11 21:34:48 UTC (rev 9337)
+++ trunk/business/dodico-h2d/core/pom.xml 2016-04-11 21:34:53 UTC (rev 9338)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<artifactId>h2d-core</artifactId>
<name>Core h2d</name>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2016-04-11 21:34:48 UTC (rev 9337)
+++ trunk/business/dodico-h2d/io/pom.xml 2016-04-11 21:34:53 UTC (rev 9338)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<artifactId>h2d-io</artifactId>
<name>I/O pour h2d</name>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2016-04-11 21:34:48 UTC (rev 9337)
+++ trunk/business/dodico-h2d/pom.xml 2016-04-11 21:34:53 UTC (rev 9338)
@@ -16,7 +16,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
@@ -50,10 +50,4 @@
<developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</developerConnection>
<url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.2</url>
</scm>-->
-
- <scm>
- <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/business/dodico-h2d-1.7</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/dodico-h2d-1.7</developerConnection>
- <url>http://svn.code.sf.net/p/fudaa/svn/tags/business/dodico-h2d-1.7</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:34:50
|
Revision: 9337
http://sourceforge.net/p/fudaa/svn/9337
Author: deniger
Date: 2016-04-11 21:34:48 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] copy for tag dodico-h2d-1.7
Added Paths:
-----------
tags/business/dodico-h2d-1.7/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:34:41
|
Revision: 9336
http://sourceforge.net/p/fudaa/svn/9336
Author: deniger
Date: 2016-04-11 21:34:39 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare release dodico-h2d-1.7
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2016-04-11 21:14:25 UTC (rev 9335)
+++ trunk/business/dodico-h2d/core/pom.xml 2016-04-11 21:34:39 UTC (rev 9336)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<artifactId>h2d-core</artifactId>
<name>Core h2d</name>
Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml 2016-04-11 21:14:25 UTC (rev 9335)
+++ trunk/business/dodico-h2d/io/pom.xml 2016-04-11 21:34:39 UTC (rev 9336)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<artifactId>h2d-io</artifactId>
<name>I/O pour h2d</name>
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2016-04-11 21:14:25 UTC (rev 9335)
+++ trunk/business/dodico-h2d/pom.xml 2016-04-11 21:34:39 UTC (rev 9336)
@@ -16,7 +16,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
@@ -50,4 +50,10 @@
<developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/dodico-h2d-1.2</developerConnection>
<url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/dodico-h2d-1.2</url>
</scm>-->
+
+ <scm>
+ <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/business/dodico-h2d-1.7</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/dodico-h2d-1.7</developerConnection>
+ <url>http://svn.code.sf.net/p/fudaa/svn/tags/business/dodico-h2d-1.7</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:14:28
|
Revision: 9335
http://sourceforge.net/p/fudaa/svn/9335
Author: deniger
Date: 2016-04-11 21:14:25 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
version 1.8
Modified Paths:
--------------
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2016-04-11 21:05:36 UTC (rev 9334)
+++ trunk/business/dodico-h2d/pom.xml 2016-04-11 21:14:25 UTC (rev 9335)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-ef.version>1.7-SNAPSHOT</fudaa-ef.version>
+ <fudaa-ef.version>1.7</fudaa-ef.version>
<projetEncoding>ISO-8859-15</projetEncoding>
<!-- la version du compiler -->
<javaCompiler>1.6</javaCompiler>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:05:38
|
Revision: 9334
http://sourceforge.net/p/fudaa/svn/9334
Author: deniger
Date: 2016-04-11 21:05:36 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
version 1.8
Modified Paths:
--------------
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2016-04-11 21:00:56 UTC (rev 9333)
+++ trunk/business/fudaa-ef/pom.xml 2016-04-11 21:05:36 UTC (rev 9334)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.7</fudaa-framework.version>
+ <fudaa-framework.version>1.8-SNAPSHOT</fudaa-framework.version>
<projetEncoding>ISO-8859-15</projetEncoding>
<!-- la version du compiler -->
<javaCompiler>1.6</javaCompiler>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:00:59
|
Revision: 9333
http://sourceforge.net/p/fudaa/svn/9333
Author: deniger
Date: 2016-04-11 21:00:56 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2016-04-11 21:00:51 UTC (rev 9332)
+++ trunk/business/fudaa-ef/core/pom.xml 2016-04-11 21:00:56 UTC (rev 9333)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2016-04-11 21:00:51 UTC (rev 9332)
+++ trunk/business/fudaa-ef/io/pom.xml 2016-04-11 21:00:56 UTC (rev 9333)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2016-04-11 21:00:51 UTC (rev 9332)
+++ trunk/business/fudaa-ef/pom.xml 2016-04-11 21:00:56 UTC (rev 9333)
@@ -16,7 +16,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -54,10 +54,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-ef-1.7</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-ef-1.7</developerConnection>
- <url>http://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-ef-1.7</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:00:53
|
Revision: 9332
http://sourceforge.net/p/fudaa/svn/9332
Author: deniger
Date: 2016-04-11 21:00:51 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] copy for tag fudaa-ef-1.7
Added Paths:
-----------
tags/business/fudaa-ef-1.7/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 21:00:44
|
Revision: 9331
http://sourceforge.net/p/fudaa/svn/9331
Author: deniger
Date: 2016-04-11 21:00:42 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-ef-1.7
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2016-04-11 20:48:38 UTC (rev 9330)
+++ trunk/business/fudaa-ef/core/pom.xml 2016-04-11 21:00:42 UTC (rev 9331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2016-04-11 20:48:38 UTC (rev 9330)
+++ trunk/business/fudaa-ef/io/pom.xml 2016-04-11 21:00:42 UTC (rev 9331)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2016-04-11 20:48:38 UTC (rev 9330)
+++ trunk/business/fudaa-ef/pom.xml 2016-04-11 21:00:42 UTC (rev 9331)
@@ -16,7 +16,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -54,4 +54,10 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-ef-1.7</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-ef-1.7</developerConnection>
+ <url>http://svn.code.sf.net/p/fudaa/svn/tags/business/fudaa-ef-1.7</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 20:48:41
|
Revision: 9330
http://sourceforge.net/p/fudaa/svn/9330
Author: deniger
Date: 2016-04-11 20:48:38 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
version 1.8
Modified Paths:
--------------
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
+++ trunk/business/fudaa-ef/pom.xml 2016-04-11 20:48:38 UTC (rev 9330)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.7-SNAPSHOT</fudaa-framework.version>
+ <fudaa-framework.version>1.7</fudaa-framework.version>
<projetEncoding>ISO-8859-15</projetEncoding>
<!-- la version du compiler -->
<javaCompiler>1.6</javaCompiler>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 20:01:29
|
Revision: 9329
http://sourceforge.net/p/fudaa/svn/9329
Author: deniger
Date: 2016-04-11 20:01:27 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
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
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-bu/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-common/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-fu/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-gis/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-ui/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ctulu-video/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/dodico-common/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-1d/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-2d/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-3d/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-common/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-graphe/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-graphe-3D/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-network/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-common/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-common-save/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-dico/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-dico/server/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</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 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/fudaa-dico/ui/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
</parent>
<artifactId>dico-ui</artifactId>
<name>Dico UI</name>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2016-04-11 20:01:12 UTC (rev 9328)
+++ trunk/framework/pom.xml 2016-04-11 20:01:27 UTC (rev 9329)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7</version>
+ <version>1.8-SNAPSHOT</version>
<url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
<properties>
<projetEncoding>ISO-8859-15</projetEncoding>
@@ -19,10 +19,10 @@
<name>Fudaa Framework</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7
+ <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/trunk/framework/</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/framework
</developerConnection>
- <url>https://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7</url>
+ <url>https://svn.code.sf.net/p/fudaa/svn/trunk/framework</url>
</scm>
<modules>
<module>ctulu-fu</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 20:01:14
|
Revision: 9328
http://sourceforge.net/p/fudaa/svn/9328
Author: deniger
Date: 2016-04-11 20:01:12 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] copy for tag fudaa-framework-1.7
Added Paths:
-----------
tags/framework/fudaa-framework-1.7/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-11 20:01:03
|
Revision: 9327
http://sourceforge.net/p/fudaa/svn/9327
Author: deniger
Date: 2016-04-11 20:01:01 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-framework-1.7
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
trunk/framework/pom.xml
Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-bu/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-common/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-fu/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-gis/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-ui/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ctulu-video/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/dodico-common/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-1d/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-2d/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-3d/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-common/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-graphe/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-graphe-3D/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -1,30 +1,29 @@
-<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>
- <parent>
- <groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-graphe-3D</artifactId>
- <name>ebli-graphe-3D</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-common</artifactId>
- </dependency>
-
- </dependencies>
-</project>
+<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>
+ <parent>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>fudaa-framework</artifactId>
+ <version>1.7</version>
+ </parent>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-graphe-3D</artifactId>
+ <name>ebli-graphe-3D</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-common</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-network/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/ebli-visuallibrary/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-common/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-common-courbe/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-common-save/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-dico/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-dico/server/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</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 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/fudaa-dico/ui/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
<artifactId>fudaa-dico</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
</parent>
<artifactId>dico-ui</artifactId>
<name>Dico UI</name>
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2016-03-27 09:39:07 UTC (rev 9326)
+++ trunk/framework/pom.xml 2016-04-11 20:01:01 UTC (rev 9327)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.7</version>
<url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
<properties>
<projetEncoding>ISO-8859-15</projetEncoding>
@@ -19,10 +19,10 @@
<name>Fudaa Framework</name>
<description>La partie commune du framework fudaa</description>
<scm>
- <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/trunk/framework/</connection>
- <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/trunk/framework
+ <connection>scm:svn:http://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7</connection>
+ <developerConnection>scm:svn:https://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7
</developerConnection>
- <url>https://svn.code.sf.net/p/fudaa/svn/trunk/framework</url>
+ <url>https://svn.code.sf.net/p/fudaa/svn/tags/framework/fudaa-framework-1.7</url>
</scm>
<modules>
<module>ctulu-fu</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-03-24 15:40:36
|
Revision: 9323
http://sourceforge.net/p/fudaa/svn/9323
Author: deniger
Date: 2016-03-24 15:40:34 +0000 (Thu, 24 Mar 2016)
Log Message:
-----------
CRUE-634
CRUE-692
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToCasierPreloadProcessor.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToNoeudNameTransformer.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierlToNoeudNameTransformer.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToCasierPreloadProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToCasierPreloadProcessor.java 2016-03-24 15:39:56 UTC (rev 9322)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToCasierPreloadProcessor.java 2016-03-24 15:40:34 UTC (rev 9323)
@@ -41,7 +41,7 @@
int nb = traceCasiers.getNumGeometries();
GISAttributeModelObjectInterface model = (GISAttributeModelObjectInterface) traceCasiers.getModel(GGTraceCasierAttributesController.NOM);
GISAttributeModelObjectInterface modelXt = (GISAttributeModelObjectInterface) traceCasiers.getModel(GGTraceCasierAttributesController.ARRAY_XT);
- TraceCasierlToNoeudNameTransformer transformer = new TraceCasierlToNoeudNameTransformer();
+ TraceCasierToNoeudNameTransformer transformer = new TraceCasierToNoeudNameTransformer();
List<EMH> allSimpleEMH = scenario.getIdRegistry().getAllSimpleEMH();
Map<String, EMH> toMapOfId = TransformerHelper.toMapOfId(allSimpleEMH);
for (int i = 0; i < nb; i++) {
Copied: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToNoeudNameTransformer.java (from rev 9315, trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierlToNoeudNameTransformer.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToNoeudNameTransformer.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierToNoeudNameTransformer.java 2016-03-24 15:40:34 UTC (rev 9323)
@@ -0,0 +1,25 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.planimetry.sig.tracecasier;
+
+import org.fudaa.ctulu.gis.GISZoneCollection;
+import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
+import org.fudaa.dodico.crue.metier.factory.CruePrefix;
+import org.fudaa.fudaa.crue.planimetry.sig.traceprofil.GGTraceProfilSectionAttributesController;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class TraceCasierToNoeudNameTransformer {
+
+ public String getNoeudName(String traceProfilName) {
+ return CruePrefix.changePrefix(traceProfilName, EnumCatEMH.NOEUD);
+ }
+
+ public String getNoeudName(GISZoneCollection traceCasier, int idx) {
+ String name = (String) traceCasier.getModel(GGTraceProfilSectionAttributesController.NOM).getObjectValueAt(idx);
+ return getNoeudName(name);
+ }
+}
Deleted: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierlToNoeudNameTransformer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierlToNoeudNameTransformer.java 2016-03-24 15:39:56 UTC (rev 9322)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/TraceCasierlToNoeudNameTransformer.java 2016-03-24 15:40:34 UTC (rev 9323)
@@ -1,25 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.crue.planimetry.sig.tracecasier;
-
-import org.fudaa.ctulu.gis.GISZoneCollection;
-import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
-import org.fudaa.dodico.crue.metier.factory.CruePrefix;
-import org.fudaa.fudaa.crue.planimetry.sig.traceprofil.GGTraceProfilSectionAttributesController;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class TraceCasierlToNoeudNameTransformer {
-
- public String getNoeudName(String traceProfilName) {
- return CruePrefix.changePrefix(traceProfilName, EnumCatEMH.NOEUD);
- }
-
- public String getNoeudName(GISZoneCollection traceCasier, int idx) {
- String name = (String) traceCasier.getModel(GGTraceProfilSectionAttributesController.NOM).getObjectValueAt(idx);
- return getNoeudName(name);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-03-24 15:39:58
|
Revision: 9322
http://sourceforge.net/p/fudaa/svn/9322
Author: deniger
Date: 2016-03-24 15:39:56 +0000 (Thu, 24 Mar 2016)
Log Message:
-----------
CRUE-634
CRUE-692
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayerModel.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayerModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayerModel.java 2016-03-23 17:04:58 UTC (rev 9321)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayerModel.java 2016-03-24 15:39:56 UTC (rev 9322)
@@ -29,6 +29,7 @@
import org.fudaa.fudaa.crue.planimetry.controller.LayerCasierController;
import org.fudaa.fudaa.crue.planimetry.controller.LayerNodeController;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryControllerHelper;
+import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryGisModelContainer;
/**
* @author deniger ( genesis)
@@ -162,6 +163,11 @@
public CatEMHCasier addCasier(PlanimetryControllerHelper helper, CatEMHNoeud initialNoeud, GISPolygone polygone, String casierName) {
CatEMHCasier addCasier = addCasier(helper, EnumCasierType.EMHCasierProfil, initialNoeud, polygone);
new EditionRename().rename(addCasier, casierName);
+ //on doit aussi mettre à jour le nom du noeud dans les données geographiques:
+ final LayerNodeController nodeController = getLayerController().getHelper().getNodeController();
+ final int nodePosition = nodeController.getNodePosition(addCasier.getNoeud().getUiId());
+ GISAttributeModel names = nodeController.getGeomData().getModel(PlanimetryGisModelContainer.NOM_EMH_POSITION);
+ names.setObject(nodePosition, addCasier.getNoeud().getNom(), null);
return addCasier;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2016-03-23 17:05:00
|
Revision: 9321
http://sourceforge.net/p/fudaa/svn/9321
Author: bmarchan
Date: 2016-03-23 17:04:58 +0000 (Wed, 23 Mar 2016)
Log Message:
-----------
Chgt de version => 1.4.5 + translation
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2016-03-23 15:04:50 UTC (rev 9320)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2016-03-23 17:04:58 UTC (rev 9321)
@@ -88,9 +88,9 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.4.4";
- isPIV_.date = "2015-08-31";
- isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CEREMA (c)1999-2015";
+ isPIV_.version = "1.4.5";
+ isPIV_.date = "2016-03-23";
+ isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CEREMA (c)1999-2016";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
isPIV_.authors=new String[]{"B.Marchand (mar...@de...)"};
Modified: trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt 2016-03-23 15:04:50 UTC (rev 9320)
+++ trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt 2016-03-23 17:04:58 UTC (rev 9321)
@@ -1,5 +1,5 @@
1 point de d\xE9part a \xE9t\xE9 ignor\xE9 car il est en dehors du maillage=1 starting point was ignored because it is outside of the mesh
-<html><p>Param\xE8tres de transformation<br>du rep\xE8re d'origine<br>vers le rep\xE8re de calcul</html>=<html><p>Transformation parameters<br>from origin reference<br>to calculation reference</html>
+<html><p>Param\xE8tres de transformation du rep\xE8re<br>initial vers le rep\xE8re de calcul</html>=<html><p>Transformation parameters from initial<br>reference to calculation reference</html>
<original>=<original>
A distance constante=At a constant distance
A pas de temps constant=At a constant time
@@ -7,6 +7,7 @@
Affiche l'image s\xE9lectionn\xE9e=Show selected image
Affiche le r\xE9sultat instantan\xE9 s\xE9lectionn\xE9=Show selected instantaneous result
Affiche les r\xE9sultats pour la variable s\xE9lectionn\xE9e=Show results for selected variable
+Afficher les r\xE9sultats du calcul=Show calculation results
Aire d'interrogation (pix)=Interrogation area (pix)
Aire de recherche (pix)=Searching area (pix)
Aire mouill\xE9e (m\xB2)=Wetted area (m\xB2)
@@ -14,6 +15,7 @@
Analyse des images ok=Image analysis ok
Analyse du couple d'images {0} sur {1}=Analysis of image pair {0} out of {1}
Analyse interrompue=Analysis interrupted
+Angle en degr\xE9s=Angle in degrees
Au moins un point extremit\xE9 du transect n\xB0{0} a un Z inf\xE9rieur au niveau d'eau=At least one extremity point of the transect #{0} is lower than the water level
Aucun point de d\xE9part n'appartient au maillage=No starting point belongs to the mesh
Aucun point de r\xE9f\xE9rence au sol n'a \xE9t\xE9 d\xE9fini=No ground reference point was defined
@@ -123,8 +125,8 @@
Ichiro Fujita (Prof.), Universit\xE9 de Kob\xE9=Ichiro Fujita (Prof.), Kobe University
Il doit exister au moins une image source=At least one source image must exist
Il doit exister au moins une image transform\xE9e=At least one transformed image must exist
-Il doit exister des r\xE9sultats de calcul de d\xE9bit=Some discharge calculation results must exist
Il doit exister des r\xE9sultats de calcul=Some calculation results must exist
+Il n'existe pas de r\xE9sultats de calcul de d\xE9bit=There is no discharge calculation results
Image d'origine=Original image
Image ortho=Ortho image
Image transform\xE9e=Transformed image
@@ -182,6 +184,7 @@
Les points de grille n'ont pas \xE9t\xE9 d\xE9finis=The grid points were not specified
Les points de r\xE9f\xE9rence doivent avoir \xE9t\xE9 saisis=The reference points must be specified
Les points de r\xE9f\xE9rence {0} et {1} ont des coordonn\xE9es r\xE9elles confondues=The reference points {0} and {1} have the same real coordinates
+Les r\xE9sultats de calcul de d\xE9bit doivent exister=Discharge calculation results must exist
Les transects=The transects
Lie/d\xE9lie l'image et le r\xE9sultat instantan\xE9=Bind/unbind image and instantaneous result
Ligne=Line
@@ -262,14 +265,16 @@
Reconditionnement/calcul de d\xE9bit pour le transect {0}=Repack/calculation of discharge for the transect {0}
Rejouer les donn\xE9es=Replay data
Reprise=Resuming
-Rep\xE8re d'origine=Origin reference
Rep\xE8re de calcul=Calculation reference
+Rep\xE8re initial=Initial reference
Rep\xE8re=Reference
+Rotation=Rotation
R\xE9pertoire contenant les executables=Directory containing the executable files
R\xE9pertoire destination=Destination directory
R\xE9solution (m/pix)=Resolution (m/pix)
R\xE9sultat \: {0}=Result \: {0}
R\xE9sultats bruts=Raw results
+R\xE9sultats du calcul=Calculation results
R\xE9sultats filtr\xE9s=Filtered results
R\xE9sultats inst. bruts=Raw inst. results
R\xE9sultats inst. filtr\xE9s=Filtred inst. results
@@ -319,8 +324,9 @@
Transformation des vitesses instantan\xE9es vers l'espace r\xE9el=Transformation of instantaneous velocities to real space
Transformation interrompue=Transformation interrupted
Transformation ok=Transformation ok
-Transformations du rep\xE8re d'origine vers le rep\xE8re de calcul=Transformations from origin reference to calculation reference
+Transformations du rep\xE8re initial vers le rep\xE8re de calcul=Transformations from initial reference to calculation reference
Transformer les images=Transform the images
+Translation=Translation
Triangulation=Meshing
Type=Type
Un seul fichier projet est autoris\xE9 pour le transfert=Only one project file is authorized during transfer
@@ -343,7 +349,6 @@
Vitesses de surface moyenn\xE9es=Average surface velocities
Vitesses moyenn\xE9es sur la profondeur=Depth-average velocities
Voir les vitesses moyennes de surface=Show average surface velocities
-Voir les vitesses moyennes sur la verticale=Show depth-averaged velocities
Voulez-vous supprimer les transects existants ?=Do you want to remove existing transects?
Vous devez pr\xE9ciser un nom de r\xE9pertoire=You must specify a directory name
Vous devez s\xE9lectionner 1 r\xE9sultat au moins pour la moyenne=You must select at least 1 result for the average
@@ -352,6 +357,7 @@
Vue=View
V\xE9rification des points d'orthorectification=Verification of the orthorectification points
V\xE9rification des points de r\xE9f\xE9rence=Verification of the reference points
+X centre=X center
X img=X img
X recalcul\xE9=Recalculated X
X r\xE9el=Real X
@@ -360,6 +366,7 @@
Xmax=Xmax
Xmin doit \xEAtre un r\xE9el=Xmin must be a real number
Xmin=Xmin
+Y centre=Y center
Y img=Y img
Y recalcul\xE9=Recalculated Y
Y r\xE9el=Real Y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2016-03-23 15:04:53
|
Revision: 9320
http://sourceforge.net/p/fudaa/svn/9320
Author: bmarchan
Date: 2016-03-23 15:04:50 +0000 (Wed, 23 Mar 2016)
Log Message:
-----------
Chgt de "repere d'origine" => "repere initial"
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivCoordinatesSystemPanel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
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/PivExportImagesAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlReader.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsModel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivVelResultsModel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java
trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivCoordinatesSystemPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivCoordinatesSystemPanel.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivCoordinatesSystemPanel.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -29,7 +29,7 @@
import com.memoire.bu.BuToolButton;
/**
- * Un panneau pour saisir la matrice de transformation rep\xE8re d'origine vers rep\xE8re de calcul.
+ * Un panneau pour saisir la matrice de transformation rep\xE8re initial vers rep\xE8re de calcul.
*
* @author Bertrand Marchand (mar...@de...)
*/
@@ -147,7 +147,7 @@
setLayout(new BorderLayout(5, 5));
setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
- add(new JLabel(PivResource.getS("<html><p>Param\xE8tres de transformation du rep\xE8re<br>d'origine vers le rep\xE8re de calcul</html>")), BorderLayout.NORTH);
+ add(new JLabel(PivResource.getS("<html><p>Param\xE8tres de transformation du rep\xE8re<br>initial vers le rep\xE8re de calcul</html>")), BorderLayout.NORTH);
add(pnMain, BorderLayout.CENTER);
add(pnButtons, BorderLayout.EAST);
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 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -722,12 +722,12 @@
mdlRealOrthoPoints.update();
cqTransect_.modeleDonnees().update();
mdlFlowResults.update();
- mdlAverageResults.setSystemViewOriginal(prj_.getTransformationParameters().isCurrentSystemOriginal());
- mdlVelResults.setSystemViewOriginal(prj_.getTransformationParameters().isCurrentSystemOriginal());
- mdlInstantResults.setSystemViewOriginal(prj_.getTransformationParameters().isCurrentSystemOriginal());
- mdlInstantVelResults.setSystemViewOriginal(prj_.getTransformationParameters().isCurrentSystemOriginal());
- mdlInstantFltResults.setSystemViewOriginal(prj_.getTransformationParameters().isCurrentSystemOriginal());
- mdlInstantVelFltResults.setSystemViewOriginal(prj_.getTransformationParameters().isCurrentSystemOriginal());
+ mdlAverageResults.setSystemViewInitial(prj_.getTransformationParameters().isCurrentSystemInitial());
+ mdlVelResults.setSystemViewInitial(prj_.getTransformationParameters().isCurrentSystemInitial());
+ mdlInstantResults.setSystemViewInitial(prj_.getTransformationParameters().isCurrentSystemInitial());
+ mdlInstantVelResults.setSystemViewInitial(prj_.getTransformationParameters().isCurrentSystemInitial());
+ mdlInstantFltResults.setSystemViewInitial(prj_.getTransformationParameters().isCurrentSystemInitial());
+ mdlInstantVelFltResults.setSystemViewInitial(prj_.getTransformationParameters().isCurrentSystemInitial());
cqAveParticles_.changeRepere();
cqFltParticles_.changeRepere();
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 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -227,7 +227,7 @@
else
setViewMode(MODE_ORIGINAL_VIEW);
- cbRep_.setSelectedIndex(projet.getTransformationParameters().isCurrentSystemOriginal()?1:0);
+ cbRep_.setSelectedIndex(projet.getTransformationParameters().isCurrentSystemInitial()?1:0);
}
/**
@@ -300,7 +300,7 @@
cbRep_=new JComboBox<>();
cbRep_.setToolTipText(PivResource.getS("Changement de rep\xE8re"));
cbRep_.addItem(PivResource.getS("Rep\xE8re de calcul"));
- cbRep_.addItem(PivResource.getS("Rep\xE8re d'origine"));
+ cbRep_.addItem(PivResource.getS("Rep\xE8re initial"));
cbRep_.setPreferredSize(new Dimension(120, cbRep_.getPreferredSize().height));
cbRep_.setMaximumSize(cbRep_.getPreferredSize());
cbRep_.addItemListener(new ItemListener() {
@@ -309,7 +309,7 @@
public void itemStateChanged(ItemEvent e) {
if (projet != null) {
PivTransformationParameters params=projet.getTransformationParameters();
- params.setCurrentSystemOriginal(cbRep_.getSelectedIndex() != 0);
+ params.setCurrentSystemInitial(cbRep_.getSelectedIndex() != 0);
projet.setTransformationParameters(params);
restaurer();
}
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 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivChangeCoordinatesSystemAction.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -16,7 +16,7 @@
public PivChangeCoordinatesSystemAction(PivImplementation _impl) {
super(PivResource.getS("Rep\xE8re"), EbliResource.EBLI.getIcon("repere"), "CHANGE_TRANSF");
- setDefaultToolTip(PivResource.getS("Transformations du rep\xE8re d'origine vers le rep\xE8re de calcul"));
+ setDefaultToolTip(PivResource.getS("Transformations du rep\xE8re initial vers le rep\xE8re de calcul"));
impl_=_impl;
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportImagesAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportImagesAction.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportImagesAction.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -96,7 +96,7 @@
for (int i=0; i<exportImgFiles.length; i++) {
File cacheFile=impl.getCurrentProject().getCacheImageFile(exportImgFiles[i]);
- // Chaque image dans sont format d'origine
+ // Chaque image dans son format d'origine
if (format.equals("ORIGIN")) {
File destFile=new File(destinationDir,exportImgFiles[i].getName());
String ext=CtuluLibFile.getExtension(exportImgFiles[i].getName());
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoParamAction.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -46,7 +46,7 @@
*/
public void actionPerformed(final ActionEvent _e) {
// On ne saisit les donn\xE9es que dans le rep\xE8re de calcul
- if (impl.getCurrentProject().getTransformationParameters().isCurrentSystemOriginal()) {
+ if (impl.getCurrentProject().getTransformationParameters().isCurrentSystemInitial()) {
impl.error(PivResource.getS("Erreur"), PivResource.getS("Les param\xE8tres ne peuvent \xEAtre saisis\nque dans le rep\xE8re de calcul."));
return;
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlReader.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlReader.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlReader.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -79,7 +79,7 @@
params.srcImages[ind]=name;
}
- // La matrice de transformation espace d'origine => espace de calcul.
+ // La matrice de transformation espace initial => espace de calcul.
NodeList ndlMat=doc.getElementsByTagName("transfMatrix");
for (int i=0; i<ndlMat.getLength(); i++) {
Element elMat=(Element)ndlMat.item(i);
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsModel.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsModel.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -58,7 +58,7 @@
/** La progression */
ProgressionInterface prog_;
/** Le system de coordonn\xE9es */
- private boolean isSystemOriginal_=false;
+ private boolean isSystemInitial_=false;
/**
* Construction avec les resultats.
@@ -75,7 +75,7 @@
PivResultsI[] oldRes=resData;
resData=_res;
- setSystemViewOriginal(isSystemOriginal_);
+ setSystemViewInitial(isSystemInitial_);
if (results!=null && results.length !=0 && var==null)
var=results[0].getResults()[0];
@@ -84,10 +84,10 @@
}
/**
- * Definit si le system de coordonn\xE9es est original ou calcul.
- * @param _b True : Original
+ * Definit si le system de coordonn\xE9es est initial ou calcul.
+ * @param _b True : Initial
*/
- public void setSystemViewOriginal(boolean _b) {
+ public void setSystemViewInitial(boolean _b) {
if (!_b) {
results=resData;
}
@@ -101,7 +101,7 @@
}
setGrid(grid);
- propDelegate.firePropertyChange("systemView", isSystemOriginal_, isSystemOriginal_=_b);
+ propDelegate.firePropertyChange("systemView", isSystemInitial_, isSystemInitial_=_b);
}
/**
@@ -113,7 +113,7 @@
PivResultsI[] ret=new PivResultsI[_res.length];
for (int i=0; i<ret.length; i++)
- ret[i]=new PivResultsTransformationAdapter(_res[i], prj_.getTransformationParameters().getToOriginal());
+ ret[i]=new PivResultsTransformationAdapter(_res[i], prj_.getTransformationParameters().getToInitial());
return ret;
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivVelResultsModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivVelResultsModel.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivVelResultsModel.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -34,7 +34,7 @@
/** Le projet */
PivProject prj_;
/** Le system de coordonn\xE9es */
- private boolean isSystemOriginal_=false;
+ private boolean isSystemInitial_=false;
/**
* Le constructeur.
@@ -42,13 +42,13 @@
public PivVelResultsModel(PivProject _prj, PivResultsI... _res) {
resData=_res;
prj_=_prj;
- setSystemViewOriginal(false);
+ setSystemViewInitial(false);
}
public void setResults(PivResultsI[] _res) {
resData=_res;
- if (!isSystemOriginal_) {
+ if (!isSystemInitial_) {
results_=resData;
}
else {
@@ -57,17 +57,17 @@
}
/**
- * Definit si le system de coordonn\xE9es est original ou calcul.
- * @param _b True : Original
+ * Definit si le system de coordonn\xE9es est initial ou calcul.
+ * @param _b True : Initial
*/
- public void setSystemViewOriginal(boolean _b) {
+ public void setSystemViewInitial(boolean _b) {
if (!_b) {
results_=resData;
}
else {
results_=adaptResultsToReal(resData);
}
- isSystemOriginal_=_b;
+ isSystemInitial_=_b;
}
/**
@@ -79,7 +79,7 @@
PivResultsI[] ret=new PivResultsI[_res.length];
for (int i=0; i<ret.length; i++)
- ret[i]=new PivResultsTransformationAdapter(_res[i], prj_.getTransformationParameters().getToOriginal());
+ ret[i]=new PivResultsTransformationAdapter(_res[i], prj_.getTransformationParameters().getToInitial());
return ret;
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -102,7 +102,7 @@
protected Dimension imgPgmSize=null;
/** True : Les images d'origine ont \xE9t\xE9 modifi\xE9es */
protected boolean areSrcImagesChanged=true;
- /** Les param\xE8tres de transformation du syteme d'origine vers le systeme de calcul. */
+ /** Les param\xE8tres de transformation du syteme initial vers le systeme de calcul. */
protected PivTransformationParameters transfParams=new PivTransformationParameters();
/** Les listeners notifi\xE9s lors d'une modification du projet. */
@@ -1021,7 +1021,7 @@
}
/**
- * @param _matrix La matrice de transformation pour passer du repere origine au repere calcul
+ * @param _matrix La matrice de transformation pour passer du repere initial au repere calcul
*/
public void setTransformationParameters(PivTransformationParameters _params) {
transfParams=_params;
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -3,7 +3,7 @@
import org.fudaa.ebli.geometrie.GrMorphisme;
/**
- * Les param\xE8tres de transformation du rep\xE8re d'origine vers le rep\xE8re de calcul. On stocke ces param\xE8tres,
+ * Les param\xE8tres de transformation du rep\xE8re intial vers le rep\xE8re de calcul. On stocke ces param\xE8tres,
* car ils sont difficiles a retrouver depuis les matrices de transformation.
* @author Bertrand Marchand (mar...@de...)
*/
@@ -20,12 +20,12 @@
private double xcenter;
/** La coordonn\xE9e Y du point de rotation Z */
private double ycenter;
- /** Morphisme de original -> calcul */
+ /** Morphisme de initial -> calcul */
private GrMorphisme toComputing;
- /** Morphisme de calcul -> original */
+ /** Morphisme de calcul -> initial */
private GrMorphisme toOriginal;
- /** Definit si on est dans le system de coordonn\xE9es d'origine ou de calcul. Par defaut : calcul */
- private boolean isInOriginalSystemCoords;
+ /** Definit si on est dans le system de coordonn\xE9es initial ou de calcul. Par defaut : calcul */
+ private boolean isInInitialSystemCoords;
/** Morphisme identit\xE9 */
private GrMorphisme identite=GrMorphisme.identite();
@@ -156,7 +156,7 @@
return toComputing;
}
- public GrMorphisme getToOriginal() {
+ public GrMorphisme getToInitial() {
if (toOriginal==null)
toOriginal=GrMorphisme.translation(-xcenter,-ycenter,0).composition(GrMorphisme.rotationZ(-Math.toRadians(rotationZ))).composition(GrMorphisme.translation(xcenter-translationX,ycenter-translationY,-translationZ));
return toOriginal;
@@ -166,8 +166,8 @@
* @return Morphisme pour passer des coordonn\xE9es data aux coordonn\xE9es r\xE9elles courantes.
*/
public GrMorphisme getToReal() {
- if (isCurrentSystemOriginal())
- return getToOriginal();
+ if (isCurrentSystemInitial())
+ return getToInitial();
else
return identite;
}
@@ -176,18 +176,18 @@
* @return Morphisme pour passer des coordonn\xE9es r\xE9elles courantes aux coordonn\xE9es data.
*/
public GrMorphisme getToData() {
- if (isCurrentSystemOriginal())
+ if (isCurrentSystemInitial())
return getToComputing();
else
return identite;
}
- public void setCurrentSystemOriginal(boolean _b) {
- isInOriginalSystemCoords=_b;
+ public void setCurrentSystemInitial(boolean _b) {
+ isInInitialSystemCoords=_b;
}
- public boolean isCurrentSystemOriginal() {
- return isInOriginalSystemCoords;
+ public boolean isCurrentSystemInitial() {
+ return isInInitialSystemCoords;
}
}
Modified: trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java 2016-03-23 14:35:59 UTC (rev 9319)
+++ trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java 2016-03-23 15:04:50 UTC (rev 9320)
@@ -24,8 +24,8 @@
assertEquals(ptCompute2.y_, -3, 0.01);
assertEquals(ptCompute2.z_, -2, 0.01);
- GrPoint ptOrig1 = ptCompute1.applique(params.getToOriginal());
- GrPoint ptOrig2 = ptCompute2.applique(params.getToOriginal());
+ GrPoint ptOrig1 = ptCompute1.applique(params.getToInitial());
+ GrPoint ptOrig2 = ptCompute2.applique(params.getToInitial());
assertEquals(ptOrig1.x_, -3, 0.01);
assertEquals(ptOrig1.y_, -3, 0.01);
@@ -51,8 +51,8 @@
assertEquals(ptCompute2.y_, -3, 0.01);
assertEquals(ptCompute2.z_, -2, 0.01);
- GrPoint ptOrig1 = ptCompute1.applique(params.getToOriginal());
- GrPoint ptOrig2 = ptCompute2.applique(params.getToOriginal());
+ GrPoint ptOrig1 = ptCompute1.applique(params.getToInitial());
+ GrPoint ptOrig2 = ptCompute2.applique(params.getToInitial());
assertEquals(ptOrig1.x_, -6, 0.01);
assertEquals(ptOrig1.y_, -6, 0.01);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2016-03-23 14:36:02
|
Revision: 9319
http://sourceforge.net/p/fudaa/svn/9319
Author: bmarchan
Date: 2016-03-23 14:35:59 +0000 (Wed, 23 Mar 2016)
Log Message:
-----------
Prise en compte du centre de rotation dans les changements de repere
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java
Added Paths:
-----------
trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/
trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java 2016-03-21 22:26:47 UTC (rev 9318)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java 2016-03-23 14:35:59 UTC (rev 9319)
@@ -152,13 +152,13 @@
public GrMorphisme getToComputing() {
if (toComputing==null)
- toComputing=GrMorphisme.translation(translationX, translationY, translationZ).composition(GrMorphisme.rotationZ(Math.toRadians(rotationZ)));
+ toComputing=GrMorphisme.translation(translationX-xcenter,translationY-ycenter,translationZ).composition(GrMorphisme.rotationZ(Math.toRadians(rotationZ))).composition(GrMorphisme.translation(xcenter,ycenter,0));
return toComputing;
}
public GrMorphisme getToOriginal() {
if (toOriginal==null)
- toOriginal=GrMorphisme.rotationZ(-Math.toRadians(rotationZ)).composition(GrMorphisme.translation(-translationX, -translationY, -translationZ));
+ toOriginal=GrMorphisme.translation(-xcenter,-ycenter,0).composition(GrMorphisme.rotationZ(-Math.toRadians(rotationZ))).composition(GrMorphisme.translation(xcenter-translationX,ycenter-translationY,-translationZ));
return toOriginal;
}
Added: trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java (rev 0)
+++ trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java 2016-03-23 14:35:59 UTC (rev 9319)
@@ -0,0 +1,65 @@
+package org.fudaa.fudaa.piv.metier;
+
+import org.fudaa.ebli.geometrie.GrPoint;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Bertrand Marchand (mar...@de...)
+ */
+public class TestJTransfParameters extends TestCase {
+
+ public void testOnlyRotationLauncher() {
+ PivTransformationParameters params = new PivTransformationParameters(0, 0, -2, 90, -3, -3);
+ GrPoint pt1 = new GrPoint(-3, -3, 0);
+ GrPoint ptCompute1 = pt1.applique(params.getToComputing());
+ GrPoint pt2 = new GrPoint(-3, -2, 0);
+ GrPoint ptCompute2 = pt2.applique(params.getToComputing());
+
+ assertEquals(ptCompute1.x_, -3, 0.01);
+ assertEquals(ptCompute1.y_, -3, 0.01);
+ assertEquals(ptCompute1.z_, -2, 0.01);
+
+ assertEquals(ptCompute2.x_, -4, 0.01);
+ assertEquals(ptCompute2.y_, -3, 0.01);
+ assertEquals(ptCompute2.z_, -2, 0.01);
+
+ GrPoint ptOrig1 = ptCompute1.applique(params.getToOriginal());
+ GrPoint ptOrig2 = ptCompute2.applique(params.getToOriginal());
+
+ assertEquals(ptOrig1.x_, -3, 0.01);
+ assertEquals(ptOrig1.y_, -3, 0.01);
+ assertEquals(ptOrig1.z_, 0, 0.01);
+
+ assertEquals(ptOrig2.x_, -3, 0.01);
+ assertEquals(ptOrig2.y_, -2, 0.01);
+ assertEquals(ptOrig2.z_, 0, 0.01);
+ }
+
+ public void testAllParametersLauncher() {
+ PivTransformationParameters params = new PivTransformationParameters(3, 3, -2, 90, -3, -3);
+ GrPoint pt1 = new GrPoint(-6, -6, 0);
+ GrPoint ptCompute1 = pt1.applique(params.getToComputing());
+ GrPoint pt2 = new GrPoint(-6, -5, 0);
+ GrPoint ptCompute2 = pt2.applique(params.getToComputing());
+
+ assertEquals(ptCompute1.x_, -3, 0.01);
+ assertEquals(ptCompute1.y_, -3, 0.01);
+ assertEquals(ptCompute1.z_, -2, 0.01);
+
+ assertEquals(ptCompute2.x_, -4, 0.01);
+ assertEquals(ptCompute2.y_, -3, 0.01);
+ assertEquals(ptCompute2.z_, -2, 0.01);
+
+ GrPoint ptOrig1 = ptCompute1.applique(params.getToOriginal());
+ GrPoint ptOrig2 = ptCompute2.applique(params.getToOriginal());
+
+ assertEquals(ptOrig1.x_, -6, 0.01);
+ assertEquals(ptOrig1.y_, -6, 0.01);
+ assertEquals(ptOrig1.z_, 0, 0.01);
+
+ assertEquals(ptOrig2.x_, -6, 0.01);
+ assertEquals(ptOrig2.y_, -5, 0.01);
+ assertEquals(ptOrig2.z_, 0, 0.01);
+ }
+}
Property changes on: trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/metier/TestJTransfParameters.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-03-21 22:26:49
|
Revision: 9318
http://sourceforge.net/p/fudaa/svn/9318
Author: deniger
Date: 2016-03-21 22:26:47 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
CRUE-634
CRUE-692
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java
trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/GGFilesDbfReader.java
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java 2016-03-21 22:25:12 UTC (rev 9317)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java 2016-03-21 22:26:47 UTC (rev 9318)
@@ -34,6 +34,7 @@
import org.fudaa.dodico.crue.io.conf.CrueEtudeDaoConfiguration;
import org.fudaa.dodico.crue.projet.ConfigurationReader;
import org.fudaa.dodico.crue.projet.conf.Configuration;
+import org.fudaa.dodico.crue.projet.conf.Crue9DecimalFormatBuilder;
import org.fudaa.dodico.crue.projet.conf.GlobalOptionsManager;
import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
import org.fudaa.dodico.crue.projet.conf.UserConfiguration;
@@ -135,14 +136,14 @@
if (coeurManager != null) {
dynamicContent.remove(coeurManager);
}
- Configuration read = conf;
+ Configuration readConfiguration = conf;
if (conf == null) {
- read = read(installationService.getSiteConfigFile());
+ readConfiguration = read(installationService.getSiteConfigFile());
}
- if (read == null) {
+ if (readConfiguration == null) {
return;
}
- coeurManager = new CoeurManager(installationService.getSiteDir(), read.getSite().getCoeurs());
+ coeurManager = new CoeurManager(installationService.getSiteDir(), readConfiguration.getSite().getCoeurs());
CoeurManagerValidator validator = new CoeurManagerValidator();
CtuluLogGroup logGroup = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
@@ -166,6 +167,8 @@
isCoeurValid = false;
}
coeurConfig.loadCrueConfigMetier(load.getMetier());
+ Crue9DecimalFormatBuilder crue9DecimalFormatBuilder = new Crue9DecimalFormatBuilder();
+ crue9DecimalFormatBuilder.intialize(readConfiguration, load.getMetier());
}
}
if (parent != null) {
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml 2016-03-21 22:25:12 UTC (rev 9317)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/FudaaCrue_Site.xml 2016-03-21 22:26:47 UTC (rev 9318)
@@ -1,92 +1,96 @@
<Configuration>
- <Site>
- <Coeurs>
- <Coeur id="c10m9">
- <Commentaire>Coeur c10m9 le plus récent</Commentaire>
- <VersionGrammaire>1.2</VersionGrammaire>
- <CoeurParDefaut>false</CoeurParDefaut>
- <DossierCoeur>coeurs/c10m9</DossierCoeur>
- </Coeur>
- <Coeur id="c10m10">
- <Commentaire>Coeur c10m10 le plus récent</Commentaire>
- <VersionGrammaire>1.2</VersionGrammaire>
- <CoeurParDefaut>true</CoeurParDefaut>
- <DossierCoeur>coeurs/c10m10</DossierCoeur>
- </Coeur>
- <Coeur id="old_c10m10">
- <Commentaire>Coeur c10m10 précédent</Commentaire>
- <VersionGrammaire>1.2</VersionGrammaire>
- <CoeurParDefaut>false</CoeurParDefaut>
- <DossierCoeur>coeurs/old_c10m10</DossierCoeur>
- </Coeur>
- </Coeurs>
+ <Site>
+ <Coeurs>
+ <Coeur id="c10m9">
+ <Commentaire>Coeur c10m9 le plus récent</Commentaire>
+ <VersionGrammaire>1.2</VersionGrammaire>
+ <CoeurParDefaut>false</CoeurParDefaut>
+ <DossierCoeur>coeurs/c10m9</DossierCoeur>
+ </Coeur>
+ <Coeur id="c10m10">
+ <Commentaire>Coeur c10m10 le plus récent</Commentaire>
+ <VersionGrammaire>1.2</VersionGrammaire>
+ <CoeurParDefaut>true</CoeurParDefaut>
+ <DossierCoeur>coeurs/c10m10</DossierCoeur>
+ </Coeur>
+ <Coeur id="old_c10m10">
+ <Commentaire>Coeur c10m10 précédent</Commentaire>
+ <VersionGrammaire>1.2</VersionGrammaire>
+ <CoeurParDefaut>false</CoeurParDefaut>
+ <DossierCoeur>coeurs/old_c10m10</DossierCoeur>
+ </Coeur>
+ </Coeurs>
<SiteAide Type="Absolute">
- <!--
- <SiteAide Type="Relative">
- -->
- <Commentaire>Aide Flare</Commentaire>
- <SyDocActivation>false</SyDocActivation>
- <!-- Chemin défini en relatif (inutilisé par SyDoc) -->
- <!--
- <CheminBase>aide/%1$s/SyDoC_HTML/Default.htm#cshid=</CheminBase>
- -->
- <!-- Chemin défini en absolu (inutilisé par SyDoc, à définir en UNC pour aider IE) -->
- <CheminBase>http://webhelp/SyDoc/%1$s/SyDoC_HTML/Default.htm#cshid=</CheminBase>
- </SiteAide>
- <SiteOptions>
- <SiteOption Nom="availableLanguage" UserVisible="true">
- <Commentaire>Langues disponibles</Commentaire>
- <Valeur>fr_FR</Valeur>
- </SiteOption>
- <SiteOption Nom="maxComparisonItemsDisplayed" UserVisible="true">
- <Commentaire>Nombre maximal de différences affichées</Commentaire>
- <Valeur>1000</Valeur>
- </SiteOption>
- <SiteOption Nom="maxLogLinesRead" UserVisible="true">
- <Commentaire>Nombre maximal de lignes lues dans un CR</Commentaire>
- <Valeur>5000</Valeur>
- </SiteOption>
- <SiteOption Nom="maxComparisonResultsByEMH" UserVisible="true">
- <Commentaire>Nombre maximal de différences sur les résultats de calcul par EMH</Commentaire>
- <Valeur>500</Valeur>
- </SiteOption>
- <SiteOption Nom="crue10.rptr.exeOption" UserVisible="true">
- <Commentaire>Crue 10: option pour demande de pre-traitement réseau.</Commentaire>
- <Valeur>-r</Valeur>
- </SiteOption>
- <SiteOption Nom="crue10.rptg.exeOption" UserVisible="true">
- <Commentaire>Crue 10: Demande de pre-traitement de la géometrie.</Commentaire>
- <Valeur>-g</Valeur>
- </SiteOption>
- <SiteOption Nom="crue10.rpti.exeOption" UserVisible="true">
- <Commentaire>Crue 10: Demande de pre-traitement des conditions initiales.</Commentaire>
- <Valeur>-i</Valeur>
- </SiteOption>
- <SiteOption Nom="crue10.rcal.exeOption" UserVisible="true">
- <Commentaire>Crue 10: Demande de calculs.</Commentaire>
- <Valeur>-c</Valeur>
- </SiteOption>
- </SiteOptions>
- </Site>
- <User>
- <UserOptions>
- <UserOption Nom="userLanguage">
- <Commentaire>Langue choisie pour l'utilisateur</Commentaire>
- <Valeur>fr_FR</Valeur>
- </UserOption>
- <UserOption Nom="uiUpdateProgressFrequence">
- <Commentaire>Fréquence de rafraîchissement en seconde de l'interface pendant le déroulement d'un run</Commentaire>
- <Valeur>0.2</Valeur>
- </UserOption>
- <UserOption Nom="externalEditor">
- <Commentaire>Chemin ou commande vers l'éditeur externe</Commentaire>
- <Valeur>C:\Program Files (x86)\Notepad++\notepad++.exe</Valeur>
- </UserOption>
- <UserOption Nom="crue9Exe">
- <Commentaire>Chemin ou commande vers l'exécutable Crue 9</Commentaire>
- <Valeur>Q:\Qualif_Exec\Crue9\crue9.exe</Valeur>
- </UserOption>
- </UserOptions>
- </User>
+ <!--
+ <SiteAide Type="Relative">
+ -->
+ <Commentaire>Aide Flare</Commentaire>
+ <SyDocActivation>false</SyDocActivation>
+ <!-- Chemin défini en relatif (inutilisé par SyDoc) -->
+ <!--
+ <CheminBase>aide/%1$s/SyDoC_HTML/Default.htm#cshid=</CheminBase>
+ -->
+ <!-- Chemin défini en absolu (inutilisé par SyDoc, à définir en UNC pour aider IE) -->
+ <CheminBase>http://webhelp/SyDoc/%1$s/SyDoC_HTML/Default.htm#cshid=</CheminBase>
+ </SiteAide>
+ <SiteOptions>
+ <SiteOption Nom="availableLanguage" UserVisible="true">
+ <Commentaire>Langues disponibles</Commentaire>
+ <Valeur>fr_FR</Valeur>
+ </SiteOption>
+ <SiteOption Nom="maxComparisonItemsDisplayed" UserVisible="true">
+ <Commentaire>Nombre maximal de différences affichées</Commentaire>
+ <Valeur>1000</Valeur>
+ </SiteOption>
+ <SiteOption Nom="nbExportCrue9SignificantFigures" UserVisible="true">
+ <Commentaire>Nombre de chiffres significatifs export Crue 9</Commentaire>
+ <Valeur>8</Valeur>
+ </SiteOption>
+ <SiteOption Nom="maxLogLinesRead" UserVisible="true">
+ <Commentaire>Nombre maximal de lignes lues dans un CR</Commentaire>
+ <Valeur>5000</Valeur>
+ </SiteOption>
+ <SiteOption Nom="maxComparisonResultsByEMH" UserVisible="true">
+ <Commentaire>Nombre maximal de différences sur les résultats de calcul par EMH</Commentaire>
+ <Valeur>500</Valeur>
+ </SiteOption>
+ <SiteOption Nom="crue10.rptr.exeOption" UserVisible="true">
+ <Commentaire>Crue 10: option pour demande de pre-traitement réseau.</Commentaire>
+ <Valeur>-r</Valeur>
+ </SiteOption>
+ <SiteOption Nom="crue10.rptg.exeOption" UserVisible="true">
+ <Commentaire>Crue 10: Demande de pre-traitement de la géometrie.</Commentaire>
+ <Valeur>-g</Valeur>
+ </SiteOption>
+ <SiteOption Nom="crue10.rpti.exeOption" UserVisible="true">
+ <Commentaire>Crue 10: Demande de pre-traitement des conditions initiales.</Commentaire>
+ <Valeur>-i</Valeur>
+ </SiteOption>
+ <SiteOption Nom="crue10.rcal.exeOption" UserVisible="true">
+ <Commentaire>Crue 10: Demande de calculs.</Commentaire>
+ <Valeur>-c</Valeur>
+ </SiteOption>
+ </SiteOptions>
+ </Site>
+ <User>
+ <UserOptions>
+ <UserOption Nom="userLanguage">
+ <Commentaire>Langue choisie pour l'utilisateur</Commentaire>
+ <Valeur>fr_FR</Valeur>
+ </UserOption>
+ <UserOption Nom="uiUpdateProgressFrequence">
+ <Commentaire>Fréquence de rafraîchissement en seconde de l'interface pendant le déroulement d'un run</Commentaire>
+ <Valeur>0.2</Valeur>
+ </UserOption>
+ <UserOption Nom="externalEditor">
+ <Commentaire>Chemin ou commande vers l'éditeur externe</Commentaire>
+ <Valeur>C:\Program Files (x86)\Notepad++\notepad++.exe</Valeur>
+ </UserOption>
+ <UserOption Nom="crue9Exe">
+ <Commentaire>Chemin ou commande vers l'exécutable Crue 9</Commentaire>
+ <Valeur>Q:\Qualif_Exec\Crue9\crue9.exe</Valeur>
+ </UserOption>
+ </UserOptions>
+ </User>
</Configuration>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/GGFilesDbfReader.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/GGFilesDbfReader.java 2016-03-21 22:25:12 UTC (rev 9317)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/sig/tracecasier/GGFilesDbfReader.java 2016-03-21 22:26:47 UTC (rev 9318)
@@ -44,6 +44,9 @@
if (GGFileToTraceCasierProcessor.ATTRIBUTE_NAME_NOM_CASIER.equals(name)) {
expectedClass = String.class;
}
+ if (Long.class.equals(readClass)) {
+ readClass = Double.class;
+ }
if (!expectedClass.equals(readClass)) {
log.addSevereError(NbBundle.getMessage(GGFileToTraceCasierProcessor.class, "traceCasier.AttributeWithWrongType", name, readClass.toString(),
expectedClass.toString()));
@@ -76,9 +79,9 @@
DbaseFileReader.Row row = r.readRow();
String nom = CruePrefix.addPrefix((String) row.read(nomIdx), EnumCatEMH.CASIER);
TraceCasierProfilContent content = contentByName.get(nom);
- double distance = (Double) row.read(distanceIdx);
- double xt = (Double) row.read(xtIdx);
- double z = (Double) row.read(zIdx);
+ double distance = ((Number) row.read(distanceIdx)).doubleValue();
+ double xt = ((Number) row.read(xtIdx)).doubleValue();
+ double z = ((Number) row.read(zIdx)).doubleValue();
if (content == null) {
content = new TraceCasierProfilContent(nom, xtEpsilon);
content.setDistance(distance);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2016-03-21 22:25:12 UTC (rev 9317)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2016-03-21 22:26:47 UTC (rev 9318)
@@ -179,6 +179,8 @@
res.add("groupeImage.visible");
res.add("groupeAutre.visible");
res.add("groupeFichierSIG.visible");
+ res.add("groupeTraceProfils.visible");
+ res.add("groupeProfilsCasier.visible");
return res;
}
@@ -192,6 +194,7 @@
List<String> expected = getExpectedProperties();
// assertEquals(expected.size(), keySet.size());
for (int i = 0; i < keySet.size(); i++) {
+ System.err.println(keySet.get(i));
assertEquals("i= " + i, expected.get(i), keySet.get(i));
}
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-03-21 22:25:15
|
Revision: 9317
http://sourceforge.net/p/fudaa/svn/9317
Author: deniger
Date: 2016-03-21 22:25:12 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
CRUE-634
CRUE-692
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site_officiel.xml
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaBatch.java
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java 2016-03-21 22:24:59 UTC (rev 9316)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileWriter.java 2016-03-21 22:25:12 UTC (rev 9317)
@@ -18,6 +18,7 @@
import org.fudaa.dodico.crue.comparaison.tester.EqualsTester;
import org.fudaa.dodico.crue.comparaison.tester.FactoryEqualsTester;
import org.fudaa.dodico.crue.comparaison.tester.TesterHelper;
+import org.fudaa.dodico.crue.config.ccm.Crue9DecimalFormatter;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
import org.fudaa.dodico.crue.config.ccm.ItemVariable;
import org.fudaa.dodico.crue.config.ccm.PropertyEpsilon;
@@ -99,12 +100,12 @@
* Correspondance EnumSensOrifice<->String
*/
private SingleValueConverter enumSensOrificeMapCrue9;
-
-
+
/**
* Formatteur utilisé pour écrire des colonnes float de taille fixe de x caractères
*/
- CtuluNumberFormatFortran formatter = new CtuluNumberFormatFortran(XZ_COLUMNS_LENGTH-1);
+ CtuluNumberFormatFortran formatterFF = new CtuluNumberFormatFortran(XZ_COLUMNS_LENGTH - 1);
+ Crue9DecimalFormatter formatterXtAndZ;
@Override
protected void internalWrite(final CrueIOResu o) {
@@ -113,6 +114,7 @@
initWriter();
final CrueData data = ((CrueIOResu<CrueData>) o).getMetier();
+ formatterXtAndZ = new Crue9DecimalFormatter(data.getCrueConfigMetier().getCrue9DecimalFormat());
try {
// cf DParametresSipor.java
// -- on commence par l'écriture des titres sur 5 lignes --//
@@ -320,7 +322,6 @@
final PropertyEpsilon eps = metier.getCrueConfigMetier().getConfLoi().get(EnumTypeLoi.LoiZFK).getVarOrdonnee().getEpsilon();
// STRIREF(o) "nom_strickler" k (nom du strickler et valeur associée)
-
for (final DonFrt frt : metier.getFrottements().getListFrt()) {
String pref = null;
@@ -591,7 +592,6 @@
}
// -- on ecrit les données --//
-
// -- LIMITEJ--//
// LIMITEJ 11 11 13 18 64 81 81 81
fortranWriter.stringField(0, CrueIODico.LIMITEJ);
@@ -655,7 +655,6 @@
// LIT MAJG 6
// LIT STOCKD 1
// LIT STOCKG 7
-
List<String> keySet = new ArrayList<String>(mapNomsLits.keySet());
Collections.sort(keySet);
for (final String key : keySet) {
@@ -841,8 +840,8 @@
fortranWriter.stringField(indiceFortran++, carteToUse);
}
// on inverse tout le temps dans dc
- fortranWriter.stringField(indiceFortran++, fortranWriter.addSpacesBefore(XZ_COLUMNS_LENGTH,formatter.format(pt.getOrdonnee())));
- fortranWriter.stringField(indiceFortran++, fortranWriter.addSpacesBefore(XZ_COLUMNS_LENGTH,formatter.format(pt.getAbscisse())));
+ fortranWriter.stringField(indiceFortran++, fortranWriter.addSpacesBefore(XZ_COLUMNS_LENGTH, formatterFF.format(pt.getOrdonnee())));
+ fortranWriter.stringField(indiceFortran++, fortranWriter.addSpacesBefore(XZ_COLUMNS_LENGTH, formatterFF.format(pt.getAbscisse())));
cptCouples++;
}
@@ -865,9 +864,9 @@
final int[] createFmtXZ = createFmtXZ();
for (final PtProfil pt : liste) {
-
- fortranWriter.stringField(indiceFortran++, fortranWriter.addSpacesBefore(XZ_COLUMNS_LENGTH,formatter.format(pt.getXt())));
- fortranWriter.stringField(indiceFortran++, fortranWriter.addSpacesBefore(XZ_COLUMNS_LENGTH,formatter.format(pt.getZ())));
+
+ fortranWriter.stringField(indiceFortran++, fortranWriter.addSpacesBefore(XZ_COLUMNS_LENGTH, formatterXtAndZ.format(pt.getXt())));
+ fortranWriter.stringField(indiceFortran++, fortranWriter.addSpacesBefore(XZ_COLUMNS_LENGTH, formatterXtAndZ.format(pt.getZ())));
cptCouples++;
if (cptCouples >= nbMaxCouples) {
indiceFortran = 0;
@@ -980,7 +979,6 @@
writeCartesProfilsDISTANCE(listeSections, CrueIODico.BRANCHE_PROF, true, true, true, true);
// WARNING DISTMAX pas a prendre en compte dans V0.
-
// -- ecriture de RUIS --//
if (branche.getDCSP() != null) {
for (final DonCalcSansPrt dcsp : branche.getDCSP()) {
@@ -1001,7 +999,6 @@
final DonPrtGeoBrancheSaintVenant geoStVenant = (DonPrtGeoBrancheSaintVenant) geo;
// ex SINUO 600.0 500.0 (si LongMineur = 600 m et LongMajeur = 500 m) :
-
final double coeff = geoStVenant.getCoefSinuo();// longMineur / longMajeur;
final double max = listeSections.get(listeSections.size() - 1).getXp();
Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site_officiel.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site_officiel.xml 2016-03-21 22:24:59 UTC (rev 9316)
+++ trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site_officiel.xml 2016-03-21 22:25:12 UTC (rev 9317)
@@ -26,6 +26,10 @@
<Commentaire>Commentaire de l'option SiteNom2.</Commentaire>
<Valeur>SiteValeur2</Valeur>
</SiteOption>
+ <SiteOption Nom="nbExportCrue9SignificantFigures" UserVisible="true">
+ <Commentaire></Commentaire>
+ <Valeur>2</Valeur>
+ </SiteOption>
</SiteOptions>
</Site>
<User>
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaBatch.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaBatch.java 2016-03-21 22:24:59 UTC (rev 9316)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaBatch.java 2016-03-21 22:25:12 UTC (rev 9317)
@@ -22,6 +22,7 @@
import org.fudaa.dodico.crue.metier.CrueFileType;
import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManagerImpl;
import org.fudaa.dodico.crue.projet.conf.Configuration;
+import org.fudaa.dodico.crue.projet.conf.Crue9DecimalFormatBuilder;
import org.fudaa.dodico.crue.projet.conf.GlobalOptionsManager;
import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
import org.fudaa.dodico.crue.projet.conf.UserConfiguration;
@@ -72,6 +73,8 @@
return null;
}
coeurConfig.loadCrueConfigMetier(load.getMetier());
+ Crue9DecimalFormatBuilder crue9DecimalFormatBuilder = new Crue9DecimalFormatBuilder();
+ crue9DecimalFormatBuilder.intialize(configuration, load.getMetier());
}
return coeurManager;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
