fudaa-svn-commit — svn commit with diffs

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

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

Revision: 9626
          http://sourceforge.net/p/fudaa/svn/9626
Author:   bmarchan
Date:     2017-06-06 15:29:33 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
LSPIV : Ouverture automatique du rapport de jaugeage

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportGaugingReportAction.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportGaugingReportAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportGaugingReportAction.java	2017-06-06 15:29:06 UTC (rev 9625)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportGaugingReportAction.java	2017-06-06 15:29:33 UTC (rev 9626)
@@ -7,6 +7,7 @@
  */
 package org.fudaa.fudaa.piv.action;
 
+import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
@@ -330,7 +331,7 @@
   }
   
   /**
-   * Sauve le rapport sur le fichier selectionn\xE9.
+   * Sauve le rapport sur le fichier selectionn\xE9, et l'ouvre automatiquement.
    * @param wb
    * @throws IOException
    */
@@ -359,6 +360,15 @@
     }
 
     wb.write(new FileOutputStream(fcReport_.getSelectedFile()));
+    
+    // Ouverture directe de l'application associ\xE9e au fichier .xlsx
+    if (Desktop.isDesktopSupported()) {
+      try {
+        Desktop.getDesktop().open(fcReport_.getSelectedFile());
+      }
+      catch (Exception _exc) {
+      }
+    }
   }
 
   /**

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[9625] trunk/soft/fudaa-lspiv/distrib/src/dist/bin

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

Revision: 9625
          http://sourceforge.net/p/fudaa/svn/9625
Author:   bmarchan
Date:     2017-06-06 15:29:06 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
LSPIV : Passage des parametres au launcher

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/distrib/src/dist/bin/fudaa-lspiv.bat
    trunk/soft/fudaa-lspiv/distrib/src/dist/bin/fudaa-lspiv.sh

Modified: trunk/soft/fudaa-lspiv/distrib/src/dist/bin/fudaa-lspiv.bat
===================================================================
--- trunk/soft/fudaa-lspiv/distrib/src/dist/bin/fudaa-lspiv.bat	2017-06-01 16:08:44 UTC (rev 9624)
+++ trunk/soft/fudaa-lspiv/distrib/src/dist/bin/fudaa-lspiv.bat	2017-06-06 15:29:06 UTC (rev 9625)
@@ -10,4 +10,4 @@
 if "%{ISO3_LANG}"=="fra" set PIV_LANG=fr
 if "%{ISO3_LANG}"=="eng" set PIV_LANG=en
 
-%JAVA%\bin\javaw -Dpiv.lang="%PIV_LANG%" -Dpiv.exe.path="%{INSTALL_PATH}\exes" -Dpiv.doc.path="%{INSTALL_PATH}\doc" -cp "%{INSTALL_PATH}\lib\%JAR%;%{INSTALL_PATH}\lib\jai_imageio.jar" org.fudaa.fudaa.piv.Piv
+%JAVA%\bin\javaw -Dpiv.lang="%PIV_LANG%" -Dpiv.exe.path="%{INSTALL_PATH}\exes" -Dpiv.doc.path="%{INSTALL_PATH}\doc" -cp "%{INSTALL_PATH}\lib\%JAR%;%{INSTALL_PATH}\lib\jai_imageio.jar" org.fudaa.fudaa.piv.Piv %1 %2 %3 %4 %5 %6 %7 %8 %9

Modified: trunk/soft/fudaa-lspiv/distrib/src/dist/bin/fudaa-lspiv.sh
===================================================================
--- trunk/soft/fudaa-lspiv/distrib/src/dist/bin/fudaa-lspiv.sh	2017-06-01 16:08:44 UTC (rev 9624)
+++ trunk/soft/fudaa-lspiv/distrib/src/dist/bin/fudaa-lspiv.sh	2017-06-06 15:29:06 UTC (rev 9625)
@@ -10,4 +10,4 @@
 if [ "%{ISO3_LANG}" = "fra" ] ; then PIV_LANG="fr"; fi
 if [ "%{ISO3_LANG}" = "eng" ] ; then PIV_LANG="en"; fi
 
-$JAVA/bin/java -Dpiv.lang="$PIV_LANG" -Dpiv.exe.path="%{INSTALL_PATH}/exes" -Dpiv.doc.path="%{INSTALL_PATH}/doc" -cp "%{INSTALL_PATH}/lib/$JAR:%{INSTALL_PATH}/lib/jai_imageio.jar" org.fudaa.fudaa.piv.Piv
+$JAVA/bin/java -Dpiv.lang="$PIV_LANG" -Dpiv.exe.path="%{INSTALL_PATH}/exes" -Dpiv.doc.path="%{INSTALL_PATH}/doc" -cp "%{INSTALL_PATH}/lib/$JAR:%{INSTALL_PATH}/lib/jai_imageio.jar" org.fudaa.fudaa.piv.Piv $1 $2 $3 $4 $5 $6 $7 $8 $9

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

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

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

Revision: 9624
          http://sourceforge.net/p/fudaa/svn/9624
Author:   bmarchan
Date:     2017-06-01 16:08:44 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
Chgt des parametres par defaut pour les calques

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.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/PivTransfView.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java	2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java	2017-06-01 16:08:44 UTC (rev 9624)
@@ -98,10 +98,12 @@
     // Layer des ortho points
     cqOrthoPoints_=new ZCalquePointEditable(null, null);
     cqOrthoPoints_.setTitle(PivResource.getS("Points r\xE9f\xE9rence"));
-    cqOrthoPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS_DOUBLE, 3, Color.RED));
+    cqOrthoPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS, 4, Color.RED));
     cqOrthoPoints_.setName("cqOrthoPoints");
     cqOrthoPoints_.setDestructible(false);
     cqOrthoPoints_.setAttributForLabels(PivVisuPanel.ATT_LABEL);
+    // Legerement transparent.
+    cqOrthoPoints_.setLabelsBackgroundColor(new Color(255, 255, 255, 75));
     cqOrthoPoints_.setEditor(pnLayers_.getEditor());
     getOrthoGRPAction().setCalqueOrthoPoints(cqOrthoPoints_);
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2017-06-01 16:08:44 UTC (rev 9624)
@@ -219,10 +219,12 @@
     cqRealOrthoPoints_=new ZCalquePointEditable(null,null);
     cqRealOrthoPoints_.setTitle(PivResource.getS("Points r\xE9f\xE9rence"));
     cqRealOrthoPoints_.setLongTitle(PivResource.getS("Points r\xE9f\xE9rence"));
-    cqRealOrthoPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS_DOUBLE, 3, Color.RED));
+    cqRealOrthoPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS, 4, Color.RED));
     cqRealOrthoPoints_.setName("cqRealOrthoPoints");
     cqRealOrthoPoints_.setDestructible(false);
     cqRealOrthoPoints_.setAttributForLabels(PivVisuPanel.ATT_LABEL);
+    // Legerement transparent.
+    cqRealOrthoPoints_.setLabelsBackgroundColor(new Color(255, 255, 255, 75));
     cqRealOrthoPoints_.setEditor(pnLayers_.getEditor());
 
     // Layer des ortho points recalcul\xE9s (ajout\xE9 a la demande)
@@ -229,7 +231,7 @@
     cqRealControlPoints_=new ZCalqueMultiPointEditable(null,null);
     cqRealControlPoints_.setTitle(PivResource.getS("Points de contr\xF4le"));
     cqRealControlPoints_.setLongTitle(PivResource.getS("Points de contr\xF4le"));
-    cqRealControlPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS_DOUBLE, 3, Color.BLUE));
+    cqRealControlPoints_.setIconModel(0, new TraceIconModel(TraceIcon.CERCLE, 4, Color.BLUE));
     cqRealControlPoints_.setName("cqRealControlPoints");
     cqRealControlPoints_.setDestructible(false);
 
@@ -259,6 +261,9 @@
     cqVelResults.setName("cqRealVel");
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
     cqVelResults.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.RED));
+    // On force la taille de vecteur \xE0 2.5 m/s
+    cqVelResults.getScaleData().setLegendFixRealNorm(2.5);
+    cqVelResults.getScaleData().setLegendUseFixRealNorm(true);
     cqVelResults.setVisible(false);
     cqVelResults.addPropertyChangeListener(new PropertyChangeListener() {
       public void propertyChange(PropertyChangeEvent evt) {
@@ -277,6 +282,9 @@
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
     cqInstantVelResults_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.ORANGE));
     cqInstantVelResults_.setTitleModifiable(true);
+    // On force la taille de vecteur \xE0 2.5 m/s
+    cqInstantVelResults_.getScaleData().setLegendFixRealNorm(2.5);
+    cqInstantVelResults_.getScaleData().setLegendUseFixRealNorm(true);
     cqInstantVelResults_.setVisible(false);
 
     // Layer des vitesses instantan\xE9es filtr\xE9es.
@@ -289,6 +297,9 @@
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
     cqInstantVelFltResults_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.GREEN.darker()));
     cqInstantVelFltResults_.setTitleModifiable(true);
+    // On force la taille de vecteur \xE0 2.5 m/s
+    cqInstantVelFltResults_.getScaleData().setLegendFixRealNorm(2.5);
+    cqInstantVelFltResults_.getScaleData().setLegendUseFixRealNorm(true);
     cqInstantVelFltResults_.setVisible(false);
 
     // Layer des d\xE9bits.
@@ -299,6 +310,9 @@
     cqFlowResults.setName("cqRealFlow");
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
     cqFlowResults.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 2, Color.ORANGE));
+    // On force la taille de vecteur \xE0 2.5 m/s
+    cqFlowResults.getScaleData().setLegendFixRealNorm(2.5);
+    cqFlowResults.getScaleData().setLegendUseFixRealNorm(true);
     
     // Layer des transect
     cqTransect_= new PivTransectLayer();

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java	2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java	2017-06-01 16:08:44 UTC (rev 9624)
@@ -126,6 +126,8 @@
     cqCntGrille_.setName("cqCntGrille");
     cqCntGrille_.setDestructible(false);
     cqCntGrille_.setAttributForLabels(PivVisuPanel.ATT_LABEL);
+    // Legerement transparent.
+    cqCntGrille_.setLabelsBackgroundColor(new Color(255, 255, 255, 75));
     cqCntGrille_.setEditor(pnLayers_.getEditor());
 
     // Layer des points de grille

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java	2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java	2017-06-01 16:08:44 UTC (rev 9624)
@@ -182,14 +182,22 @@
     
     CtuluVariable var=mdl.getCurrentVar();
     
-    
     // on initialise le min/max;
     _b.setToNill();
-    for (int tidx = mdl.getNbTime() - 1; tidx >= 0; tidx--) {
-      for (int i = mdl.getNbPoint() - 1; i >= 0; i--) {
-        _b.expandTo(mdl.getData(var, tidx, i));
+    
+    // Pour la correlation, on initialise entre 0 et 1.
+    if (var==ResultType.CORREL) {
+      _b.expandTo(0);
+      _b.expandTo(1);
+    }
+    else {
+      for (int tidx = mdl.getNbTime() - 1; tidx >= 0; tidx--) {
+        for (int i = mdl.getNbPoint() - 1; i >= 0; i--) {
+          _b.expandTo(mdl.getData(var, tidx, i));
+        }
       }
     }
+    
     return true;
   }
   
@@ -205,9 +213,17 @@
     
     // on initialise le min/max;
     _b.setToNill();
-    for (int i = mdl.getNbPoint() - 1; i >= 0; i--) {
-      _b.expandTo(mdl.getData(var, mdl.getCurrentTimeIdx(), i));
+    
+    if (var==ResultType.CORREL) {
+      _b.expandTo(0);
+      _b.expandTo(1);
     }
+    else {
+      for (int i=mdl.getNbPoint() - 1; i >= 0; i--) {
+        _b.expandTo(mdl.getData(var, mdl.getCurrentTimeIdx(), i));
+      }
+    }
+    
     return true;
   }
 
@@ -227,11 +243,17 @@
    */
   private void initPalette() {
     BPalettePlage palette=(BPalettePlage)getPaletteCouleur();
-    if (palette==null) palette = (BPalettePlage)this.createPaletteCouleur();
+    if (palette==null) {
+      palette = (BPalettePlage)this.createPaletteCouleur();
+      palette.setReduit(true);
+      palette.initPlages(30, 0, 1);
+    }
+    else {
+      CtuluRange range=new CtuluRange();
+      this.getRange(range);
+      palette.initPlages(palette.getNbPlages(), range.min_, range.max_);
+    }
     
-    CtuluRange range = new CtuluRange();
-    this.getRange(range);
-    palette.initPlages(10, range.min_, range.max_);
     palette.setSousTitre((modele()==null || modele().getCurrentVar()==null) ? null:modele().getCurrentVar().getName());
     this.setPaletteCouleurPlages(palette);
   }

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java	2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java	2017-06-01 16:08:44 UTC (rev 9624)
@@ -1,5 +1,6 @@
 package org.fudaa.fudaa.piv.layer;
 
