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: <bma...@us...> - 2015-03-17 16:00:29
|
Revision: 9088
http://sourceforge.net/p/fudaa/svn/9088
Author: bmarchan
Date: 2015-03-17 16:00:27 +0000 (Tue, 17 Mar 2015)
Log Message:
-----------
Corrections diverses
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivUtils.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportTransectAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivUtils.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivUtils.java 2015-03-17 15:02:06 UTC (rev 9087)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivUtils.java 2015-03-17 16:00:27 UTC (rev 9088)
@@ -66,7 +66,7 @@
PivUtils.FILE_FLT_IMAGES=new BuFileFilter(new String[]{"jpg","jpeg","gif","png","pgm","tif","tiff","bmp"},PivResource.getS("Fichiers images"));
PivUtils.FILE_FLT_GRID=new BuFileFilter("dat",PivResource.getS("Fichier grid"));
PivUtils.FILE_FLT_GRP=new BuFileFilter("dat",PivResource.getS("Fichier GRP"));
- PivUtils.FILE_FLT_BATHY=new BuFileFilter("dat",PivResource.getS("Fichier bathy"));
+ PivUtils.FILE_FLT_BATHY=new BuFileFilter(new String[]{"dat",FILE_FLT_TRANS_BTH.getFirstExt()},PivResource.getS("Fichier bathy"));
}
/**
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportTransectAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportTransectAction.java 2015-03-17 15:02:06 UTC (rev 9087)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportTransectAction.java 2015-03-17 16:00:27 UTC (rev 9088)
@@ -62,10 +62,8 @@
impl.error(ret.getAnalyze().getResume());
return;
}
+ impl.getCurrentProject().addTransect(ret.getSource());
- PivTransect trans=ret.getSource();
- impl.getCurrentProject().setTransects(new PivTransect[]{trans});
-
impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java 2015-03-17 15:02:06 UTC (rev 9087)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivNewTransectAction.java 2015-03-17 16:00:27 UTC (rev 9088)
@@ -131,16 +131,7 @@
transect.setStraight(_pl);
transect.setParams(params);
- PivTransect[] transects = pnCalques_.getProject().getTransects();
- PivTransect[] transnew;
- if (transects!=null)
- transnew=Arrays.copyOf(transects, transects.length+1);
- else
- transnew=new PivTransect[1];
-
- transnew[transnew.length-1]=transect;
-
- pnCalques_.getProject().setTransects(transnew);
+ pnCalques_.getProject().addTransect(transect);
hideWindow();
return true;
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 2015-03-17 15:02:06 UTC (rev 9087)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2015-03-17 16:00:27 UTC (rev 9088)
@@ -841,6 +841,21 @@
}
/**
+ * Ajoute un transect aux transects existants.
+ * @param _trans Le transect \xE0 ajouter.
+ */
+ public void addTransect(PivTransect _trans) {
+ if (transects==null) {
+ transects=new PivTransect[]{_trans};
+ }
+ else {
+ transects=Arrays.copyOf(transects, transects.length+1);
+ transects[transects.length-1]=_trans;
+ }
+ setTransects(transects);
+ }
+
+ /**
* Definit les transects pour le calcul de d\xE9bit.
* @param _trans Les transects. <tt>null</tt> est autoris\xE9.
*/
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java 2015-03-17 15:02:06 UTC (rev 9087)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java 2015-03-17 16:00:27 UTC (rev 9088)
@@ -573,12 +573,25 @@
*/
public void saveTransects(PivProject prj_, PivTransect[] _trans, ProgressionInterface _prog) {
File dirTransect=new File(prj_.rootPath,PivProject.TRANSECTS_DIR);
- CtuluLibFile.deleteDir(dirTransect);
+ dirTransect.mkdir();
+ // Suppression des fichiers bathy
+ File[] files=dirTransect.listFiles(PivUtils.FILE_FLT_TRANS_BTH);
+ if (files!=null) {
+ for (File file : files) {
+ file.delete();
+ }
+ }
+ // Suppression des fichiers params
+ files=dirTransect.listFiles(PivUtils.FILE_FLT_TRANS_PAR);
+ if (files!=null) {
+ for (File file : files) {
+ file.delete();
+ }
+ }
+
if (_trans==null) return;
- dirTransect.mkdir();
-
for (int i = 0; i < _trans.length; i++) {
File bthFile = new File(dirTransect, "trans" + PivUtils.formatOn4Chars(i + 1) + "."+PivUtils.FILE_FLT_TRANS_BTH.getFirstExt());
new PivBathyWriter().write(_trans[i], bthFile, _prog);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-17 14:59:58
|
Revision: 9086
http://sourceforge.net/p/fudaa/svn/9086
Author: bmarchan
Date: 2015-03-17 14:59:50 +0000 (Tue, 17 Mar 2015)
Log Message:
-----------
Nettoyage
Modified Paths:
--------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java 2015-03-17 13:08:30 UTC (rev 9085)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java 2015-03-17 14:59:50 UTC (rev 9086)
@@ -62,14 +62,10 @@
protected Object[] createData(final LineString _s, final ZEditionAttributesDataI _d, final CtuluCommandComposite cmp) {
if (_d == null || geometries_.getNbAttributes() == 0) {
- if (FuLog.isTrace()) {
- FuLog.trace("EZM: " + getClass().getName() + " data NO present");
- }
+ FuLog.debug("EZM: " + getClass().getName() + " data NO present");
return null;
}
- if (FuLog.isTrace()) {
- FuLog.trace("EZM: " + getClass().getName() + " data is present");
- }
+ FuLog.debug("EZM: " + getClass().getName() + " data is present");
final Object[] r = new Object[geometries_.getNbAttributes()];
for (int i = r.length - 1; i >= 0; i--) {
final GISAttributeInterface att = geometries_.getAttribute(i);
@@ -77,16 +73,12 @@
final Object[] ri = new Object[_d.getNbVertex()];
for (int gi = ri.length - 1; gi >= 0; gi--) {
ri[gi] = _d.getValue(att, gi);
- if (FuLog.isTrace()) {
- FuLog.trace("EZM: ajout val atomic " + ri[gi]);
- }
+ FuLog.debug("EZM: ajout val atomic " + ri[gi]);
}
r[i] = ri;
} else {
r[i] = _d.getValue(att, 0);
- if (FuLog.isTrace()) {
- FuLog.trace("EZM: ajout val non atomic " + r[i]);
- }
+ FuLog.debug("EZM: ajout val non atomic " + r[i]);
}
}
return r;
@@ -182,9 +174,8 @@
*/
public boolean addGeometry(final GrPolygone _p, final CtuluCommandContainer _cmd, final CtuluUI _ui,
final ZEditionAttributesDataI _d) {
- if (FuLog.isTrace()) {
- FuLog.trace("EZM: ajout polygone");
- }
+ FuLog.debug("EZM: ajout polygone");
+
if (_p.sommets_.nombre() < 3) {
_ui.error(null, getErrorMinPt(), false);
return false;
@@ -203,10 +194,10 @@
final boolean r = isNewPolygoneOk(poly, _ui);
final CtuluCommandComposite cmp = new CtuluCommandComposite();
final Object[] data = createData(poly, _d, cmp);
- if (FuLog.isTrace() && data != null) {
- FuLog.trace("EZM: nb data proposed " + data.length);
+ if (data != null) {
+ FuLog.debug("EZM: nb data proposed " + data.length);
for (int i = 0; i < data.length; i++) {
- FuLog.trace("EZM: data " + i + " = " + data[i]);
+ FuLog.debug("EZM: data " + i + " = " + data[i]);
}
}
if (data == null && needData()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-17 13:08:42
|
Revision: 9085
http://sourceforge.net/p/fudaa/svn/9085
Author: bmarchan
Date: 2015-03-17 13:08:30 +0000 (Tue, 17 Mar 2015)
Log Message:
-----------
Conversion des projets < 1.4.1 -> 1.4.2
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivPersistence.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivPersistence.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivPersistence.java 2015-03-17 13:06:17 UTC (rev 9084)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivPersistence.java 2015-03-17 13:08:30 UTC (rev 9085)
@@ -1,6 +1,7 @@
package org.fudaa.fudaa.piv;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Enumeration;
@@ -21,6 +22,7 @@
import com.db4o.ObjectContainer;
import com.db4o.ObjectSet;
import com.memoire.bu.BuInformationsDocument;
+import com.memoire.bu.BuInformationsSoftware;
import com.memoire.fu.FuLog;
/**
@@ -136,6 +138,27 @@
return false;
}
+ // Lecture de la version
+ String version;
+ try {
+ File infoFile=new File(prj_.getRoot(), "project.xml");
+ FileInputStream ins = new FileInputStream(infoFile);
+ BuInformationsSoftware infos = FudaaSaveProject.getSoftwareInfos(ins);
+ ins.close();
+
+ version=infos.version;
+ }
+ // Pas de fichier => On consid\xE8re que la version est inf\xE9rieure ou \xE9gale \xE0 1.1
+ catch (IOException e) {
+ version="1.1";
+ }
+
+ // Conversion des versions < 1.4.2
+ if ("1.4.2".compareTo(version)>0) {
+ FuLog.trace("Conversion de la version : "+version+" vers "+impl_.getInformationsSoftware().version);
+ convertTo1_4_2();
+ }
+
// Lecture du projet
prj_.load(_prjFile, _prog);
@@ -169,4 +192,33 @@
public Map<String,EbliUIProperties> getLayerProperties() {
return uiprops_;
}
+
+ /**
+ * Conversion vers la version 1.4.2
+ * Les modifications sont :
+ * - Le fichier outputs.dir/bathy.dat est d\xE9plac\xE9 vers transects/bathy0001.dat
+ * - les fichiers img_pgm/cache.jpg et img_transf/cache.jpg sont supprim\xE9es.
+ */
+ private void convertTo1_4_2() {
+ File dirImgSrc=new File(prj_.getRoot(),"img_pgm");
+ File dirImgTrf=new File(prj_.getRoot(),"img_transf");
+ File dirOutputs=new File(prj_.getRoot(),"outputs.dir");
+ File dirTransec=new File(prj_.getRoot(),"transects");
+
+ new File(dirImgSrc,"cache.jpg").delete();
+ new File(dirImgTrf,"cache.jpg").delete();
+
+ if (new File(dirOutputs,"bathy.dat").exists()) {
+ dirTransec.mkdir();
+ new File(dirOutputs,"bathy.dat").renameTo(new File(dirTransec,"trans0001."+PivUtils.FILE_FLT_TRANS_BTH.getFirstExt()));
+ }
+ if (new File(dirOutputs,"Discharge.dat").exists()) {
+ dirTransec.mkdir();
+ new File(dirOutputs,"Discharge.dat").renameTo(new File(dirTransec,"trans0001."+PivUtils.FILE_FLT_TRANS_RES.getFirstExt()));
+ }
+ if (new File(dirOutputs,"PIV_param.dat").exists()) {
+ dirTransec.mkdir();
+ CtuluLibFile.copyFile(new File(dirOutputs,"PIV_param.dat"),new File(dirTransec,"trans0001."+PivUtils.FILE_FLT_TRANS_PAR.getFirstExt()));
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-17 13:06:20
|
Revision: 9084
http://sourceforge.net/p/fudaa/svn/9084
Author: bmarchan
Date: 2015-03-17 13:06:17 +0000 (Tue, 17 Mar 2015)
Log Message:
-----------
Gestion emplacement de la doc par varaible d'environnement
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivPreferences.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivPreferences.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivPreferences.java 2015-03-17 13:05:54 UTC (rev 9083)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivPreferences.java 2015-03-17 13:06:17 UTC (rev 9084)
@@ -23,6 +23,8 @@
public static final String PIV_EXE_PATH="piv.exe.path";
/** La regeneration automatique des cache */
public static final String PIV_AUTO_CACHE="piv.auto.cache";
+ /** Le path de la doc */
+ public static final String PIV_DOC_PATH="piv.doc.path";
/**
* Singleton.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-17 13:06:03
|
Revision: 9083
http://sourceforge.net/p/fudaa/svn/9083
Author: bmarchan
Date: 2015-03-17 13:05:54 +0000 (Tue, 17 Mar 2015)
Log Message:
-----------
Deplacement de methodes et des filtres de PivImplemention/PivResources -> PivUtils
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivManageOriginalFilesPanel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivUtils.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGRPAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivComputeParameters.java
trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/io/TestJExeLauncher.java
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 2015-03-17 13:05:32 UTC (rev 9082)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-03-17 13:05:54 UTC (rev 9083)
@@ -44,7 +44,6 @@
import org.fudaa.fudaa.piv.action.PivComputeLaunchAction;
import org.fudaa.fudaa.piv.action.PivComputeParamAction;
import org.fudaa.fudaa.piv.action.PivExportImagesAction;
-import org.fudaa.fudaa.piv.action.PivFlowParamAction;
import org.fudaa.fudaa.piv.action.PivImportGRPAction;
import org.fudaa.fudaa.piv.action.PivImportGridAction;
import org.fudaa.fudaa.piv.action.PivImportTransectAction;
@@ -58,7 +57,6 @@
import com.memoire.bu.BuAbstractPreferencesPanel;
import com.memoire.bu.BuBrowserPreferencesPanel;
import com.memoire.bu.BuDesktopPreferencesPanel;
-import com.memoire.bu.BuFileFilter;
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuLanguagePreferencesPanel;
import com.memoire.bu.BuMenu;
@@ -119,41 +117,6 @@
}
/**
- * Un filtre des fichiers projets, utilis\xE9e lors d'ouverture
- * d'un projet par boite de dialogue.
- */
- public static BuFileFilter FILE_FLT_PROJ;
-
- /**
- * Un filtre des fichiers images de type pgm.
- */
- public static BuFileFilter FILE_FLT_PGM;
-
- /**
- * Un filtre des fichiers images, utilis\xE9e lors de la selection
- * des fichiers par boite de dialogue.
- */
- public static BuFileFilter FILE_FLT_IMAGES;
-
- /**
- * Un filtre des fichiers grid.dat, utilis\xE9e lors de l'import
- * par boite de dialogue.
- */
- public static BuFileFilter FILE_FLT_GRID;
-
- /**
- * Un filtre des fichiers GRP.dat, utilis\xE9e lors de l'import
- * par boite de dialogue.
- */
- public static BuFileFilter FILE_FLT_GRP;
-
- /**
- * Un filtre des fichiers bathy.dat, utilis\xE9e lors de l'import
- * par boite de dialogue.
- */
- public static BuFileFilter FILE_FLT_BATHY;
-
- /**
* Constructeur.
*/
public PivImplementation() {
@@ -161,20 +124,6 @@
useNewHelp_ = false;
create2dFrame();
}
-
- /**
- * Initialise les champs statiques d\xE9pendants du language.
- */
- private void initStaticLanguageDependant() {
- FILE_FLT_PROJ=new BuFileFilter("lspiv.zip",PivResource.getS("Fichier projet"));
- FILE_FLT_PGM=new BuFileFilter("pgm",PivResource.getS("Fichiers images en niveaux de gris"));
- FILE_FLT_IMAGES=new BuFileFilter(new String[]{"jpg","jpeg","gif","png","pgm","tif","tiff","bmp"},PivResource.getS("Fichiers images"));
- FILE_FLT_GRID=new BuFileFilter("dat",PivResource.getS("Fichier grid"));
- FILE_FLT_GRP=new BuFileFilter("dat",PivResource.getS("Fichier GRP"));
- FILE_FLT_BATHY=new BuFileFilter("dat",PivResource.getS("Fichier bathy"));
-
-// isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
- }
/**
* Retourne le projet en cours.
@@ -218,7 +167,7 @@
setEnabledForAction("IMPORT_GRID", bprjOpen && bprjHasTransfImg);
setEnabledForAction("IMPORT_TRANSECT", bprjOpen && bprjHasTransfImg);
setEnabledForAction("CREATE_TRANSECT", bprjOpen && bprjHasTransfImg);
- setEnabledForAction("DEFINE_FLOW_PARAM", bprjOpen && bprjHasTransfImg);
+// setEnabledForAction("DEFINE_FLOW_PARAM", bprjOpen && bprjHasTransfImg);
setEnabledForAction("COMPUTE_FLOW", bprjOpen && project.getAverageResults()!=null);
setEnabledForAction("COMPUTE_PIV", bprjOpen);
setEnabledForAction("COMPUTE_AVERAGE", bprjOpen);
@@ -524,7 +473,7 @@
// Choix du r\xE9pertoire
if (_f == null) {
CtuluFileChooser fc = new CtuluFileChooser(true);
- fc.setFileFilter(FILE_FLT_PROJ);
+ fc.setFileFilter(PivUtils.FILE_FLT_PROJ);
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.setAcceptAllFileFilterUsed(false);
fc.setDialogTitle(PivResource.getS("Ouverture d'un projet"));
@@ -597,14 +546,14 @@
CtuluFileChooserTestWritable tester=new CtuluFileChooserTestWritable(this);
tester.setAppendStrictExtension(true);
fc.setTester(tester);
- fc.setFileFilter(FILE_FLT_PROJ);
+ fc.setFileFilter(PivUtils.FILE_FLT_PROJ);
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.setAcceptAllFileFilterUsed(false);
fc.setDialogTitle(PivResource.getS("Sauvegarde du projet"));
if (fc.showSaveDialog(this.getFrame()) == JFileChooser.CANCEL_OPTION) {
return;
}
- _f=CtuluLibFile.appendStrictExtensionIfNeeded(fc.getSelectedFile(),FILE_FLT_PROJ.getFirstExt());
+ _f=CtuluLibFile.appendStrictExtensionIfNeeded(fc.getSelectedFile(),PivUtils.FILE_FLT_PROJ.getFirstExt());
}
final File f=_f;
@@ -714,7 +663,6 @@
*/
@Override
public void init() {
- initStaticLanguageDependant();
CtuluImageExport.removeWritableFormats(new String[]{"ps"});
@@ -788,7 +736,6 @@
mn.add(get2dFrame().getVisuPanel().getShowVelocitiesAction().buildMenuItem(EbliComponentFactory.INSTANCE));
mn.addSeparator(PivResource.getS("D\xE9bit"));
- mn.add(new PivFlowParamAction(this));
sm=new BuMenu(PivResource.getS("Transect"),"mnGRP");
bt=get2dFrame().getVisuPanel().getNewTransectAction().buildMenuItem(EbliComponentFactory.INSTANCE);
bt.setText(PivResource.getS("D\xE9finir..."));
@@ -797,6 +744,7 @@
bt.setText(PivResource.getS("Importer..."));
sm.add(bt);
mn.add(sm);
+ mn.add(get2dFrame().getVisuPanel().getRealView().getParamsTransectAction().buildMenuItem(EbliComponentFactory.INSTANCE));
mn.add(new PivComputeFlowAction(this));
mn.add(get2dFrame().getVisuPanel().getShowFlowAction().buildMenuItem(EbliComponentFactory.INSTANCE));
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivManageOriginalFilesPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivManageOriginalFilesPanel.java 2015-03-17 13:05:32 UTC (rev 9082)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivManageOriginalFilesPanel.java 2015-03-17 13:05:54 UTC (rev 9083)
@@ -64,7 +64,7 @@
@Override
public void actionAdd() {
CtuluFileChooser fc = new CtuluFileChooser(true);
- fc.setFileFilter(PivImplementation.FILE_FLT_IMAGES);
+ fc.setFileFilter(PivUtils.FILE_FLT_IMAGES);
fc.setMultiSelectionEnabled(true);
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.setAcceptAllFileFilterUsed(false);
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivUtils.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivUtils.java 2015-03-17 13:05:32 UTC (rev 9082)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivUtils.java 2015-03-17 13:05:54 UTC (rev 9083)
@@ -1,5 +1,7 @@
package org.fudaa.fudaa.piv;
+import com.memoire.bu.BuFileFilter;
+
/**
* Une classe d'utilitaires et de valeurs utiles.
* @author Bertrand Marchand (mar...@de...)
@@ -13,6 +15,61 @@
public final static double FORTRAN_DOUBLE_MAX=1.e30;
/**
+ * Un filtre des fichiers bathy de transect
+ */
+ public static BuFileFilter FILE_FLT_TRANS_BTH=new BuFileFilter("bth_dat");
+ /**
+ * Un filtre des fichiers resultats de transect
+ */
+ public static BuFileFilter FILE_FLT_TRANS_RES=new BuFileFilter("res_dat");
+ /**
+ * Un filtre des fichiers parametres de transect
+ */
+ public static BuFileFilter FILE_FLT_TRANS_PAR=new BuFileFilter("par_dat");
+
+ /**
+ * Un filtre des fichiers bathy.dat, utilis\xE9e lors de l'import
+ * par boite de dialogue.
+ */
+ public static BuFileFilter FILE_FLT_BATHY;
+ /**
+ * Un filtre des fichiers GRP.dat, utilis\xE9e lors de l'import
+ * par boite de dialogue.
+ */
+ public static BuFileFilter FILE_FLT_GRP;
+ /**
+ * Un filtre des fichiers grid.dat, utilis\xE9e lors de l'import
+ * par boite de dialogue.
+ */
+ public static BuFileFilter FILE_FLT_GRID;
+ /**
+ * Un filtre des fichiers images, utilis\xE9e lors de la selection
+ * des fichiers par boite de dialogue.
+ */
+ public static BuFileFilter FILE_FLT_IMAGES;
+ /**
+ * Un filtre des fichiers images de type pgm.
+ */
+ public static BuFileFilter FILE_FLT_PGM;
+ /**
+ * Un filtre des fichiers projets, utilis\xE9e lors d'ouverture
+ * d'un projet par boite de dialogue.
+ */
+ public static BuFileFilter FILE_FLT_PROJ;
+
+ /**
+ * Initialise les champs statiques d\xE9pendants du language.
+ */
+ static {
+ PivUtils.FILE_FLT_PROJ=new BuFileFilter("lspiv.zip",PivResource.getS("Fichier projet"));
+ PivUtils.FILE_FLT_PGM=new BuFileFilter("pgm",PivResource.getS("Fichiers images en niveaux de gris"));
+ PivUtils.FILE_FLT_IMAGES=new BuFileFilter(new String[]{"jpg","jpeg","gif","png","pgm","tif","tiff","bmp"},PivResource.getS("Fichiers images"));
+ PivUtils.FILE_FLT_GRID=new BuFileFilter("dat",PivResource.getS("Fichier grid"));
+ PivUtils.FILE_FLT_GRP=new BuFileFilter("dat",PivResource.getS("Fichier GRP"));
+ PivUtils.FILE_FLT_BATHY=new BuFileFilter("dat",PivResource.getS("Fichier bathy"));
+ }
+
+ /**
* Formatte un num\xE9ro sur 4 caract\xE8res pour un index donn\xE9. Les premiers
* caract\xE8res sont combl\xE9s par des 0. Exemple : 0013
* @param _i L'index
@@ -25,5 +82,4 @@
sb.append(_i);
return sb.toString();
}
-
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGRPAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGRPAction.java 2015-03-17 13:05:32 UTC (rev 9082)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGRPAction.java 2015-03-17 13:05:54 UTC (rev 9083)
@@ -17,6 +17,7 @@
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.piv.PivImplementation;
import org.fudaa.fudaa.piv.PivResource;
+import org.fudaa.fudaa.piv.PivUtils;
import org.fudaa.fudaa.piv.PivVisuPanel;
import org.fudaa.fudaa.piv.io.PivGRPReader;
import org.fudaa.fudaa.piv.metier.PivOrthoPoint;
@@ -57,7 +58,7 @@
if (fcGRP==null)
fcGRP = new CtuluFileChooser(true);
fcGRP.setAcceptAllFileFilterUsed(true);
- fcGRP.setFileFilter(PivImplementation.FILE_FLT_GRP);
+ fcGRP.setFileFilter(PivUtils.FILE_FLT_GRP);
fcGRP.setMultiSelectionEnabled(false);
fcGRP.setDialogTitle(PivResource.getS("S\xE9lection d'un fichier GRP"));
if (fcGRP.showOpenDialog(impl.getFrame()) == JFileChooser.CANCEL_OPTION) {
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java 2015-03-17 13:05:32 UTC (rev 9082)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivImportGridAction.java 2015-03-17 13:05:54 UTC (rev 9083)
@@ -15,6 +15,7 @@
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.piv.PivImplementation;
import org.fudaa.fudaa.piv.PivResource;
+import org.fudaa.fudaa.piv.PivUtils;
import org.fudaa.fudaa.piv.PivVisuPanel;
import org.fudaa.fudaa.piv.io.PivGridReader;
import org.fudaa.fudaa.piv.metier.PivGrid;
@@ -63,7 +64,7 @@
if (fcGrid==null)
fcGrid = new CtuluFileChooser(true);
fcGrid.setAcceptAllFileFilterUsed(true);
- fcGrid.setFileFilter(PivImplementation.FILE_FLT_GRID);
+ fcGrid.setFileFilter(PivUtils.FILE_FLT_GRID);
fcGrid.setMultiSelectionEnabled(false);
fcGrid.setDialogTitle(PivResource.getS("S\xE9lection d'un fichier de grille"));
if (fcGrid.showOpenDialog(impl.getFrame()) == CtuluFileChooser.CANCEL_OPTION) {
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivComputeParameters.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivComputeParameters.java 2015-03-17 13:05:32 UTC (rev 9082)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivComputeParameters.java 2015-03-17 13:05:54 UTC (rev 9083)
@@ -1,7 +1,7 @@
package org.fudaa.fudaa.piv.metier;
import org.fudaa.ebli.geometrie.GrPoint;
-import org.fudaa.fudaa.piv.PivResource;
+import org.fudaa.fudaa.piv.PivUtils;
/**
* Les parametres pour le calcul des vitesses par PIV.
@@ -25,17 +25,17 @@
/** La position suivant j et i du centre de l'aire. */
protected GrPoint ptCenter;
/** La correlation minimale */
- protected double minCorrelation=PivResource.FORTRAN_DOUBLE_MIN;
+ protected double minCorrelation=PivUtils.FORTRAN_DOUBLE_MIN;
/** La correlation maximale */
- protected double maxCorrelation=PivResource.FORTRAN_DOUBLE_MAX;
+ protected double maxCorrelation=PivUtils.FORTRAN_DOUBLE_MAX;
/** Valeur min des normes de vitesse */
- protected double smin=PivResource.FORTRAN_DOUBLE_MIN;
+ protected double smin=PivUtils.FORTRAN_DOUBLE_MIN;
/** Valeur max des normes de vitesse */
- protected double smax=PivResource.FORTRAN_DOUBLE_MAX;
+ protected double smax=PivUtils.FORTRAN_DOUBLE_MAX;
/** Valeur min des vitesses transversales */
- protected double vmin=PivResource.FORTRAN_DOUBLE_MIN;
+ protected double vmin=PivUtils.FORTRAN_DOUBLE_MIN;
/** Valeur max des vitesses transversales */
- protected double vmax=PivResource.FORTRAN_DOUBLE_MAX;
+ protected double vmax=PivUtils.FORTRAN_DOUBLE_MAX;
public PivComputeParameters() {
}
Modified: trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/io/TestJExeLauncher.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/io/TestJExeLauncher.java 2015-03-17 13:05:32 UTC (rev 9082)
+++ trunk/soft/fudaa-lspiv/src/test/java/org/fudaa/fudaa/piv/io/TestJExeLauncher.java 2015-03-17 13:05:54 UTC (rev 9083)
@@ -1,5 +1,7 @@
package org.fudaa.fudaa.piv.io;
+import org.fudaa.fudaa.piv.PivUtils;
+
import junit.framework.TestCase;
/**
@@ -8,8 +10,8 @@
public class TestJExeLauncher extends TestCase {
public void testComputeImgLauncher() {
- assertEquals(PivExeLauncher.formatImgNumber(1),"0001");
- assertEquals(PivExeLauncher.formatImgNumber(672),"0672");
- assertEquals(PivExeLauncher.formatImgNumber(9999),"9999");
+ assertEquals(PivUtils.formatOn4Chars(1),"0001");
+ assertEquals(PivUtils.formatOn4Chars(672),"0672");
+ assertEquals(PivUtils.formatOn4Chars(9999),"9999");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 22:22:37
|
Revision: 9081
http://sourceforge.net/p/fudaa/svn/9081
Author: deniger
Date: 2015-03-16 22:22:30 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/soft/fudaa-prepro/pom.xml
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2015-03-16 22:15:29 UTC (rev 9080)
+++ trunk/soft/fudaa-prepro/pom.xml 2015-03-16 22:22:30 UTC (rev 9081)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-mesh.version>1.5-SNAPSHOT</fudaa-mesh.version>
+ <fudaa-mesh.version>1.7-SNAPSHOT</fudaa-mesh.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 22:15:36
|
Revision: 9080
http://sourceforge.net/p/fudaa/svn/9080
Author: deniger
Date: 2015-03-16 22:15:29 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/soft/fudaa-mesh/pom.xml
Modified: trunk/soft/fudaa-mesh/pom.xml
===================================================================
--- trunk/soft/fudaa-mesh/pom.xml 2015-03-16 22:14:08 UTC (rev 9079)
+++ trunk/soft/fudaa-mesh/pom.xml 2015-03-16 22:15:29 UTC (rev 9080)
@@ -4,7 +4,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-sig.version>1.6-SNAPSHOT</fudaa-sig.version>
+ <fudaa-sig.version>1.7-SNAPSHOT</fudaa-sig.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-mesh</groupId>
<artifactId>fudaa-mesh</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.7-SNAPSHOT</version>
<name>Fudaa-Mesh</name>
<dependencyManagement>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 22:14:09
|
Revision: 9079
http://sourceforge.net/p/fudaa/svn/9079
Author: deniger
Date: 2015-03-16 22:14:08 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/business/fudaa-sig/pom.xml
Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml 2015-03-16 22:12:57 UTC (rev 9078)
+++ trunk/business/fudaa-sig/pom.xml 2015-03-16 22:14:08 UTC (rev 9079)
@@ -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.6-SNAPSHOT</dodico-h2d.version>
+ <dodico-h2d.version>1.7-SNAPSHOT</dodico-h2d.version>
<javaCompiler>1.7</javaCompiler>
<targetJdk>1.7</targetJdk>
</properties>
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.7-SNAPSHOT</version>
<name>fudaa-sig</name>
<dependencyManagement>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 22:13:04
|
Revision: 9078
http://sourceforge.net/p/fudaa/svn/9078
Author: deniger
Date: 2015-03-16 22:12:57 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2015-03-16 22:12:36 UTC (rev 9077)
+++ trunk/business/fudaa-ef/core/pom.xml 2015-03-16 22:12:57 UTC (rev 9078)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.7-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 2015-03-16 22:12:36 UTC (rev 9077)
+++ trunk/business/fudaa-ef/io/pom.xml 2015-03-16 22:12:57 UTC (rev 9078)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.7-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 22:12:43
|
Revision: 9077
http://sourceforge.net/p/fudaa/svn/9077
Author: deniger
Date: 2015-03-16 22:12:36 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/business/dodico-h2d/core/pom.xml
trunk/business/dodico-h2d/io/pom.xml
Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml 2015-03-16 22:12:06 UTC (rev 9076)
+++ trunk/business/dodico-h2d/core/pom.xml 2015-03-16 22:12:36 UTC (rev 9077)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.7-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 2015-03-16 22:12:06 UTC (rev 9076)
+++ trunk/business/dodico-h2d/io/pom.xml 2015-03-16 22:12:36 UTC (rev 9077)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.7-SNAPSHOT</version>
</parent>
<artifactId>h2d-io</artifactId>
<name>I/O pour h2d</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 22:12:09
|
Revision: 9076
http://sourceforge.net/p/fudaa/svn/9076
Author: deniger
Date: 2015-03-16 22:12:06 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/business/dodico-h2d/pom.xml
Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml 2015-03-16 22:11:43 UTC (rev 9075)
+++ trunk/business/dodico-h2d/pom.xml 2015-03-16 22:12:06 UTC (rev 9076)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-ef.version>1.5</fudaa-ef.version>
+ <fudaa-ef.version>1.7-SNAPSHOT</fudaa-ef.version>
<projetEncoding>ISO-8859-15</projetEncoding>
<!-- la version du compiler -->
<javaCompiler>1.6</javaCompiler>
@@ -16,7 +16,7 @@
</parent>
<groupId>org.fudaa.business.dodico-h2d</groupId>
<artifactId>dodico-h2d</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.7-SNAPSHOT</version>
<name>Fudaa Hydraulique 2d</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 22:11:50
|
Revision: 9075
http://sourceforge.net/p/fudaa/svn/9075
Author: deniger
Date: 2015-03-16 22:11:43 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2015-03-16 22:04:22 UTC (rev 9074)
+++ trunk/business/fudaa-ef/pom.xml 2015-03-16 22:11:43 UTC (rev 9075)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.5</fudaa-framework.version>
+ <fudaa-framework.version>1.7-SNAPSHOT</fudaa-framework.version>
<projetEncoding>ISO-8859-15</projetEncoding>
<!-- la version du compiler -->
<javaCompiler>1.6</javaCompiler>
@@ -12,11 +12,11 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.7-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 22:04:29
|
Revision: 9074
http://sourceforge.net/p/fudaa/svn/9074
Author: deniger
Date: 2015-03-16 22:04:22 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/palette/BPalettePlageProperties.java
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/palette/BPalettePlageProperties.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/palette/BPalettePlageProperties.java 2015-03-16 21:31:52 UTC (rev 9073)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/palette/BPalettePlageProperties.java 2015-03-16 22:04:22 UTC (rev 9074)
@@ -70,12 +70,12 @@
if (formatterPattern_ != null) {
_target.setFormatter(CtuluNumberFormatBuilder.restoreFromPattern(formatterPattern_));
}
+ if (plages_ != null) {
+ _target.setPlages(plages_);
+ }
if (_target.isReduitEnable()) {
_target.setReduit(isReduit_);
}
- if (plages_ != null) {
- _target.setPlages(plages_);
- }
_target.setLogScale(logScale);
_target.setSubTitleVisible(ssTitreVisible);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 21:31:55
|
Revision: 9073
http://sourceforge.net/p/fudaa/svn/9073
Author: deniger
Date: 2015-03-16 21:31:52 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java
Added Paths:
-----------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtX.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtY.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java 2015-03-16 21:26:46 UTC (rev 9072)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceAbstract.java 2015-03-16 21:31:52 UTC (rev 9073)
@@ -81,6 +81,8 @@
import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedMoins;
import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedMultiply;
import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedPlus;
+import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedPtX;
+import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedPtY;
import org.fudaa.fudaa.tr.post.data.TrPostDataHelper;
import org.fudaa.fudaa.tr.post.data.TrPostDataInfoDoc;
import org.fudaa.fudaa.tr.post.data.TrPostDataListener;
@@ -414,7 +416,9 @@
protected void buildDefaultVectors() {
final Map nameFleche = new HashMap();
varCreateData_ = new HashMap();
- // par defaut vitesse et debit
+ //x et y :
+ varCreateData_.put(H2dVariableType.POINT_X, new TrPostDataCreatedPtX(this)); // par defaut vitesse et debit
+ varCreateData_.put(H2dVariableType.POINT_Y, new TrPostDataCreatedPtY(this)); // par defaut vitesse et debit
if (isInitVar(H2dVariableType.VITESSE_U)) {
if (isInitVar(H2dVariableType.VITESSE_V)) {
final TrPostFlecheContent vec = createSimpleVecteurContent(H2dVariableType.VITESSE, H2dVariableType.VITESSE_U,
@@ -637,7 +641,7 @@
try {
_m.put(variable_[i].getName(),
CtuluLib.DEFAULT_NUMBER_FORMAT.format(interpolator.interpolate(_element, _x,
- _y, variable_[i], _time)));
+ _y, variable_[i], _time)));
} catch (final IOException _evt) {
FuLog.error(_evt);
_m.put(variable_[i].getName(), "ERROR");
@@ -1371,7 +1375,6 @@
// c'est la premiere fois que l'on ouvre le fichier de post.
// on enregistre les infos
-
return true;
}
@@ -1619,4 +1622,4 @@
public List<TrPostSource> getUsedSources() {
return Collections.emptyList();
}
-}
\ No newline at end of file
+}
Copied: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtX.java (from rev 9071, trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java)
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtX.java (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtX.java 2015-03-16 21:31:52 UTC (rev 9073)
@@ -0,0 +1,46 @@
+/*
+ * @creation 3 mai 2005
+ * @modification $Date: 2007-04-16 16:35:31 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.tr.post.data;
+
+import java.util.Set;
+import org.fudaa.dodico.ef.EfData;
+import org.fudaa.dodico.ef.EfDataNode;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.fudaa.tr.post.TrPostSource;
+
+public final class TrPostDataCreatedPtX extends TrPostDataCreatedDefault {
+
+ public TrPostDataCreatedPtX(final TrPostSource _src) {
+ super(_src);
+ }
+
+ @Override
+ public double buildDataFor(final int _idxTime, final int _idxObject) {
+ final EfGridInterface grid = src_.getGrid();
+ return grid.getPtX(_idxObject);
+ }
+
+ @Override
+ public void fillWhithAllUsedVar(final Set _res) {
+ }
+
+ @Override
+ public String getDescription() {
+ return "X";
+ }
+
+ @Override
+ public EfData buildDataFor(final int _idxTime) {
+ final EfGridInterface grid = src_.getGrid();
+ final double[] bathy = new double[grid.getPtsNb()];
+ for (int i = bathy.length - 1; i >= 0; i--) {
+ bathy[i] = grid.getPtX(i);
+ }
+ return new EfDataNode(bathy);
+ }
+}
Copied: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtY.java (from rev 9071, trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java)
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtY.java (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPtY.java 2015-03-16 21:31:52 UTC (rev 9073)
@@ -0,0 +1,46 @@
+/*
+ * @creation 3 mai 2005
+ * @modification $Date: 2007-04-16 16:35:31 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.tr.post.data;
+
+import java.util.Set;
+import org.fudaa.dodico.ef.EfData;
+import org.fudaa.dodico.ef.EfDataNode;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.fudaa.tr.post.TrPostSource;
+
+public final class TrPostDataCreatedPtY extends TrPostDataCreatedDefault {
+
+ public TrPostDataCreatedPtY(final TrPostSource _src) {
+ super(_src);
+ }
+
+ @Override
+ public double buildDataFor(final int _idxTime, final int _idxObject) {
+ final EfGridInterface grid = src_.getGrid();
+ return grid.getPtY(_idxObject);
+ }
+
+ @Override
+ public void fillWhithAllUsedVar(final Set _res) {
+ }
+
+ @Override
+ public String getDescription() {
+ return "Y";
+ }
+
+ @Override
+ public EfData buildDataFor(final int _idxTime) {
+ final EfGridInterface grid = src_.getGrid();
+ final double[] bathy = new double[grid.getPtsNb()];
+ for (int i = bathy.length - 1; i >= 0; i--) {
+ bathy[i] = grid.getPtY(i);
+ }
+ return new EfDataNode(bathy);
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-16 21:26:49
|
Revision: 9072
http://sourceforge.net/p/fudaa/svn/9072
Author: deniger
Date: 2015-03-16 21:26:46 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java 2015-03-16 16:20:44 UTC (rev 9071)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/type/H2dVariableType.java 2015-03-16 21:26:46 UTC (rev 9072)
@@ -105,17 +105,36 @@
return "m/s";
}
+ public static final H2dVariableType POINT_X = new H2dVariableType(H2dResource.getS("X"),
+ null, "x") {
+
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return 0;
+ }
+ };
+ public static final H2dVariableType POINT_Y = new H2dVariableType(H2dResource.getS("Y"),
+ null, "y") {
+
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return 0;
+ }
+ };
+
/**
* COEF_FROTTEMENT.
*/
public static final H2dVariableType COEF_FROTTEMENT = new H2dVariableType(H2dResource.getS("Coefficient frottement"),
- null, "frc") {
+ null, "frc") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return _c.getFriction();
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return _c.getFriction();
+ }
+ };
public static final H2dVariableType SANS = new H2dVariableType(H2dResource.getS("Sans"), null, "sans") {
@@ -126,23 +145,23 @@
};
public static final H2dVariableType COEF_DIFFUSION = new H2dVariableType(H2dResource.getS("Coefficient diffusion"),
- null, "dif") {
+ null, "dif") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- new Throwable().printStackTrace();
- return 0;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return 0;
+ }
+ };
public static final H2dVariableType LOI_TARAGE = new H2dVariableType(H2dResource.getS("Loi de tarage"), null,
- "tarage") {
+ "tarage") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- new Throwable().printStackTrace();
- return 0;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return 0;
+ }
+ };
public static final H2dVariableType TEMPS = new H2dVariableType(H2dResource.getS("Temps"), null, "t") {
@@ -157,18 +176,18 @@
}
};
public static final H2dVariableType COEF_FROTTEMENT_FOND = new H2dVariableType(H2dResource
- .getS("Coefficient frottement de fond"), null, "bottom_frc") {
+ .getS("Coefficient frottement de fond"), null, "bottom_frc") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return _c.getFriction();
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return _c.getFriction();
+ }
+ };
/**
* Cote d'eau.
*/
- // public static final H2dVariableType COTE_EAU = new H2dVariableType(H2dResource.getS("Cote eau"), "SL", "zw") {
+ // public static final H2dVariableType COTE_EAU = new H2dVariableType(H2dResource.getS("Cote eau"), "SL", "zw") {
public static final H2dVariableType COTE_EAU = new H2dVariableType(H2dResource.getS("Surface libre"), "SL", "zw") {
@Override
public boolean canBeTransient() {
@@ -188,18 +207,18 @@
};
public static final H2dVariableType DEBIT_M3 = new H2dVariableTypeDebitM3(H2dResource.getS("D\xE9bit") + " m3/s", "Qm3",
- "Qm3") {
+ "Qm3") {
@Override
public boolean canBeTransient() {
return true;
}
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return 0;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return 0;
+ }
+ };
/**
* debit.
@@ -217,23 +236,23 @@
}
};
public static final H2dVariableType DEBIT_NORMAL = new H2dVariableTypeDebit(H2dResource.getS("D\xE9bit normal"), null,
- "qu") {
+ "qu") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- new Throwable().printStackTrace();
- return -1;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return -1;
+ }
+ };
public static final H2dVariableType DEBIT_TANGENTIEL = new H2dVariableTypeDebit(H2dResource.getS("D\xE9bit tangentiel"),
- null, "qv") {
+ null, "qv") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- new Throwable().printStackTrace();
- return -1;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ new Throwable().printStackTrace();
+ return -1;
+ }
+ };
public static final H2dVariableType DEBIT_X = new H2dVariableTypeDebit(H2dResource.getS("D\xE9bit selon X"), null, "qx") {
@@ -265,21 +284,21 @@
}
};
public static final H2dVariableType PERTE_CHARGE = new H2dVariableType(H2dResource.getS("Perte de charge"), null,
- "frc_loss") {
+ "frc_loss") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return _c.getPressureLoss();
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return _c.getPressureLoss();
+ }
+ };
public static final H2dVariableType PRECISION_BCD_METHOD = new H2dVariableType(
- H2dResource.getS("Pr\xE9cision banc c/d"), null, "acc_bcd_meth") {
+ H2dResource.getS("Pr\xE9cision banc c/d"), null, "acc_bcd_meth") {
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return 0;
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return 0;
+ }
+ };
public static final H2dVariableType RELAXATION = new H2dVariableType(H2dResource.getS("Relaxation"), null, "relax") {
@Override
@@ -300,12 +319,12 @@
}
public final static H2dVariableTypeCreated createTempVar(final String _name, final String _shortName,
- final Map _strName) {
+ final Map _strName) {
return new H2dVariableTypeCreated(_name, _shortName, _strName);
}
public final static H2dVariableTypeCreated createTempVar(final String _name, final String _shortName,
- final String _unit, final Map _strName) {
+ final String _unit, final Map _strName) {
return new H2dVariableTypeCreated(_name, _shortName, _unit, _strName);
}
@@ -388,7 +407,7 @@
}
};
public static final H2dVariableType VITESSE_NORMALE = new H2dVariableTypeVitesse(H2dResource.getS("Vitesse normale"),
- "U", "un") {
+ "U", "un") {
@Override
public boolean canBeTransient() {
@@ -400,20 +419,20 @@
return _c.getU();
}
- };
+ };
public static final H2dVariableType VITESSE_TANGENTIELLE = new H2dVariableTypeVitesse(H2dResource
- .getS("Vitesse tangentielle"), "V", "ut") {
+ .getS("Vitesse tangentielle"), "V", "ut") {
@Override
public boolean canBeTransient() {
return true;
}
- @Override
- public double getValue(final H2dVariableTypeContainer _c) {
- return _c.getV();
- }
- };
+ @Override
+ public double getValue(final H2dVariableTypeContainer _c) {
+ return _c.getV();
+ }
+ };
public static final H2dVariableType VENT = new H2dVariableType(H2dResource.getS("Vent"), null, "wind") {
@Override
@@ -464,7 +483,7 @@
*/
public final static boolean isTracerVariable(final H2dVariableType _t) {
return (_t == H2dVariableTransType.TRACEUR) || (_t == H2dVariableTransType.TRACEUR_COEF_A)
- || (_t == H2dVariableTransType.TRACEUR_COEF_B);
+ || (_t == H2dVariableTransType.TRACEUR_COEF_B);
}
private String telemacID_;
@@ -512,7 +531,9 @@
*/
public static H2dVariableType getVarFromShortName(final String _shortName, final Map _shortNameVarCreated) {
final H2dVariableType t = (H2dVariableType) shortNameVar.get(_shortName);
- if (t == null && _shortNameVarCreated != null) { return (H2dVariableType) _shortNameVarCreated.get(_shortName); }
+ if (t == null && _shortNameVarCreated != null) {
+ return (H2dVariableType) _shortNameVarCreated.get(_shortName);
+ }
return t;
}
@@ -546,7 +567,7 @@
/**
* Par exemple renvoie vitesse pour vitesse_u et vitesse_v.
- *
+ *
* @return la variable parent. null par defaut
*/
public H2dVariableType getParentVariable() {
@@ -580,7 +601,7 @@
/**
* Pour l'affichage.
- *
+ *
* @return si valeur entiere
*/
public boolean isInteger() {
@@ -589,10 +610,10 @@
/**
* Optimisation.
- *
+ *
* @return true si vitesse
*/
public boolean isVitesse() {
return false;
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-16 16:20:46
|
Revision: 9071
http://sourceforge.net/p/fudaa/svn/9071
Author: bmarchan
Date: 2015-03-16 16:20:44 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
Impl?\195?\169mentation m?\195?\169thode clone.
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/VecteurGenerique.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/geometrie/GrPolyligne.java
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/VecteurGenerique.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/VecteurGenerique.java 2015-03-16 10:17:57 UTC (rev 9070)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/VecteurGenerique.java 2015-03-16 16:20:44 UTC (rev 9071)
@@ -128,7 +128,8 @@
@Override
public final Object clone() throws CloneNotSupportedException {
final VecteurGenerique r = (VecteurGenerique) super.clone();
- r.vide();
+ // Obligatoire sinon le clone pointe sur la m\xEAme liste.
+ r.v_=new ArrayList();
for (int i = 0; i < nombre(); i++) {
r.ajoute(internRenvoie(i));
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/geometrie/GrPolyligne.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/geometrie/GrPolyligne.java 2015-03-16 10:17:57 UTC (rev 9070)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/geometrie/GrPolyligne.java 2015-03-16 16:20:44 UTC (rev 9071)
@@ -25,7 +25,7 @@
* @version $Id: GrPolyligne.java,v 1.12 2006-11-20 08:40:16 deniger Exp $
* @author Guillaume Desnoix
*/
-public class GrPolyligne extends GrObjet implements GrContour {
+public class GrPolyligne extends GrObjet implements GrContour, Cloneable {
// public ListeGrPoint sommets;
public VecteurGrPoint sommets_;
@@ -33,7 +33,22 @@
public GrPolyligne() {
sommets_ = new VecteurGrPoint();
}
+
+ @Override
+ public GrPolyligne clone() {
+ try {
+ GrPolyligne o=(GrPolyligne)super.clone();
+ o.sommets_=(VecteurGrPoint)sommets_.clone();
+ return o;
+ }
+ // Ne doit pas se produire.
+ catch (CloneNotSupportedException e) {
+ throw new InternalError();
+ }
+ }
+
+
/**
* Cr\xE9ation d'une polyligne \xE0 partir d'une sequence.
* @param _seq La sequence.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-16 10:18:09
|
Revision: 9070
http://sourceforge.net/p/fudaa/svn/9070
Author: bmarchan
Date: 2015-03-16 10:17:57 +0000 (Mon, 16 Mar 2015)
Log Message:
-----------
Compilation et execution en 1.7
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/pom.xml
Modified: trunk/soft/fudaa-lspiv/pom.xml
===================================================================
--- trunk/soft/fudaa-lspiv/pom.xml 2015-03-13 17:40:31 UTC (rev 9069)
+++ trunk/soft/fudaa-lspiv/pom.xml 2015-03-16 10:17:57 UTC (rev 9070)
@@ -5,8 +5,8 @@
<properties>
<fudaa-framework.version>1.7-SNAPSHOT</fudaa-framework.version>
<fudaa-mesh.version>1.5-SNAPSHOT</fudaa-mesh.version>
- <javaCompiler>1.6</javaCompiler>
- <targetJdk>1.6</targetJdk>
+ <javaCompiler>1.7</javaCompiler>
+ <targetJdk>1.7</targetJdk>
</properties>
<parent>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-09 21:03:38
|
Revision: 9062
http://sourceforge.net/p/fudaa/svn/9062
Author: deniger
Date: 2015-03-09 21:03:35 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/distrib/pom.xml
trunk/soft/fudaa-mascaret/ui/pom.xml
Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml 2015-03-09 21:02:07 UTC (rev 9061)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml 2015-03-09 21:03:35 UTC (rev 9062)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.4.2</version>
+ <version>3.5_beta</version>
</parent>
<artifactId>mascaret-distrib</artifactId>
<properties>
Modified: trunk/soft/fudaa-mascaret/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/ui/pom.xml 2015-03-09 21:02:07 UTC (rev 9061)
+++ trunk/soft/fudaa-mascaret/ui/pom.xml 2015-03-09 21:03:35 UTC (rev 9062)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.5_beta</version>
+ <version>3.5_beta</version>
</parent>
<artifactId>mascaret-ui</artifactId>
<build>
@@ -69,12 +69,10 @@
<dependency>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe</artifactId>
- <version>1.7-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-graphe-3D</artifactId>
- <version>1.7-SNAPSHOT</version>
</dependency>
</dependencies>
<properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-09 21:02:14
|
Revision: 9061
http://sourceforge.net/p/fudaa/svn/9061
Author: deniger
Date: 2015-03-09 21:02:07 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/pom.xml
Modified: trunk/soft/fudaa-mascaret/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/pom.xml 2015-03-09 21:01:14 UTC (rev 9060)
+++ trunk/soft/fudaa-mascaret/pom.xml 2015-03-09 21:02:07 UTC (rev 9061)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-common-corba.version>1.3</fudaa-common-corba.version>
+ <fudaa-common-corba.version>1.4-SNAPSHOT</fudaa-common-corba.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-09 21:01:21
|
Revision: 9060
http://sourceforge.net/p/fudaa/svn/9060
Author: deniger
Date: 2015-03-09 21:01:14 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/framework/pom.xml
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2015-03-09 20:43:16 UTC (rev 9059)
+++ trunk/framework/pom.xml 2015-03-09 21:01:14 UTC (rev 9060)
@@ -37,6 +37,7 @@
<module>ebli-1d</module>
<module>ebli-2d</module>
<module>ebli-3d</module>
+ <module>ebli-graphe-3D</module>
<module>ebli-network</module>
<module>ebli-visuallibrary</module>
<module>fudaa-common</module>
@@ -138,6 +139,11 @@
</dependency>
<dependency>
<groupId>${ebliGroupId}</groupId>
+ <artifactId>ebli-graphe-3D</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${ebliGroupId}</groupId>
<artifactId>ebli-network</artifactId>
<version>${project.version}</version>
</dependency>
@@ -146,8 +152,8 @@
<artifactId>ebli-3d</artifactId>
<version>${project.version}</version>
<!--
- voir http://maven.apache.org/guides/mini/guide-attached-tests.html
- -->
+ voir http://maven.apache.org/guides/mini/guide-attached-tests.html
+ -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -201,9 +207,9 @@
<groupId>trove</groupId>
<artifactId>trove</artifactId>
<!--
- attention la version 2.1.1 est bogue pour le calcul du min sur
- TDoubleArrayList
- -->
+ attention la version 2.1.1 est bogue pour le calcul du min sur
+ TDoubleArrayList
+ -->
<version>2.0.4</version>
</dependency>
<dependency>
@@ -212,10 +218,10 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>3.9</version>
- </dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.9</version>
+ </dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2015-03-09 20:43:18
|
Revision: 9059
http://sourceforge.net/p/fudaa/svn/9059
Author: deniger
Date: 2015-03-09 20:43:16 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
dev
Modified Paths:
--------------
trunk/business/fudaa-common-corba/pom.xml
Modified: trunk/business/fudaa-common-corba/pom.xml
===================================================================
--- trunk/business/fudaa-common-corba/pom.xml 2015-03-09 15:04:35 UTC (rev 9058)
+++ trunk/business/fudaa-common-corba/pom.xml 2015-03-09 20:43:16 UTC (rev 9059)
@@ -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-corba.version>1.3</dodico-corba.version>
+ <dodico-corba.version>1.4-SNAPSHOT</dodico-corba.version>
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
- <version>${dodico-corba.version}</version>
</dependency>
<dependency>
<groupId>${ebliGroupId}</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-09 15:04:37
|
Revision: 9058
http://sourceforge.net/p/fudaa/svn/9058
Author: bmarchan
Date: 2015-03-09 15:04:35 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Fix : Valeurs par d?\195?\169faut pour les filtrages
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFilterInstantResultsPanel.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFilterInstantResultsPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFilterInstantResultsPanel.java 2015-03-09 14:17:01 UTC (rev 9057)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFilterInstantResultsPanel.java 2015-03-09 15:04:35 UTC (rev 9058)
@@ -222,8 +222,11 @@
public void setFilterValues(PivComputeParameters _params) {
if (_params==null) return;
- if (_params.getMinCorrelation()==PivResource.FORTRAN_DOUBLE_MIN) {
+ if (_params.getMinCorrelation()==PivUtils.FORTRAN_DOUBLE_MIN &&
+ _params.getMaxCorrelation()==PivUtils.FORTRAN_DOUBLE_MAX) {
cbCorrelFlt_.setSelected(false);
+ tfCorrelMinLimit_.setText("0.");
+ tfCorrelMaxLimit_.setText("1.");
}
else {
cbCorrelFlt_.setSelected(true);
@@ -231,8 +234,15 @@
tfCorrelMaxLimit_.setText(""+_params.getMaxCorrelation());
}
- if (_params.getSmin()==PivResource.FORTRAN_DOUBLE_MIN) {
+ if (_params.getSmin()==PivUtils.FORTRAN_DOUBLE_MIN &&
+ _params.getSmax()==PivUtils.FORTRAN_DOUBLE_MAX &&
+ _params.getVmin()==PivUtils.FORTRAN_DOUBLE_MIN &&
+ _params.getVmax()==PivUtils.FORTRAN_DOUBLE_MAX) {
cbVelFlt_.setSelected(false);
+ tfNormalMinLimit_.setText("0.");
+ tfNormalMaxLimit_.setText(""+_params.getSmax());
+ tfVyMinLimit_.setText(""+_params.getVmin());
+ tfVyMaxLimit_.setText(""+_params.getVmax());
}
else {
cbVelFlt_.setSelected(true);
@@ -256,8 +266,8 @@
_params.setMaxCorrelation(Double.parseDouble(tfCorrelMaxLimit_.getText()));
}
else {
- _params.setMinCorrelation(PivResource.FORTRAN_DOUBLE_MIN);
- _params.setMaxCorrelation(PivResource.FORTRAN_DOUBLE_MAX);
+ _params.setMinCorrelation(PivUtils.FORTRAN_DOUBLE_MIN);
+ _params.setMaxCorrelation(PivUtils.FORTRAN_DOUBLE_MAX);
}
if (cbVelFlt_.isSelected()) {
@@ -267,10 +277,10 @@
_params.setVmax(Double.parseDouble(tfVyMaxLimit_.getText()));
}
else {
- _params.setSmin(PivResource.FORTRAN_DOUBLE_MIN);
- _params.setSmax(PivResource.FORTRAN_DOUBLE_MAX);
- _params.setVmin(PivResource.FORTRAN_DOUBLE_MIN);
- _params.setVmax(PivResource.FORTRAN_DOUBLE_MAX);
+ _params.setSmin(PivUtils.FORTRAN_DOUBLE_MIN);
+ _params.setSmax(PivUtils.FORTRAN_DOUBLE_MAX);
+ _params.setVmin(PivUtils.FORTRAN_DOUBLE_MIN);
+ _params.setVmax(PivUtils.FORTRAN_DOUBLE_MAX);
}
}
@@ -345,27 +355,27 @@
if (cbVelFlt_.isSelected()) {
min=Double.parseDouble(tfNormalMinLimit_.getText());
- if (min<=PivResource.FORTRAN_DOUBLE_MIN) {
+ if (min<PivUtils.FORTRAN_DOUBLE_MIN) {
setErrorText(PivResource.getS("{0}: Doit \xEAtre sup\xE9rieur \xE0 {1}",
- PivResource.getS("Min norme de vitesse"), PivResource.FORTRAN_DOUBLE_MIN));
+ PivResource.getS("Min norme de vitesse"), PivUtils.FORTRAN_DOUBLE_MIN));
return false;
}
max=Double.parseDouble(tfNormalMaxLimit_.getText());
- if (max>=PivResource.FORTRAN_DOUBLE_MAX) {
+ if (max>PivUtils.FORTRAN_DOUBLE_MAX) {
setErrorText(PivResource.getS("{0}: Doit \xEAtre inf\xE9rieur \xE0 {1}",
- PivResource.getS("Max norme de vitesse"), PivResource.FORTRAN_DOUBLE_MAX));
+ PivResource.getS("Max norme de vitesse"), PivUtils.FORTRAN_DOUBLE_MAX));
return false;
}
min=Double.parseDouble(tfVyMinLimit_.getText());
- if (min<=PivResource.FORTRAN_DOUBLE_MIN) {
+ if (min<PivUtils.FORTRAN_DOUBLE_MIN) {
setErrorText(PivResource.getS("{0}: Doit \xEAtre sup\xE9rieur \xE0 {1}",
- PivResource.getS("Min vitesse transversale"), PivResource.FORTRAN_DOUBLE_MIN));
+ PivResource.getS("Min vitesse transversale"), PivUtils.FORTRAN_DOUBLE_MIN));
return false;
}
max=Double.parseDouble(tfVyMaxLimit_.getText());
- if (max>=PivResource.FORTRAN_DOUBLE_MAX) {
+ if (max>PivUtils.FORTRAN_DOUBLE_MAX) {
setErrorText(PivResource.getS("{0}: Doit \xEAtre inf\xE9rieur \xE0 {1}",
- PivResource.getS("Max vitesse transversale"), PivResource.FORTRAN_DOUBLE_MAX));
+ PivResource.getS("Max vitesse transversale"), PivUtils.FORTRAN_DOUBLE_MAX));
return false;
}
}
@@ -378,15 +388,15 @@
if (cbCorrelFlt_.isSelected()) {
min=Double.parseDouble(tfCorrelMinLimit_.getText());
- if (min <= PivResource.FORTRAN_DOUBLE_MIN) {
+ if (min < PivUtils.FORTRAN_DOUBLE_MIN) {
setErrorText(PivResource.getS("{0}: Doit \xEAtre sup\xE9rieur \xE0 {1}",
- PivResource.getS("Min corr\xE9lation"), PivResource.FORTRAN_DOUBLE_MIN));
+ PivResource.getS("Min corr\xE9lation"), PivUtils.FORTRAN_DOUBLE_MIN));
return false;
}
max=Double.parseDouble(tfCorrelMaxLimit_.getText());
- if (max >= PivResource.FORTRAN_DOUBLE_MAX) {
+ if (max > PivUtils.FORTRAN_DOUBLE_MAX) {
setErrorText(PivResource.getS("{0}: Doit \xEAtre inf\xE9rieur \xE0 {1}",
- PivResource.getS("Max corr\xE9lation"), PivResource.FORTRAN_DOUBLE_MAX));
+ PivResource.getS("Max corr\xE9lation"), PivUtils.FORTRAN_DOUBLE_MAX));
return false;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-09 14:17:03
|
Revision: 9057
http://sourceforge.net/p/fudaa/svn/9057
Author: bmarchan
Date: 2015-03-09 14:17:01 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Fix : Pb de chemin de la doc
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2015-03-09 13:33:08 UTC (rev 9056)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-03-09 14:17:01 UTC (rev 9057)
@@ -83,7 +83,7 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.4.1";
+ isPIV_.version = "1.4.2";
isPIV_.date = "2015-02-24";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2015";
isPIV_.license = "GPL2";
@@ -91,7 +91,7 @@
isPIV_.authors=new String[]{"B.Marchand (mar...@de...)"};
isPIV_.contact="mag...@ed...\nje...@ir...\nal...@ed...";
isPIV_.http="http://forge.irstea.fr/projects/fudaa-lspiv";
- isPIV_.man="doc/guide_Fudaa-lspiv_v0.pdf";
+ isPIV_.man="guide_Fudaa-lspiv.pdf";
isPIV_.citation=PivResource.getS("Ichiro Fujita (Prof.), Universit\xE9 de Kob\xE9");
isPIV_.logo = PivResource.PIV.getIcon("iconepiv.gif");
@@ -321,7 +321,8 @@
* Affiche la documentation depuis un fichier externe (pdf, html, ...)
*/
private void showHelp() {
- File manFile=new File(getInformationsSoftware().man);
+ String docPath=System.getProperty(PivPreferences.PIV_DOC_PATH,System.getProperty("user.dir")+"/doc");
+ File manFile=new File(docPath,getInformationsSoftware().man);
FuLog.trace("Affichage de la doc depuis "+manFile.getAbsolutePath());
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-09 13:33:15
|
Revision: 9056
http://sourceforge.net/p/fudaa/svn/9056
Author: bmarchan
Date: 2015-03-09 13:33:08 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Corerctions diverses
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2015-03-09 13:32:34 UTC (rev 9055)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-03-09 13:33:08 UTC (rev 9056)
@@ -89,9 +89,10 @@
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
isPIV_.authors=new String[]{"B.Marchand (mar...@de...)"};
- isPIV_.contact="mag...@ed...\n jer...@ir...\n ale...@ed...";
+ isPIV_.contact="mag...@ed...\nje...@ir...\nal...@ed...";
isPIV_.http="http://forge.irstea.fr/projects/fudaa-lspiv";
isPIV_.man="doc/guide_Fudaa-lspiv_v0.pdf";
+ isPIV_.citation=PivResource.getS("Ichiro Fujita (Prof.), Universit\xE9 de Kob\xE9");
isPIV_.logo = PivResource.PIV.getIcon("iconepiv.gif");
isPIV_.banner = PivResource.PIV.getIcon("banniere.jpg");
@@ -592,7 +593,9 @@
if (_f==null) {
CtuluFileChooser fc = new CtuluFileChooser(true);
- fc.setTester(new CtuluFileChooserTestWritable(this));
+ CtuluFileChooserTestWritable tester=new CtuluFileChooserTestWritable(this);
+ tester.setAppendStrictExtension(true);
+ fc.setTester(tester);
fc.setFileFilter(FILE_FLT_PROJ);
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.setAcceptAllFileFilterUsed(false);
@@ -600,7 +603,7 @@
if (fc.showSaveDialog(this.getFrame()) == JFileChooser.CANCEL_OPTION) {
return;
}
- _f=CtuluLibFile.appendExtensionIfNeeded(fc.getSelectedFile(),FILE_FLT_PROJ.getFirstExt());
+ _f=CtuluLibFile.appendStrictExtensionIfNeeded(fc.getSelectedFile(),FILE_FLT_PROJ.getFirstExt());
}
final File f=_f;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-09 13:32:42
|
Revision: 9055
http://sourceforge.net/p/fudaa/svn/9055
Author: bmarchan
Date: 2015-03-09 13:32:34 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Prise en compte du langage d?\195?\169s le lancement
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/Piv.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/Piv.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/Piv.java 2015-03-09 13:30:46 UTC (rev 9054)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/Piv.java 2015-03-09 13:32:34 UTC (rev 9055)
@@ -9,6 +9,8 @@
import org.fudaa.fudaa.commun.impl.Fudaa;
+import com.memoire.bu.BuPreferences;
+
/**
* Classe de lancement de l'application Fudaa-Piv.
*
@@ -28,6 +30,12 @@
* @param _args Les arguments autoris\xE9s par l'applicatif.
*/
public static void main(String[] _args) {
+ PivPreferences.setRoot("piv");
+
+ // Obligatoire pour que la langue soit prise en charge dans tous les composants standards
+ // de Java (FileChooser, ...). Il faut le faire avant m\xEAme qu'un composant Swing soit
+ // instanci\xE9.
+ BuPreferences.BU.applyLanguage("en,fr");
// BuResource.BU.setIconFamily("crystal");
//
// JOptionPane.setRootFrame(BuLib.HELPER);
@@ -36,7 +44,6 @@
// UIManager.put("Table.darkerOddLines", Boolean.FALSE);
// System.setProperty("swing.boldMetal", "false");
// FuLib.setSystemProperty("lnf.menu.needed", "false");
- PivPreferences.setRoot("piv");
Fudaa f = new Fudaa();
f.launch(_args, PivImplementation.informationsSoftware(), true);
f.startApp(new PivImplementation());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