+import java.awt.Color;
 import java.awt.Graphics2D;
 
 import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
@@ -26,6 +27,8 @@
   public PivTransectLayer() {
     super(new PivTransectModel(),null);
     setAttributForLabels(PivVisuPanel.ATT_LABEL);
+    // Legerement transparent.
+    setLabelsBackgroundColor(new Color(255, 255, 255, 75));
   }
 
   /**

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

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

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

Revision: 9623
          http://sourceforge.net/p/fudaa/svn/9623
Author:   bmarchan
Date:     2017-06-01 15:50:25 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
Ajout de la configuration des labels pour le calque ZCalqueEditable

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometryLabelConfigure.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2017-06-01 15:48:31 UTC (rev 9622)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometry.java	2017-06-01 15:50:25 UTC (rev 9623)
@@ -165,7 +165,7 @@
   protected void drawLabelOnAtomic(final FontMetrics fm, String s, final GrPoint ptDest, final Color bgColor, final Graphics2D _g, final Color fgColor) {
     int stringWidth = fm.stringWidth(s);
     int x = (int) (ptDest.x_ - stringWidth / 2);
-    int y = (int) (ptDest.y_ - 5);
+    int y = (int) (ptDest.y_ - 10);
     if (bgColor != null) {
       _g.setColor(bgColor);
       _g.fillRect(x, y - fm.getAscent(), stringWidth, fm.getHeight() + 2);
@@ -677,7 +677,7 @@
 
   @Override
   protected BConfigurableInterface getAffichageConf() {
-    final BConfigurableInterface[] sect = new BConfigurableInterface[3 + getNbSet()];
+    final BConfigurableInterface[] sect = new BConfigurableInterface[2 + getNbSet()];
     sect[0] = new ZCalqueAffichageDonneesConfigure(this);
     sect[1] = new ZCalqueGeometryLabelConfigure(this);
     for (int i = 2; i < sect.length; i++) {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometryLabelConfigure.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometryLabelConfigure.java	2017-06-01 15:48:31 UTC (rev 9622)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueGeometryLabelConfigure.java	2017-06-01 15:50:25 UTC (rev 9623)
@@ -11,6 +11,8 @@
 import java.awt.Font;
 import java.util.ArrayList;
 import java.util.List;
+
+import org.fudaa.ebli.calque.edition.ZCalquePointEditable;
 import org.fudaa.ebli.commun.EbliLib;
 import org.fudaa.ebli.controle.BSelecteurColorChooserBt;
 import org.fudaa.ebli.controle.BSelecteurFont;
@@ -26,11 +28,11 @@
   public static final String PROPERTY_LABELS_FOREGROUND = "labelsForegroundColor";
   public static final String PROPERTY_LABELS_BACKGROUND = "labelsBackgroundColor";
 
-  public ZCalqueGeometryLabelConfigure(final ZCalqueGeometry _target, final boolean _addVisible) {
+  public ZCalqueGeometryLabelConfigure(final ZCalqueAffichageDonneesAbstract _target, final boolean _addVisible) {
     super(_target, EbliLib.getS("Labels"));
   }
 
-  public ZCalqueGeometryLabelConfigure(final ZCalqueGeometry _target) {
+  public ZCalqueGeometryLabelConfigure(final ZCalqueAffichageDonneesAbstract _target) {
     this(_target, false);
   }
 
@@ -41,11 +43,23 @@
       return true;
     }
     if (PROPERTY_LABELS_FOREGROUND.equals(_key)) {
-      ((ZCalqueGeometry) target_).setLabelsForegroundColor(((Color) _newProp));
+      if (target_ instanceof ZCalqueGeometry) {
+        ((ZCalqueGeometry) target_).setLabelsForegroundColor(((Color) _newProp));
+      }
+      // Etendu aux ZCalquePointEditable, qui devraient d\xE9river de ZCalqueGeometry
+      else if (target_ instanceof ZCalquePointEditable) {
+        ((ZCalquePointEditable) target_).setLabelsForegroundColor(((Color) _newProp));        
+      }
       return true;
     }
     if (PROPERTY_LABELS_BACKGROUND.equals(_key)) {
-      ((ZCalqueGeometry) target_).setLabelsBackgroundColor(((Color) _newProp));
+      if (target_ instanceof ZCalqueGeometry) {
+        ((ZCalqueGeometry) target_).setLabelsBackgroundColor(((Color) _newProp));
+      }
+      // Etendu aux ZCalquePointEditable, qui devraient d\xE9river de ZCalqueGeometry
+      else if (target_ instanceof ZCalquePointEditable) {
+        ((ZCalquePointEditable) target_).setLabelsBackgroundColor(((Color) _newProp));        
+      }
       return true;
     }
     return false;
@@ -57,10 +71,22 @@
       return ((ZCalqueAffichageDonneesAbstract) target_).getFont();
     }
     if (PROPERTY_LABELS_FOREGROUND.equals(_key)) {
-      return ((ZCalqueGeometry) target_).getLabelsForegroundColor();
+      if (target_ instanceof ZCalqueGeometry) {
+        return ((ZCalqueGeometry) target_).getLabelsForegroundColor();
+      }
+      // Etendu aux ZCalquePointEditable, qui devraient d\xE9river de ZCalqueGeometry
+      else if (target_ instanceof ZCalquePointEditable) {
+        return ((ZCalquePointEditable) target_).getLabelsForegroundColor();
+      }
     }
     if (PROPERTY_LABELS_BACKGROUND.equals(_key)) {
-      return ((ZCalqueGeometry) target_).getLabelsBackgroundColor();
+      if (target_ instanceof ZCalqueGeometry) {
+        return ((ZCalqueGeometry) target_).getLabelsBackgroundColor();
+      }
+      // Etendu aux ZCalquePointEditable, qui devraient d\xE9river de ZCalqueGeometry
+      else if (target_ instanceof ZCalquePointEditable) {
+        return ((ZCalquePointEditable) target_).getLabelsBackgroundColor();
+      }
     }
     return null;
   }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java	2017-06-01 15:48:31 UTC (rev 9622)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java	2017-06-01 15:50:25 UTC (rev 9623)
@@ -7,13 +7,11 @@
  */
 package org.fudaa.ebli.calque.edition;
 
-import com.memoire.fu.FuLog;
-import com.vividsolutions.jts.geom.Geometry;
-import gnu.trove.TObjectIntHashMap;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
+
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.CtuluCommandComposite;
@@ -25,6 +23,8 @@
 import org.fudaa.ctulu.CtuluUI;
 import org.fudaa.ctulu.gis.GISAttributeInterface;
 import org.fudaa.ctulu.gis.GISZoneCollection;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesConfigure;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesTraceConfigure;
 import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
 import org.fudaa.ebli.calque.ZCalqueGeometryLabelConfigure;
 import org.fudaa.ebli.calque.ZCalquePoint;
@@ -34,6 +34,9 @@
 import org.fudaa.ebli.calque.find.CalqueFindActionAtomic;
 import org.fudaa.ebli.calque.find.CalqueFindPointExpression;
 import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.commun.EbliUIProperties;
+import org.fudaa.ebli.controle.BConfigurableComposite;
+import org.fudaa.ebli.controle.BConfigurableInterface;
 import org.fudaa.ebli.find.EbliFindExpressionContainerInterface;
 import org.fudaa.ebli.geometrie.GrBoite;
 import org.fudaa.ebli.geometrie.GrMorphisme;
@@ -41,8 +44,14 @@
 import org.fudaa.ebli.geometrie.GrPoint;
 import org.fudaa.ebli.geometrie.GrSegment;
 import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceLigneModel;
 import org.nfunk.jep.Variable;
 
+import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.geom.Geometry;
+
+import gnu.trove.TObjectIntHashMap;
+
 /**
  * @author Fred Deniger
  * @version $Id$
@@ -85,7 +94,7 @@
   protected void drawLabel(FontMetrics fm, String s, GrPoint pEcran, Color bgColor, Graphics2D _g, Color fgColor) {
     int stringWidth = fm.stringWidth(s);
     int x = (int) (pEcran.x_ - stringWidth / 2);
-    int y = (int) (pEcran.y_ - 5);
+    int y = (int) (pEcran.y_ - 10);
     if (bgColor != null) {
       _g.setColor(bgColor);
       _g.fillRect(x, y - fm.getAscent(), stringWidth, fm.getHeight() + 2);
@@ -185,8 +194,43 @@
     }
     clearCacheAndRepaint();
   }
+  
+  @Override
+  protected BConfigurableInterface getAffichageConf() {
+    final BConfigurableInterface[] sect = new BConfigurableInterface[2 + getNbSet()];
+    sect[0] = new ZCalqueAffichageDonneesConfigure(this);
+    sect[1] = new ZCalqueGeometryLabelConfigure(this);
+    for (int i = 2; i < sect.length; i++) {
+      sect[i] = new ZCalqueAffichageDonneesTraceConfigure(this, i - 2);
+    }
+    return new BConfigurableComposite(sect, EbliLib.getS("Affichage"));
+  }
 
   @Override
+  public EbliUIProperties saveUIProperties() {
+    EbliUIProperties properties = super.saveUIProperties();
+    properties.put(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_BACKGROUND, labelsBackgroundColor);
+    properties.put(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_FOREGROUND, labelsForegroundColor);
+    return properties;
+  }
+
+  @Override
+  public void initFrom(final EbliUIProperties _p) {
+    if (_p != null) {
+      super.initFrom(_p);
+      if (_p.isDefined(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_BACKGROUND)) {
+        setLabelsBackgroundColor((Color) _p.get(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_BACKGROUND));
+      } else {
+        setLabelsBackgroundColor(null);
+      }
+      if (_p.isDefined(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_FOREGROUND)) {
+        setLabelsForegroundColor((Color) _p.get(ZCalqueGeometryLabelConfigure.PROPERTY_LABELS_FOREGROUND));
+      }
+
+    }
+  }
+
+  @Override
   public void paintDonnees(Graphics2D _g, GrMorphisme _versEcran, GrMorphisme _versReel, GrBoite _clipReel) {
     super.paintDonnees(_g, _versEcran, _versReel, _clipReel);
     paintLabelsOnAtomics(_g, _versEcran, _versReel, _clipReel);

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

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

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

Revision: 9622
          http://sourceforge.net/p/fudaa/svn/9622
Author:   bmarchan
Date:     2017-06-01 15:48:31 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
Fix : Quand on trace la legende fleche suivant une norme fixe, on modifie le PixelParUnit pour que la fleche representative ne sorte pas de la legende.

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/FlecheScaleData.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFlecheLegend.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFlecheScaleSection.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/FlecheScaleData.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/FlecheScaleData.java	2017-05-30 15:49:16 UTC (rev 9621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/FlecheScaleData.java	2017-06-01 15:48:31 UTC (rev 9622)
@@ -120,7 +120,10 @@
 
   public double getDefaultFacteur(final Graphics _g) {
     final GrBoite b = support_.getClipReel(_g);
-    final int nombre = support_.modele_.getNombre();
+    int nombre = 0;
+    if (support_.modele_!=null)
+      nombre=support_.modele_.getNombre();
+    
     double maxNormAuCarre = 0;
     for (int i = 0; i < nombre; i++) {
       // recuperation du polygone

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFlecheLegend.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFlecheLegend.java	2017-05-30 15:49:16 UTC (rev 9621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFlecheLegend.java	2017-06-01 15:48:31 UTC (rev 9622)
@@ -208,6 +208,15 @@
         } else {
           val = fixRealNorm;
         }
+        
+        // B.M. 01/06/2017 : On fait en sorte que la norme ne sorte pas du cadre de la l\xE9gende.
+        double pixParUnit = 20;
+        final Insets set=lbfleche_.getInsets();
+        if (set!=null) {
+          max=max-(set.left+set.right);
+          pixParUnit = max/fixRealNorm;
+        }
+        support_.getScaleData().setPixelPerUnit(pixParUnit);
       }
 
       // La fleche legende est trac\xE9e pour tenir dans les dimensions du composant

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFlecheScaleSection.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFlecheScaleSection.java	2017-05-30 15:49:16 UTC (rev 9621)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFlecheScaleSection.java	2017-06-01 15:48:31 UTC (rev 9622)
@@ -11,14 +11,10 @@
  */
 package org.fudaa.ebli.calque;
 
-import com.memoire.bu.BuRadioButton;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuTextField;
-import com.memoire.bu.BuToolButton;
-import com.memoire.bu.BuValueValidator;
 import java.awt.Font;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+
 import javax.swing.AbstractButton;
 import javax.swing.ButtonGroup;
 import javax.swing.JSpinner;
@@ -25,6 +21,7 @@
 import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+
 import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ebli.commun.EbliLib;
@@ -35,6 +32,13 @@
 import org.fudaa.ebli.controle.BSelecteurSpinner;
 import org.fudaa.ebli.controle.BSelecteurTextField;
 
+import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuRadioButton;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuTextField;
+import com.memoire.bu.BuToolButton;
+import com.memoire.bu.BuValueValidator;
+
 /**
  * @author fred deniger
  * @version $Id: ZCalqueFlecheScaleSection.java,v 1.4 2007-06-28 09:26:47 deniger Exp $
@@ -60,7 +64,7 @@
 
   public BSelecteurInterface createLegendSelecteur(boolean addListenerToTarget) {
     final BSelecteurCheckBox selectUseFixNorm = new BSelecteurCheckBox(
-        FlecheScaleData.PROP_LEGEND_USE_CONSTANT_NORM_VALUE, new BuRadioButton(addListenerToTarget?CtuluLibString.EMPTY_STRING:EbliLib.getS("Utiliser une taille fixe")));
+        FlecheScaleData.PROP_LEGEND_USE_CONSTANT_NORM_VALUE, new BuCheckBox(addListenerToTarget?CtuluLibString.EMPTY_STRING:EbliLib.getS("Utiliser une taille fixe")));
     selectUseFixNorm.setTooltip(EbliLib.getS("S\xE9lectionner pour utiliser une norme fixe pour la l\xE9gende"));
     final BSelecteurTextField selectNorm = new BSelecteurTextField(FlecheScaleData.PROP_LEGEND_CONSTANT_NORM_VALUE,
         BuTextField.createDoubleField());
@@ -191,7 +195,7 @@
     BuRadioButton bt=new BuRadioButton(CtuluLibString.EMPTY_STRING);
     final BSelecteurInterface createRelativeSelecteur = createRelativeSelecteur(createLegendSelecteur,bt);
     return new BSelecteurInterface[] { /** font, **/
-    createRelativeSelecteur, createFixedSelecteur(bt), tfMinNorm, createLegendSelecteur };
+    createRelativeSelecteur, createFixedSelecteur(bt), createLegendSelecteur, tfMinNorm };
   }
 
   @Override

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[9621] branches/fudaa_crue_aoc/pom.xml

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

Revision: 9621
          http://sourceforge.net/p/fudaa/svn/9621
Author:   deniger
Date:     2017-05-30 15:49:16 +0000 (Tue, 30 May 2017)
Log Message:
-----------
verification commit sur branche

Modified Paths:
--------------
    branches/fudaa_crue_aoc/pom.xml

Modified: branches/fudaa_crue_aoc/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/pom.xml	2017-05-30 15:39:09 UTC (rev 9620)
+++ branches/fudaa_crue_aoc/pom.xml	2017-05-30 15:49:16 UTC (rev 9621)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+  <!--AOC project-->
   <parent>
     <groupId>org.fudaa.pom</groupId>
     <artifactId>soft-pom</artifactId>

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

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

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

Revision: 9620
          http://sourceforge.net/p/fudaa/svn/9620
Author:   deniger
Date:     2017-05-30 15:39:09 +0000 (Tue, 30 May 2017)
Log Message:
-----------
verification commit sur branche

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

Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml	2017-05-30 15:35:28 UTC (rev 9619)
+++ trunk/soft/fudaa-crue/pom.xml	2017-05-30 15:39:09 UTC (rev 9620)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+  <!--test-->
   <parent>
     <groupId>org.fudaa.pom</groupId>
     <artifactId>soft-pom</artifactId>

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[9619] branches/new_branch/

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

Revision: 9619
          http://sourceforge.net/p/fudaa/svn/9619
Author:   deniger
Date:     2017-05-30 15:35:28 +0000 (Tue, 30 May 2017)
Log Message:
-----------


Added Paths:
-----------
    branches/new_branch/

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

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

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

Revision: 9617
          http://sourceforge.net/p/fudaa/svn/9617
Author:   bmarchan
Date:     2017-05-30 14:01:10 +0000 (Tue, 30 May 2017)
Log Message:
-----------
Suppression des points de correlation avec valeur = -99.

Modified Paths:
--------------
    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/PivResultsDefault.java

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	2017-05-26 21:02:59 UTC (rev 9616)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java	2017-05-30 14:01:10 UTC (rev 9617)
@@ -260,13 +260,22 @@
     
     File velFile=new File(prj_.getOutputDir(),"average_vel.out");
     if (velFile.exists()) {
-      CtuluIOResult<PivResultsDefault> ret = new PivAverageVelReader().read(velFile, _prog);
-      lres.add(ret.getSource());
+      PivResultsDefault aveVelRes = new PivAverageVelReader().read(velFile, _prog).getSource();
+      lres.add(aveVelRes);
       
       File scalFile=new File(prj_.getOutputDir(), "average_scal.out");
       if (scalFile.exists()) {
-        ret = new PivAverageScalReader().read(scalFile, _prog);
-        lres.add((PivResultsI)ret.getSource());
+        PivResultsDefault aveScalRes = new PivAverageScalReader().read(scalFile, _prog).getSource();
+        lres.add(aveScalRes);
+        
+        // On supprime les points de correlation = -99
+        // Cette suppression ne peut \xEAtre faite dans le lecteur des fichiers, certains fichiers ne disposant pas de l'information.
+        for (int ipt=aveScalRes.getNbPoints()-1; ipt>=0; ipt--) {
+          if (aveScalRes.getValue(ipt, ResultType.CORREL)==-99) {
+            aveScalRes.removePoint(ipt);
+            aveVelRes.removePoint(ipt);
+          }
+        }
       }
       
       return new PivCompositeResults(lres);
@@ -361,17 +370,27 @@
       for (int i=0; i<instantFltFiles.length; i++) {
         List<PivResultsI> lres=new ArrayList<PivResultsI>();
         
-        CtuluIOResult<PivResultsDefault> ret = new PivInstantFilteredReader().read(instantFltFiles[i], _prog);
-        lres.add(ret.getSource());
+        PivResultsDefault instantVelRes = new PivInstantFilteredReader().read(instantFltFiles[i], _prog).getSource();
+        lres.add(instantVelRes);
         
         // Les scalaires
+        PivResultsDefault instantScalRes=null;
         if (instantScalFiles!=null && instantScalFiles.length>0) {
-          ret=new PivInstantScalReader().read(instantScalFiles[i], _prog);
+          instantScalRes=new PivInstantScalReader().read(instantScalFiles[i], _prog).getSource();
           // La correlation est supprim\xE9e, elle est issue du fichier filtered plus pr\xE9cis.
-          ret.getSource().removeResult(ResultType.CORREL);
-//          ret.getSource().removeResult(TYPE.CORREL);
-          lres.add(ret.getSource());
+          instantScalRes.removeResult(ResultType.CORREL);
+          lres.add(instantScalRes);
         }
+        
+        // On supprime les points de correlation = -99
+        // Cette suppression ne peut \xEAtre faite dans le lecteur des fichiers, certains fichiers ne disposant pas de l'information.
+        for (int ipt=instantVelRes.getNbPoints()-1; ipt>=0; ipt--) {
+          if (instantVelRes.getValue(ipt, ResultType.CORREL)==-99) {
+            instantVelRes.removePoint(ipt);
+            if (instantScalRes != null)
+              instantScalRes.removePoint(ipt);
+          }
+        }
       
         instantRes[i]=new PivCompositeResults(lres);
       }
@@ -425,8 +444,8 @@
       for (int i=0; i<instantVelFiles.length; i++) {
         List<PivResultsI> lres=new ArrayList<PivResultsI>();
         
-        CtuluIOResult<PivResultsDefault> ret = new PivInstantVelReader().read(instantVelFiles[i], _prog);
-        lres.add(ret.getSource());
+        PivResultsDefault instantVelRes = new PivInstantVelReader().read(instantVelFiles[i], _prog).getSource();
+        lres.add(instantVelRes);
         
   //        if (instantScalFiles!=null && instantScalFiles.length>0) {
   //          ret=new PivInstantScalReader().read(instantScalFiles[i], _prog);
@@ -433,6 +452,16 @@
   //          lres.add(ret.getSource());
   //        }
         
+        // On supprime les points de correlation = -99
+        // Cette suppression ne peut \xEAtre faite dans le lecteur des fichiers, certains fichiers ne disposant pas de l'information.
+        for (int ipt=instantVelRes.getNbPoints()-1; ipt>=0; ipt--) {
+          if (instantVelRes.getValue(ipt, ResultType.CORREL)==-99) {
+            instantVelRes.removePoint(ipt);
+//            if (instantScalRes != null)
+//              instantScalRes.removePoint(ipt);
+          }
+        }
+        
         instantRes.add(new PivCompositeResults(lres));
       }
       return instantRes.toArray(new PivCompositeResults[0]);

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsDefault.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsDefault.java	2017-05-26 21:02:59 UTC (rev 9616)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivResultsDefault.java	2017-05-30 14:01:10 UTC (rev 9617)
@@ -96,6 +96,25 @@
       }
     }
   }
+
+  /**
+   * Supprime un point de r\xE9sultat
+   * @param _ind L'indice du point
+   */
+  public void removePoint(int _ind) {
+    if (_ind < 0 || _ind >= getNbPoints())
+      return;
+
+    x.remove(_ind);
+    y.remove(_ind);
+
+    for (int i=0; i < types.size(); i++) {
+      // Type vectoriel
+      if (types.get(i).isVector()) {
+        vals.get(types.get(i)).remove(_ind);
+      }
+    }
+  }
   
   /**
    * Ajoute une nature de r\xE9sultats. Les valeurs pour ce r\xE9sultats sont par defaut egales \xE0 0.

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[9616] trunk/soft/fudaa-crue/crue-otfa/src/main/java/org /fudaa/dodico/crue/projet/otfa/OtfaReportFormuleService.java

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

Revision: 9616
          http://sourceforge.net/p/fudaa/svn/9616
Author:   deniger
Date:     2017-05-26 21:02:59 +0000 (Fri, 26 May 2017)
Log Message:
-----------
CRUE-677: correction

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportFormuleService.java

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportFormuleService.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportFormuleService.java	2017-05-26 20:56:57 UTC (rev 9615)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportFormuleService.java	2017-05-26 21:02:59 UTC (rev 9616)
@@ -3,11 +3,6 @@
  */
 package org.fudaa.dodico.crue.projet.otfa;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
 import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
 import org.fudaa.dodico.crue.config.ccm.PropertyNature;
 import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
@@ -18,6 +13,11 @@
 import org.fudaa.dodico.crue.projet.report.formule.FormuleContent;
 import org.fudaa.dodico.crue.projet.report.formule.FormuleServiceContent;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
 /**
  * @author Frederic Deniger
  */
@@ -104,7 +104,7 @@
     }
 
     @Override
-    public boolean isExpressionValid(String var, List<ResultatTimeKey> selectedTimes) {
+    public boolean isExpressionValid(String var, Collection<ResultatTimeKey> selectedTimes) {
         FormuleContent content = serviceContent.getContent(var);
         if (content == null || content.getCalculator() == null) {
             //valide car pas de forumule

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[9615] trunk/soft/fudaa-crue/crue-project/src/main/java/ org/fudaa/dodico/crue/projet/report/formule/ FormuleContentManagerDefault.java

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

Revision: 9615
          http://sourceforge.net/p/fudaa/svn/9615
Author:   deniger
Date:     2017-05-26 20:56:57 +0000 (Fri, 26 May 2017)
Log Message:
-----------
CRUE-677: correction

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/formule/FormuleContentManagerDefault.java

Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/formule/FormuleContentManagerDefault.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/formule/FormuleContentManagerDefault.java	2017-05-26 20:35:36 UTC (rev 9614)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/formule/FormuleContentManagerDefault.java	2017-05-26 20:56:57 UTC (rev 9615)
@@ -3,11 +3,11 @@
  */
 package org.fudaa.dodico.crue.projet.report.formule;
 
-import java.util.*;
-
 import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
 import org.fudaa.dodico.crue.projet.report.FormuleContentManager;
 
+import java.util.*;
+
 /**
  *
  * @author Frederic Deniger
@@ -49,7 +49,7 @@
    * @return true par defaut. pas d'intéret ici
    */
   @Override
-  public boolean isExpressionValid(String var, List<ResultatTimeKey> selectedTimes) {
+  public boolean isExpressionValid(String var, Collection<ResultatTimeKey> selectedTimes) {
     return true;
   }
 }

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

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

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

Revision: 9612
          http://sourceforge.net/p/fudaa/svn/9612
Author:   bmarchan
Date:     2017-05-22 10:52:20 +0000 (Mon, 22 May 2017)
Log Message:
-----------
Definition de RG/RD sur transect + action inversion

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/PivRealView.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransectParamAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectModel.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransect.java

Added Paths:
-----------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivInvertTransectAction.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	2017-05-22 10:50:47 UTC (rev 9611)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java	2017-05-22 10:52:20 UTC (rev 9612)
@@ -62,6 +62,7 @@
 import org.fudaa.fudaa.piv.action.PivImportGridAction;
 import org.fudaa.fudaa.piv.action.PivImportOrthoParamAction;
 import org.fudaa.fudaa.piv.action.PivImportTransectAction;
+import org.fudaa.fudaa.piv.action.PivInvertTransectAction;
 import org.fudaa.fudaa.piv.action.PivOrthoLaunchAction;
 import org.fudaa.fudaa.piv.action.PivOrthoVerifyGRPAction;
 import org.fudaa.fudaa.piv.action.PivSelectImagesAction;
@@ -749,6 +750,7 @@
     mn.add(get2dFrame().getVisuPanel().getEditAction().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
     mn.add(get2dFrame().getVisuPanel().getDeplacementAction().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
     mn.add(get2dFrame().getVisuPanel().getRotationAction().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
+    mn.add(get2dFrame().getVisuPanel().getRealView().getInvertTransectAction().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
     mn.add(get2dFrame().getVisuPanel().getEditor().getActionDelete().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
     mn.insertSeparator(idx++);
     

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2017-05-22 10:50:47 UTC (rev 9611)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2017-05-22 10:52:20 UTC (rev 9612)
@@ -28,7 +28,6 @@
 import org.fudaa.ebli.animation.EbliAnimationAdapterInterface;
 import org.fudaa.ebli.calque.BCalque;
 import org.fudaa.ebli.calque.BCalqueAffichage;
-import org.fudaa.ebli.calque.ZCalqueFleche;
 import org.fudaa.ebli.calque.dessin.DeForme;
 import org.fudaa.ebli.calque.edition.ZCalqueMultiPointEditable;
 import org.fudaa.ebli.calque.edition.ZCalquePointEditable;
@@ -45,6 +44,7 @@
 import org.fudaa.ebli.trace.TraceLigneModel;
 import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
 import org.fudaa.fudaa.piv.action.PivCreateParticleLinesAction;
+import org.fudaa.fudaa.piv.action.PivInvertTransectAction;
 import org.fudaa.fudaa.piv.action.PivNewTransectAction;
 import org.fudaa.fudaa.piv.action.PivRealViewAction;
 import org.fudaa.fudaa.piv.action.PivTransectParamAction;
@@ -82,6 +82,7 @@
   
   private PivNewTransectAction actNewTransect_;
   private PivTransectParamAction actParamsTransect_;
+  private PivInvertTransectAction actInvertTransect_;
   private PivCreateParticleLinesAction actParticleLines_;
   private EbliActionAbstract actRealView_;
   private PivVisuPanel pnLayers_;
@@ -908,6 +909,18 @@
   }
 
   /**
+   * Retourne l'action pour l'inversion d'un transect.
+   * @return L'action.
+   */
+  public PivInvertTransectAction getInvertTransectAction() {
+    if (actInvertTransect_==null) {
+      actInvertTransect_=new PivInvertTransectAction((PivImplementation)pnLayers_.getCtuluUI());
+      pnLayers_.getScene().addSelectionListener(actInvertTransect_);
+    }
+    return actInvertTransect_;
+  }
+
+  /**
    * Retourne l'action pour la saisie des parametres d'un transect.
    * @return L'action.
    */

Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivInvertTransectAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivInvertTransectAction.java	                        (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivInvertTransectAction.java	2017-05-22 10:52:20 UTC (rev 9612)
@@ -0,0 +1,63 @@
+/*
+ * @creation     14 nov. 2008
+ * @modification $Date:$
+ * @license      GNU General Public License 2
+ * @copyright    (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail         fud...@li...
+ */
+package org.fudaa.fudaa.piv.action;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.ebli.calque.BCalque;
+import org.fudaa.ebli.calque.ZSelectionEvent;
+import org.fudaa.ebli.calque.ZSelectionListener;
+import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.piv.PivImplementation;
+import org.fudaa.fudaa.piv.PivResource;
+import org.fudaa.fudaa.piv.metier.PivTransect;
+
+/**
+ * Action permettant le changement de sens des g\xE9om\xE9tries selectionn\xE9es.
+ * @author Bertrand Marchand (mar...@de...)
+ */
+public class PivInvertTransectAction extends EbliActionSimple implements ZSelectionListener {
+  PivImplementation impl_;
+  
+  public PivInvertTransectAction(PivImplementation _impl) {
+    super(PivResource.getS("Inverser des transects"), null, "INVERSER_TRANSECT");
+    impl_=_impl;
+    setEnabled(false);
+  }
+
+  public void actionPerformed(final ActionEvent _e) {
+    int[] selIds=impl_.get2dFrame().getVisuPanel().getScene().getLayerSelection().getSelectedIndex();
+    
+    PivTransect[] trans=impl_.getCurrentProject().getTransects();
+    for (int id : selIds) {
+      trans[id].invertGeometry();
+    }
+    
+    // Pour forcer le rafraichissement d'\xE9cran
+    impl_.getCurrentProject().setTransects(trans);
+  }
+  
+  @Override
+  public String getEnableCondition() {
+    return PivResource.getS("S\xE9lectionner un ou plusieurs transects");
+  }
+
+  @Override
+  public void selectionChanged(ZSelectionEvent _evt) {
+    boolean b=false;
+    BCalque cq=impl_.get2dFrame().getVisuPanel().getCalqueActif();
+
+    if (cq==impl_.get2dFrame().getVisuPanel().getRealView().getTransectLayer() && 
+        ((ZCalqueLigneBriseeEditable)cq).getLayerSelection() !=null &&
+        !((ZCalqueLigneBriseeEditable)cq).getLayerSelection().isEmpty()) {
+      b=true;
+    }
+    super.setEnabled(b);
+  }
+}


Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivInvertTransectAction.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransectParamAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransectParamAction.java	2017-05-22 10:50:47 UTC (rev 9611)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivTransectParamAction.java	2017-05-22 10:52:20 UTC (rev 9612)
@@ -45,12 +45,12 @@
     PivTransectParamPanel pn=new PivTransectParamPanel(impl);
     pn.setSelected(selIds);
 
-    pn.afficheModale(impl.getFrame(), PivResource.getS("Param\xE8tres de calcul de d\xE9bit"),CtuluDialog.OK_CANCEL_APPLY_OPTION);
+    pn.afficheModale(impl.getFrame(), PivResource.getS("Param\xE8tres du transect"),CtuluDialog.OK_CANCEL_APPLY_OPTION);
   }
   
   @Override
   public String getEnableCondition() {
-    return PivResource.getS("S\xE9lectionner un transect");
+    return PivResource.getS("S\xE9lectionner un ou plusieurs transects");
   }
 
   @Override

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java	2017-05-22 10:50:47 UTC (rev 9611)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java	2017-05-22 10:52:20 UTC (rev 9612)
@@ -25,6 +25,7 @@
 
   public PivTransectLayer() {
     super(new PivTransectModel(),null);
+    setAttributForLabels(PivVisuPanel.ATT_LABEL);
   }
 
   /**

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectModel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectModel.java	2017-05-22 10:50:47 UTC (rev 9611)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectModel.java	2017-05-22 10:52:20 UTC (rev 9612)
@@ -37,7 +37,7 @@
   /** Le projet. */
   PivProject prj_;
   /** Les attributs de la collection */
-  private GISAttribute[] attrs_ = new GISAttribute[]{PivVisuPanel.ATT_IND_ZR, PivVisuPanel.ATT_INTER, PivVisuPanel.ATT_RAYON, PivVisuPanel.ATT_COEF_VIT};
+  private GISAttribute[] attrs_ = new GISAttribute[]{PivVisuPanel.ATT_IND_ZR, PivVisuPanel.ATT_INTER, PivVisuPanel.ATT_RAYON, PivVisuPanel.ATT_COEF_VIT, PivVisuPanel.ATT_LABEL};
   /** Pour empecher les evenements cycliques */
   protected boolean eventEnabled_=true;
   
@@ -77,6 +77,20 @@
       else if (_attr==PivVisuPanel.ATT_COEF_VIT) {
         return trans_.getParams().getSurfaceCoef();
       }
+      else if (_attr==PivVisuPanel.ATT_LABEL) {
+        // Rive gauche
+        if (_idxVertex==0) {
+          return PivResource.getS("RG");
+        }
+        // Rive droite
+        else if (_idxVertex==getNbVertex()-1) {
+          return PivResource.getS("RD");
+        }
+        // Les autres points : Aucune visualisation
+        else {
+          return "";
+        }
+      }
       return null;
     }
 
@@ -94,6 +108,7 @@
       else if (_attr==PivVisuPanel.ATT_COEF_VIT) {
         trans_.getParams().setSurfaceCoef((Double)_val);
       }
+      // Les labels ne sont pas modifi\xE9s.
     }
     
   }

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransect.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransect.java	2017-05-22 10:50:47 UTC (rev 9611)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransect.java	2017-05-22 10:52:20 UTC (rev 9612)
@@ -54,6 +54,13 @@
   }
   
   /**
+   * Inverse le transect.
+   */
+  public void invertGeometry() {
+    transect.inverse();
+  }
+  
+  /**
    * Recr\xE9e un transect depuis les r\xE9sultats calcul\xE9s et le transect d'origine. Lors du calcul,
    * les points sont r\xE9align\xE9s. La bathy et le nombre de points n'est pas modifi\xE9e.
    * @param _res Les r\xE9sultats.

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

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

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

Revision: 9611
          http://sourceforge.net/p/fudaa/svn/9611
Author:   bmarchan
Date:     2017-05-22 10:50:47 +0000 (Mon, 22 May 2017)
Log Message:
-----------
Fudaa-LSPIV : Passage a Framework/SNAPSHOT 2.0

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

Modified: trunk/soft/fudaa-lspiv/pom.xml
===================================================================
--- trunk/soft/fudaa-lspiv/pom.xml	2017-05-22 10:49:39 UTC (rev 9610)
+++ trunk/soft/fudaa-lspiv/pom.xml	2017-05-22 10:50:47 UTC (rev 9611)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <properties>
-    <fudaa-framework.version>1.9-SNAPSHOT</fudaa-framework.version>
+    <fudaa-framework.version>2.0-SNAPSHOT</fudaa-framework.version>
     <fudaa-mesh.version>1.9-SNAPSHOT</fudaa-mesh.version>
     <javaCompiler>1.7</javaCompiler>
     <targetJdk>1.7</targetJdk>

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[9610] trunk/framework/ebli-common/src/main/java/org/ fudaa/ebli/geometrie/GrPolyligne.java

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

Revision: 9610
          http://sourceforge.net/p/fudaa/svn/9610
Author:   bmarchan
Date:     2017-05-22 10:49:39 +0000 (Mon, 22 May 2017)
Log Message:
-----------
Add GrPolyligne.inverse()

Modified Paths:
--------------
    trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/geometrie/GrPolyligne.java

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	2017-05-21 20:22:16 UTC (rev 9609)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/geometrie/GrPolyligne.java	2017-05-22 10:49:39 UTC (rev 9610)
@@ -497,6 +497,19 @@
   }
 
   /**
+   * Inverse le sens de parcours de la polyligne.
+   */
+  public final void inverse() {
+    int nb = sommets_.nombre();
+    for (int i=0; i<nb/2; i++) {
+      GrPoint pt1=sommets_.renvoie(i);
+      GrPoint pt2=sommets_.renvoie(nb-1-i);
+      sommets_.remplace(pt2, i);
+      sommets_.remplace(pt1, nb-1-i);
+    }
+  }
+  
+  /**
    * Renvoie la liste de points de <code>_p </code> contenus dans le polygone <code>_polyRef</code>.
    * 
    * @return null si aucun point n'appartient a <code>_polyRef</code>.

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

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

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

Revision: 9609
          http://sourceforge.net/p/fudaa/svn/9609
Author:   deniger
Date:     2017-05-21 20:22:16 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 2.0-SNAPSHOT

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

Modified: trunk/business/fudaa-sig/pom.xml
===================================================================
--- trunk/business/fudaa-sig/pom.xml	2017-05-21 20:21:07 UTC (rev 9608)
+++ trunk/business/fudaa-sig/pom.xml	2017-05-21 20:22:16 UTC (rev 9609)
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <properties>
-    <dodico-h2d.version>1.9</dodico-h2d.version>
+    <dodico-h2d.version>2.0-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.9</version>
+  <version>2.0-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.

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

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

Revision: 9608
          http://sourceforge.net/p/fudaa/svn/9608
Author:   deniger
Date:     2017-05-21 20:21:07 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 2.0-SNAPSHOT

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

Modified: trunk/business/dodico-h2d/io/pom.xml
===================================================================
--- trunk/business/dodico-h2d/io/pom.xml	2017-05-21 20:20:54 UTC (rev 9607)
+++ trunk/business/dodico-h2d/io/pom.xml	2017-05-21 20:21:07 UTC (rev 9608)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.business.dodico-h2d</groupId>
 		<artifactId>dodico-h2d</artifactId>
-		<version>1.9</version>
+		<version>2.0-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.

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

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

Revision: 9607
          http://sourceforge.net/p/fudaa/svn/9607
Author:   deniger
Date:     2017-05-21 20:20:54 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 2.0-SNAPSHOT

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

Modified: trunk/business/dodico-h2d/core/pom.xml
===================================================================
--- trunk/business/dodico-h2d/core/pom.xml	2017-05-21 20:20:25 UTC (rev 9606)
+++ trunk/business/dodico-h2d/core/pom.xml	2017-05-21 20:20:54 UTC (rev 9607)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.business.dodico-h2d</groupId>
 		<artifactId>dodico-h2d</artifactId>
-		<version>1.9</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>h2d-core</artifactId>
 	<name>Core h2d</name>

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

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

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

Revision: 9606
          http://sourceforge.net/p/fudaa/svn/9606
Author:   deniger
Date:     2017-05-21 20:20:25 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 2.0-SNAPSHOT

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

Modified: trunk/business/dodico-h2d/pom.xml
===================================================================
--- trunk/business/dodico-h2d/pom.xml	2017-05-21 20:19:26 UTC (rev 9605)
+++ trunk/business/dodico-h2d/pom.xml	2017-05-21 20:20:25 UTC (rev 9606)
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<properties>
-		<fudaa-ef.version>1.9</fudaa-ef.version>
+		<fudaa-ef.version>2.0-SNAPSHOT</fudaa-ef.version>
 		<projetEncoding>ISO-8859-15</projetEncoding>
 		<!-- la version du compiler -->
 		<javaCompiler>1.7</javaCompiler>
@@ -16,7 +16,7 @@
 	</parent>
 	<groupId>org.fudaa.business.dodico-h2d</groupId>
 	<artifactId>dodico-h2d</artifactId>
-	<version>1.9</version>
+	<version>2.0-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.

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

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

Revision: 9605
          http://sourceforge.net/p/fudaa/svn/9605
Author:   deniger
Date:     2017-05-21 20:19:26 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 2.0-SNAPSHOT

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

Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml	2017-05-21 20:19:16 UTC (rev 9604)
+++ trunk/business/fudaa-ef/core/pom.xml	2017-05-21 20:19:26 UTC (rev 9605)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.business.fudaa-ef</groupId>
     <artifactId>fudaa-ef</artifactId>
-    <version>1.9</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
   <groupId>org.fudaa.business.fudaa-ef</groupId>
   <artifactId>ef-core</artifactId>

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

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

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

Revision: 9604
          http://sourceforge.net/p/fudaa/svn/9604
Author:   deniger
Date:     2017-05-21 20:19:16 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 2.0-SNAPSHOT

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

Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml	2017-05-21 20:18:39 UTC (rev 9603)
+++ trunk/business/fudaa-ef/io/pom.xml	2017-05-21 20:19:16 UTC (rev 9604)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.business.fudaa-ef</groupId>
 		<artifactId>fudaa-ef</artifactId>
-		<version>1.9</version>
+		<version>2.0-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.

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

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

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

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

Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
+++ trunk/business/fudaa-ef/pom.xml	2017-05-21 20:18:39 UTC (rev 9603)
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<properties>
-		<fudaa-framework.version>1.9</fudaa-framework.version>
+		<fudaa-framework.version>2.0-SNAPSHOT</fudaa-framework.version>
 		<projetEncoding>ISO-8859-15</projetEncoding>
 		<!-- la version du compiler -->
 		<javaCompiler>1.7</javaCompiler>
@@ -16,7 +16,7 @@
 	</parent>
 	<groupId>org.fudaa.business.fudaa-ef</groupId>
 	<artifactId>fudaa-ef</artifactId>
-	<version>1.9</version>
+	<version>2.0-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.

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

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

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

Modified Paths:
--------------
    trunk/framework/ctulu-bu/pom.xml
    trunk/framework/ctulu-common/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-3d/pom.xml
    trunk/framework/ebli-common/pom.xml
    trunk/framework/ebli-graphe/pom.xml
    trunk/framework/ebli-graphe-3D/pom.xml
    trunk/framework/ebli-network/pom.xml
    trunk/framework/ebli-visuallibrary/pom.xml
    trunk/framework/fudaa-common/pom.xml
    trunk/framework/fudaa-common-courbe/pom.xml
    trunk/framework/fudaa-common-save/pom.xml
    trunk/framework/fudaa-dico/pom.xml
    trunk/framework/fudaa-dico/server/pom.xml
    trunk/framework/fudaa-dico/ui/pom.xml

Modified: trunk/framework/ctulu-bu/pom.xml
===================================================================
--- trunk/framework/ctulu-bu/pom.xml	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-bu/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-common/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
   <groupId>org.fudaa.framework.ctulu</groupId>
   <artifactId>ctulu-common</artifactId>

Modified: trunk/framework/ctulu-gis/pom.xml
===================================================================
--- trunk/framework/ctulu-gis/pom.xml	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-gis/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9</version>
+    <version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-ui/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9</version>
+    <version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ctulu-video/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/dodico-common/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-1d/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
   <groupId>org.fudaa.framework.ebli</groupId>
   <artifactId>ebli-1d</artifactId>

Modified: trunk/framework/ebli-3d/pom.xml
===================================================================
--- trunk/framework/ebli-3d/pom.xml	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-3d/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-common/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-graphe/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-graphe-3D/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -3,7 +3,7 @@
   <parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-network/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/ebli-visuallibrary/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-common/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9</version>
+    <version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-common-courbe/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-common-save/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-dico/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-dico/server/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 			<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
 		<artifactId>fudaa-dico</artifactId>
-		<version>1.9</version>
+		<version>2.0-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	2017-05-21 20:18:02 UTC (rev 9601)
+++ trunk/framework/fudaa-dico/ui/pom.xml	2017-05-21 20:18:22 UTC (rev 9602)
@@ -4,7 +4,7 @@
 	<parent>
 			<groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
 		<artifactId>fudaa-dico</artifactId>
-		<version>1.9</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dico-ui</artifactId>
 	<name>Dico UI</name>

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

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

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

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

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

Modified: trunk/framework/ctulu-fu/pom.xml
===================================================================
--- trunk/framework/ctulu-fu/pom.xml	2017-05-21 20:17:53 UTC (rev 9600)
+++ trunk/framework/ctulu-fu/pom.xml	2017-05-21 20:18:02 UTC (rev 9601)
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.fudaa.framework</groupId>
 		<artifactId>fudaa-framework</artifactId>
-		<version>1.9</version>
+		<version>2.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.fudaa.framework.ctulu</groupId>
 	<artifactId>ctulu-fu</artifactId>

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[9600] trunk/framework/ebli-2d/pom.xml

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

Revision: 9600
          http://sourceforge.net/p/fudaa/svn/9600
Author:   deniger
Date:     2017-05-21 20:17:53 +0000 (Sun, 21 May 2017)
Log Message:
-----------
version 2.0-SNAPSHOT

Modified Paths:
--------------
    trunk/framework/ebli-2d/pom.xml

Modified: trunk/framework/ebli-2d/pom.xml
===================================================================
--- trunk/framework/ebli-2d/pom.xml	2017-05-21 20:12:36 UTC (rev 9599)
+++ trunk/framework/ebli-2d/pom.xml	2017-05-21 20:17:53 UTC (rev 9600)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.framework</groupId>
     <artifactId>fudaa-framework</artifactId>
-    <version>1.9</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
   <groupId>org.fudaa.framework.ebli</groupId>
   <artifactId>ebli-2d</artifactId>

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

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

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

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

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

Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml	2017-05-21 20:08:20 UTC (rev 9598)
+++ trunk/framework/pom.xml	2017-05-21 20:12:36 UTC (rev 9599)
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.fudaa.framework</groupId>
   <artifactId>fudaa-framework</artifactId>
-  <version>1.9</version>
+  <version>2.0-SNAPSHOT</version>
   <url>http://www.fudaa.fr/sites/devel/fudaa-framework/</url>
   <properties>
     <projetEncoding>ISO-8859-15</projetEncoding>

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