fudaa-svn-commit Mailing List for Fudaa (Page 39)

https://gitlab.com/fudaa

Brought to you by: bmarchan, deniger, gpoissonnier, hadouxad

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

Flat | Threaded

<< < 1 .. 37 38 39 40 41 .. 198 > >> (Page 39 of 198)

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

From: <de...@us...> - 2013-02-14 22:28:45

Revision: 8274
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8274&view=rev
Author:   deniger
Date:     2013-02-14 22:28:35 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
cas ?\195?\160 g?\195?\169rer si titre du calque est null.

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

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java	2013-02-14 22:27:55 UTC (rev 8273)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java	2013-02-14 22:28:35 UTC (rev 8274)
@@ -280,11 +280,11 @@
 
   protected void renameLayer(final BCalque _calque) {
     String title = _calque.getTitle();
-    if(title==null){
-      title=_calque.getName();
+    if (title == null) {
+      title = _calque.getName();
     }
-    if(title==null){
-      title=StringUtils.EMPTY;
+    if (title == null) {
+      title = StringUtils.EMPTY;
     }
     final BuTextField ft = new BuTextField(title);
     ft.setColumns(title.length() + 2);
@@ -636,7 +636,8 @@
   Observable observable_;
 
   void editableChanged() {
-    refresh();
+    final TreeModelEvent ev = new TreeModelEvent(this, new Object[]{calque_});
+    fireTreeModelEvent(ev);
   }
 
   static class SpecialObservable extends Observable {

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:[8272] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/PivImplementation.java

From: <bma...@us...> - 2013-02-14 15:44:26

Revision: 8272
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8272&view=rev
Author:   bmarchan
Date:     2013-02-14 15:44:17 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Chgt version

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	2013-02-14 15:43:35 UTC (rev 8271)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java	2013-02-14 15:44:17 UTC (rev 8272)
@@ -82,7 +82,7 @@
   static {
     isPIV_.name = "LSPIV";
     isPIV_.version = "1.3.2";
-    isPIV_.date = "2013-01-08";
+    isPIV_.date = "2013-02-14";
     isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2013";
     isPIV_.license = "GPL2";
     isPIV_.languages = "en,fr";

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:[8271] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv

From: <bma...@us...> - 2013-02-14 15:43:46

Revision: 8271
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8271&view=rev
Author:   bmarchan
Date:     2013-02-14 15:43:35 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Add : Relecture transect projete

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.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/PivVelResultsLayer.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/PivTransect.java

Added Paths:
-----------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPFileFormat.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPReader.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2013-02-14 15:41:04 UTC (rev 8270)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -221,7 +221,7 @@
     // Layer des vitesses resultantes.
     cqVelResults = new PivVelResultsLayer();
     cqVelResults.setTitle(PivResource.getS("Vit. surf. moy."));
-    cqVelResults.setLongTitle(PivResource.getS("Vitesse de surface moyenn\xE9e"));
+    cqVelResults.setLongTitle(PivResource.getS("Vitesses de surface moyenn\xE9es"));
     cqVelResults.setTitleModifiable(true);
     cqVelResults.setName("cqRealVel");
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
@@ -237,7 +237,7 @@
     // Layer des vitesses instantan\xE9es resultantes.
     cqInstantVelResults_ = new PivVelResultsLayer();
     cqInstantVelResults_.setTitle(PivResource.getS("Vit. surf. inst."));
-    cqInstantVelResults_.setLongTitle(PivResource.getS("Vitesse de surface instantan\xE9e"));
+    cqInstantVelResults_.setLongTitle(PivResource.getS("Vitesses de surface instantan\xE9es"));
     cqInstantVelResults_.setTitleModifiable(true);
     cqInstantVelResults_.setName("cqInstantVel");
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
@@ -258,7 +258,7 @@
       }
     };
     cqFlowResults.setTitle(PivResource.getS("Vit. moy. prof."));
-    cqFlowResults.setLongTitle(PivResource.getS("Vitesse moyenn\xE9e sur la profondeur"));
+    cqFlowResults.setLongTitle(PivResource.getS("Vitesses moyenn\xE9es sur la profondeur"));
     cqFlowResults.setTitleModifiable(true);
     cqFlowResults.setName("cqRealFlow");
     // Donne la couleur des fl\xE8ches si pas de palette de couleurs.
@@ -285,7 +285,7 @@
     // Layer des iso couleurs instantan\xE9es
     cqInstantIso_ = new PivResultsLayer();
     cqInstantIso_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.LIGHT_GRAY));
-    cqInstantIso_.setTitle("R\xE9sultats instantan\xE9s");
+    cqInstantIso_.setTitle(PivResource.getS("R\xE9sultats instantan\xE9s"));
     cqInstantIso_.setName("cqInstantResults");
     cqInstantIso_.setDestructible(false);
     cqInstantIso_.setVisible(false);
@@ -293,7 +293,7 @@
     // Layer des iso couleurs instantan\xE9es
     cqAverageIso_ = new PivResultsLayer();
     cqAverageIso_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.LIGHT_GRAY));
-    cqAverageIso_.setTitle("R\xE9sultats moyenn\xE9s");
+    cqAverageIso_.setTitle(PivResource.getS("R\xE9sultats moyenn\xE9s"));
     cqAverageIso_.setName("cqAveResults");
     cqAverageIso_.setDestructible(false);
     cqAverageIso_.setVisible(false);
@@ -584,21 +584,28 @@
     else if("averageResults".equals(_prop)) {
       if (_prj.getAverageResults()!=null) {
         mdlAverageResults=new PivResultsModel(new PivResultsI[]{prj_.getAverageResults()},null);
-        cqAverageIso_.setModele(mdlAverageResults);
-        
         mdlVelResults=new PivVelResultsModel(new PivResultsI[]{prj_.getAverageResults()});
-        cqVelResults.setModele(mdlVelResults);
       }
+      else {
+        mdlAverageResults=null;
+        mdlVelResults=null;
+      }
+      cqAverageIso_.setModele(mdlAverageResults);
+      cqVelResults.setModele(mdlVelResults);
+      
       majTools();
     }
     else if ("instantResults".equals(_prop)) {
       if (_prj.getInstantResults()!=null) {
         mdlInstantResults=new PivResultsModel(prj_.getInstantResults(),null);
-        cqInstantIso_.setModele(mdlInstantResults);
-        
         mdlInstantVelResults=new PivVelResultsModel(prj_.getInstantResults());
-        cqInstantVelResults_.setModele(mdlInstantVelResults);
       }
+      else {
+        mdlInstantResults=null;
+        mdlInstantVelResults=null;
+      }
+      cqInstantIso_.setModele(mdlInstantResults);
+      cqInstantVelResults_.setModele(mdlInstantVelResults);
       
       majTools();
     }

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java	2013-02-14 15:41:04 UTC (rev 8270)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -11,6 +11,7 @@
 import java.io.File;
 import javax.swing.SwingUtilities;
 import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
 import org.fudaa.ctulu.gui.CtuluDialog;
 import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
 import org.fudaa.ebli.commun.EbliActionSimple;
@@ -22,7 +23,10 @@
 import org.fudaa.fudaa.piv.PivProgressionPanel;
 import org.fudaa.fudaa.piv.PivResource;
 import org.fudaa.fudaa.piv.PivVisuPanel;
+import org.fudaa.fudaa.piv.io.PivBathyPFileFormat;
+import org.fudaa.fudaa.piv.io.PivDischargeFileFormat;
 import org.fudaa.fudaa.piv.io.PivExeLauncher;
+import org.fudaa.fudaa.piv.metier.PivFlowResults;
 import org.fudaa.fudaa.piv.metier.PivOrthoParameters;
 import org.fudaa.fudaa.piv.metier.PivTransect;
 
@@ -98,6 +102,14 @@
             pnInfo.afficheModale(impl.getFrame(), PivResource.getS("Calcul termin\xE9"), CtuluDialog.OK_OPTION);
             impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
             impl.get2dFrame().getVisuPanel().setFlowLayerVisible(true);
+            
+            if (impl.question(
+                PivResource.getS("Modification du transect initial"),
+                PivResource.getS("Souhaitez vous remplacer le transect initial par celui calcul\xE9 ?"))) {
+              
+              PivTransect trans=impl.getCurrentProject().loadBathyPFile(null);
+              impl.getCurrentProject().setTransect(trans);
+            }
           }
         });
         

Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPFileFormat.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPFileFormat.java	                        (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPFileFormat.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -0,0 +1,51 @@
+package org.fudaa.fudaa.piv.io;
+
+import org.fudaa.ctulu.fileformat.FileFormatUnique;
+import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
+import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
+import org.fudaa.fudaa.piv.PivResource;
+
+/**
+ * La classe d\xE9crivant le format d'un fichier bathy_p.dat contenant
+ * un transect.
+ *
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id$
+ */
+public class PivBathyPFileFormat extends FileFormatUnique {
+
+  private PivBathyPFileFormat() {
+    super(1);
+    nom_ = PivResource.getS("PIV transect");
+    description_ = PivResource.getS("Fichier contenant un transect");
+    extensions_=new String[]{"dat"};
+  }
+  static final PivBathyPFileFormat INSTANCE = new PivBathyPFileFormat();
+
+  /**
+   * Retourne le singleton pour instancier un reader ou un writer.
+   * @return Le singleton
+   */
+  public static PivBathyPFileFormat getInstance() {
+    return INSTANCE;
+  }
+
+  /**
+   * Cr\xE9ation d'un reader.
+   * @return Le reader
+   */
+  @Override
+  public FileReadOperationAbstract createReader() {
+    return new PivBathyPReader();
+  }
+
+  /**
+   * Cr\xE9ation d'un writer.
+   * @return Le writer
+   */
+  @Override
+  public FileWriteOperationAbstract createWriter() {
+    return null;
+  }
+
+}


Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPFileFormat.java
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPReader.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPReader.java	                        (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPReader.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -0,0 +1,121 @@
+/**
+ * @creation 2002-11-21
+ * @modification $Date: 2007/05/04 13:47:27 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.piv.io;
+
+import java.io.EOFException;
+import java.io.File;
+import java.io.IOException;
+
+import org.fudaa.ctulu.CtuluActivity;
+import org.fudaa.dodico.fortran.FileOpReadCharSimpleAbstract;
+import org.fudaa.ebli.geometrie.GrPolyligne;
+import org.fudaa.fudaa.piv.PivResource;
+import org.fudaa.fudaa.piv.metier.PivTransect;
+
+/**
+ * Un lecteur pour les fichiers de bathy_p.dat.
+ * 
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id$
+ */
+public class PivBathyPReader extends FileOpReadCharSimpleAbstract implements CtuluActivity {
+
+  /** Drapeau d'interruption */
+  boolean bstop_;
+  /** Nb d'octets du fichier a lire pour stat sur pourcentage effectu\xE9 */
+  int nbOctets;
+
+  /**
+   * Constructeur.
+   */
+  public PivBathyPReader() {
+  }
+
+  /**
+   * Lit les points et retourne le transect.
+   * @return Le transect
+   */
+  @Override
+  protected PivTransect internalRead() {
+    return readParams();
+  }
+
+  @Override
+  protected void processFile(final File _f) {
+    nbOctets = (int) _f.length();
+  }
+
+  /**
+   * Utilise FortranReader ( donc un buffer).
+   * 
+   * @return les infos non bloquantes.
+   */
+  private synchronized PivTransect readParams() {
+    PivTransect ret=null;
+    GrPolyligne pl=new GrPolyligne();
+
+    if (super.in_ == null) {
+      analyze_.addErrorFromFile(PivResource.getS("Flux d'entr\xE9e non trouv\xE9"), 0);
+      return null;
+    }
+
+    try {
+      int lu=0;
+      boolean afficheAvance = false;
+      if ((progress_ != null) && (nbOctets > 0)) {
+        afficheAvance = true;
+        progress_.setProgression(0);
+      }
+      int pourcentageEnCours = 0;
+
+      in_.setJumpBlankLine(true);
+
+      // On saute l'entete (6 lignes)
+      for (int i=0; i<6; i++) {
+        in_.readLine();
+      }
+      
+      // Boucle jusque fin de fichier. Exception EOF si fin.
+      while (true) {
+        in_.readFields();
+        pl.sommets_.ajoute(in_.doubleField(1),in_.doubleField(2),in_.doubleField(3));
+        lu+=26; // Si le formattage en fortran
+
+        if ((afficheAvance) && ((lu * 100 / nbOctets) >= (pourcentageEnCours + 20))) {
+          pourcentageEnCours += 20;
+          progress_.setProgression(pourcentageEnCours);
+        }
+      }
+    }
+    // Sortie normale
+    catch (final EOFException e) {
+      ret=new PivTransect();
+      ret.setStraight(pl);
+    }
+    catch (final IOException e) {
+      analyze_.addErrorFromFile(PivResource.getS("Une erreur de lecture s'est produite"), in_.getLineNumber());
+    }
+    catch (final NumberFormatException e) {
+      analyze_.addErrorFromFile(PivResource.getS("Une erreur de lecture s'est produite"), in_.getLineNumber());
+    }
+    finally {
+      if (progress_ != null) {
+        progress_.setProgression(100);
+      }
+      return ret;
+    }
+  }
+
+  /**
+   * Interruption asynchrone de l'activit\xE9 de lecture.
+   */
+  @Override
+  public void stop() {
+    bstop_ = true;
+  }
+}


Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivBathyPReader.java
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java	2013-02-14 15:41:04 UTC (rev 8270)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -370,8 +370,10 @@
     // On supprime le fichier des vitesses moyennes
     File resFile=new File(prjOutputs, faverage);
     resFile.delete();
-    
-    _prj.setAverageResults(null);
+    // Et celui des scalaires moyens
+    faverage="average_scal.out";
+    File resScalFile=new File(prjOutputs,faverage);
+    resScalFile.delete();
 
     try {
       // Sauvegarde des donn\xE9es du projet.
@@ -449,6 +451,11 @@
     finally {
       new File(prjImgOut, "image1_transf.pgm").delete();
       new File(prjImgOut, "image2_transf.pgm").delete();
+      
+      if (_ana.containsErrorOrFatalError()) {
+        _prj.setInstantResults(null);
+        _prj.setAverageResults(null);
+      }
     }
     
     return true;
@@ -903,7 +910,7 @@
 
       FuLog.trace(PivResource.getS("Transformation ok."));
       
-      desc=PivResource.getS("Calcul des r\xE9sultats instantan\xE9es...");
+      desc=PivResource.getS("Calcul des r\xE9sultats instantan\xE9s...");
       FuLog.trace(desc);
       if (_task!=null) {
         _task.setDesc(desc);
@@ -934,6 +941,7 @@
     }
     finally {
       _prj.setInstantResults(res);
+      _prj.setAverageResults(null);
     }
 
     return true;

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	2013-02-14 15:41:04 UTC (rev 8270)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -66,7 +66,7 @@
 
   @Override
   public void setModele(ZModelePolygone _modele) {
-    if (!(_modele instanceof PivResultsModel))
+    if (_modele!=null && !(_modele instanceof PivResultsModel))
       throw new IllegalArgumentException("Bad type argument");
     
     if (modele_!=null) {
@@ -78,11 +78,16 @@
     }
     initPalette();
     
-    if (isoPainter==null) {
-      isoPainter = new MvIsoLayerQuickPainter(modele());
+    if (_modele==null) {
+      isoPainter=null;
     }
     else {
-      isoPainter.setModel(modele());
+      if (isoPainter==null) {
+        isoPainter = new MvIsoLayerQuickPainter(modele());
+      }
+      else {
+        isoPainter.setModel(modele());
+      }
     }
   }
 
@@ -227,7 +232,7 @@
     CtuluRange range = new CtuluRange();
     this.getRange(range);
     palette.initPlages(10, range.min_, range.max_);
-    palette.setSousTitre(modele().getCurrentVar().getName());
+    palette.setSousTitre(modele()==null ? null:modele().getCurrentVar().getName());
     this.setPaletteCouleurPlages(palette);
   }
 
@@ -237,7 +242,9 @@
     
     res.put(PivResultatsLayerConfigure.ISO_LINE_PAINTED, isTraceIsoLine());
     res.put(PivResultatsLayerConfigure.ISO_SURFACE_PAINTED, isTraceIsoSurface());
-    res.put("iso.variable", modele()==null ? "":modele().getCurrentVar().toString());
+    if (modele()!=null)
+      res.put("iso.variable", modele().getCurrentVar().toString());
+    
     return res;
   }
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivVelResultsLayer.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivVelResultsLayer.java	2013-02-14 15:41:04 UTC (rev 8270)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivVelResultsLayer.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -3,6 +3,9 @@
 import org.fudaa.ctulu.CtuluRange;
 import org.fudaa.ebli.calque.ZCalqueFleche;
 import org.fudaa.ebli.calque.ZModeleSegment;
+import org.fudaa.ebli.palette.BPalettePlage;
+import org.fudaa.ebli.palette.BPalettePlageAbstract;
+import org.fudaa.ebli.palette.BPalettePlageInterface;
 
 /**
  * Un calque pour le trac\xE9 des vitesses.
@@ -75,11 +78,26 @@
 
   @Override
   public void setModele(ZModeleSegment _modele) {
-    if (!(_modele instanceof PivVelResultsModel))
+    if (_modele!=null && !(_modele instanceof PivVelResultsModel))
       throw new IllegalArgumentException("Bad type argument");
     
     super.setModele(_modele);
+
+    initPalette();
   }
   
-  
+  /**
+   * Initialisation de la palette en fonction des bornes min/max des valeurs pour tous les
+   * pas de temps.
+   */
+  private void initPalette() {
+    BPalettePlage palette=(BPalettePlage)getPaletteCouleur();
+    // Pas de plages : On consid\xE8re que la palette n'est pas utilis\xE9e.
+    if (palette==null || palette.getNbPlages()==0) return;
+    
+    CtuluRange range = new CtuluRange();
+    this.getRange(range);
+    palette.initPlages(10, range.min_, range.max_);
+    this.setPaletteCouleurPlages(palette);
+  }
 }

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	2013-02-14 15:41:04 UTC (rev 8270)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -35,6 +35,7 @@
 import org.fudaa.fudaa.piv.io.PivAverageScalFileFormat;
 import org.fudaa.fudaa.piv.io.PivAverageVelFileFormat;
 import org.fudaa.fudaa.piv.io.PivBathyFileFormat;
+import org.fudaa.fudaa.piv.io.PivBathyPFileFormat;
 import org.fudaa.fudaa.piv.io.PivDischargeFileFormat;
 import org.fudaa.fudaa.piv.io.PivGRPFileFormat;
 import org.fudaa.fudaa.piv.io.PivGlobalXmlFileFormat;
@@ -1043,6 +1044,18 @@
   }
 
   /**
+   * Charge un fichier bathy_p.dat
+   * @param _prog L'interface de progression.
+   * @return Le transect lu.
+   * TODO devrait etre d\xE9l\xE9gu\xE9 dans une classe de lecture/ecriture des donn\xE9es.
+   */
+  public PivTransect loadBathyPFile(ProgressionInterface _prog) {
+    File fbathyp=new File(getOutputDir(),"bathy_p.dat");
+    FileReadOperationAbstract reader=PivBathyPFileFormat.getInstance().createReader();
+    CtuluIOOperationSynthese ret=reader.read(fbathyp, _prog);
+    return (PivTransect)ret.getSource();
+  }
+  /**
    * Sauve le projet sur le fichier projet. Les infos sont sauv\xE9es sur le
    * r\xE9pertoire temporaire, puis zip\xE9es.
    * @param _prjFile Le fichier de sauvegarde.

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	2013-02-14 15:41:04 UTC (rev 8270)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransect.java	2013-02-14 15:43:35 UTC (rev 8271)
@@ -28,4 +28,23 @@
   public void setStraight(GrPolyligne _transect) {
     this.transect = _transect;
   }
+  
+  /**
+   * 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.
+   * @param _trans Le transect original, avec points non align\xE9s.
+   * @return Le transect recalcul\xE9.
+   */
+  public static PivTransect buildFromAlignResults(PivFlowResults _res, PivTransect _trans) {
+    PivTransect trans=new PivTransect();
+    
+    GrPolyligne pl=new GrPolyligne();
+    for (int i=0; i<_res.getNombre(); i++) {
+      pl.sommets_.ajoute(_res.getX(i), _res.getY(i), _trans.getStraight().sommet(i).z_);
+    }
+    trans.transect=pl;
+    
+    return trans;
+  }
 }

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:[8270] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/action/PivComputeLaunchAction.java

From: <bma...@us...> - 2013-02-14 15:41:12

Revision: 8270
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8270&view=rev
Author:   bmarchan
Date:     2013-02-14 15:41:04 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Fix : Blocage IHM

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

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java	2013-02-14 15:39:58 UTC (rev 8269)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java	2013-02-14 15:41:04 UTC (rev 8270)
@@ -9,6 +9,9 @@
 
 import java.awt.event.ActionEvent;
 import java.io.File;
+
+import javax.swing.SwingUtilities;
+
 import org.fudaa.ctulu.CtuluAnalyze;
 import org.fudaa.ctulu.gui.CtuluDialog;
 import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
@@ -18,6 +21,7 @@
 import org.fudaa.fudaa.piv.PivPreferences;
 import org.fudaa.fudaa.piv.PivProgressionPanel;
 import org.fudaa.fudaa.piv.PivResource;
+import org.fudaa.fudaa.piv.PivVisuPanel;
 import org.fudaa.fudaa.piv.io.PivExeLauncher;
 
 /**
@@ -81,9 +85,15 @@
         finally {
           diProgress_.dispose();
         }
-
-        impl.message(PivResource.getS("Calcul termin\xE9"), PivResource.getS("Le calcul s'est termin\xE9 avec succ\xE8s"), false);
-        impl.get2dFrame().getVisuPanel().setVelocitiesLayerVisible(false);
+        
+        // Lanc\xE9 \xE0 la fin, car l'interface se bloque si on ne le fait pas.
+        // Probl\xE8me de thread swing probablement...
+        SwingUtilities.invokeLater(new Runnable() {
+          public void run() {
+            impl.message(PivResource.getS("Calcul termin\xE9"), PivResource.getS("Le calcul s'est termin\xE9 avec succ\xE8s"), false);
+            impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
+          }
+        });
       }
     };
 

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:[8269] trunk/soft/fudaa-lspiv/src/main/resources/org/ fudaa/fudaa/piv/piv_en.fr_txt

From: <bma...@us...> - 2013-02-14 15:40:08

Revision: 8269
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8269&view=rev
Author:   bmarchan
Date:     2013-02-14 15:39:58 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Mise a jour messages anglais

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt

Modified: trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt	2013-02-14 13:56:36 UTC (rev 8268)
+++ trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt	2013-02-14 15:39:58 UTC (rev 8269)
@@ -1,5 +1,6 @@
 Affiche l'image source s\xE9lectionn\xE9e=Show selected source image
 Affiche l'image s\xE9lectionn\xE9e=Show selected image
+Affiche les r\xE9sultats pour la variable s\xE9lectionn\xE9e=Show results for selected variable
 Affiche les vitesses instantan\xE9es s\xE9lectionn\xE9es=Show selected instantaneous velocities
 Aire d'interrogation (pix)=Interrogation area (pix)
 Aire de recherche (pix)=Searching area (pix)
@@ -11,10 +12,12 @@
 Au moins un point extremit\xE9 du transect a un Z inf\xE9rieur au niveau d'eau=At least one edge of the transect is lower than the water level
 Aucun point de r\xE9f\xE9rence au sol n'a \xE9t\xE9 d\xE9fini=No ground reference point was defined
 Cache des images automatique=Automatic images cache
-Calcul des champs de vitesses instantan\xE9es=Calculation of the instantaneous velocity fields
 Calcul des coefficients ok=Calculation of the coefficients ok
 Calcul des coefficients=Calculation of the coefficients
-Calcul des vitesses instantan\xE9es=Calculation of the instantaneous velocities
+Calcul des r\xE9sultats instantan\xE9s=Calculation of the instantaneous results
+Calcul des r\xE9sultats moyens=Calculation of the average results
+Calcul des vitesses moyennes ok=Calculation of the average velocities ok
+Calcul des vitesses moyennes=Calculation of the average velocities
 Calcul du d\xE9bit ok=Calculation of the discharge ok
 Calcul du d\xE9bit=Calculation of the discharge
 Calcul interrompu=Calculation interrupted
@@ -24,8 +27,11 @@
 Cette cr\xE9ation sera r\xE9alis\xE9e apr\xE8s chaque op\xE9ration\n de s\xE9lection d'image ou transformation, et d\xE9s maintenant.\n\nSouhaitez vous continuer ?=This creation will be performed following each\nimage selection or transformation operations, and now.\n\nDo you want to continue ?
 Chargement du projet=Opening project
 Coefficient de vitesse=Velocity coefficient
+Construction des noeuds=Nodes construction
+Construction des \xE9l\xE9ments=Elements construction
 Contour de grille=Grid outline
 Contour grille=Grid outline
+Correspondance impossible des indices de noeuds lors de la creation du maillage=Impossible connection of nodes indices while creating the mesh
 Corr\xE9lation=Correlation
 Cr\xE9ation automatique des images cache=Images cache automatic creation
 Cr\xE9ation des caches images sources=Creating source images caches
@@ -33,7 +39,7 @@
 Cr\xE9ation des caches images=Creating images caches
 Dans le projet=In project
 Des points existent d\xE9j\xE0. Voulez-vous les remplacer ?=Points already exist. Do you want to replace them?
-Des vitesses instantan\xE9es doivent exister=Instantaneous velocities must exist
+Des r\xE9sultats instantan\xE9s doivent exister=Instantaneous results must exist
 Distance d'extrapolation=Extrapolation range
 D\xE9bit total (m\xB3/s)=Total discharge (m\xB3/s)
 D\xE9finir=Define
@@ -45,11 +51,12 @@
 Editer=Edit
 Erreur d'analyse du couple d'images {0},{1}\:\n=Error while analysing image pair {0},{1}\:\n
 Erreur de calcul des coefficients \:\n=Error while calculating the coefficients\:\n
+Erreur de calcul des r\xE9sultats instantan\xE9s\:\n=Error while calculating instantaneous results\:\n
+Erreur de calcul des r\xE9sultats moyens\:\n=Error while calculating average results\:\n
+Erreur de calcul des vitesses moyennes\:\n=Error while calculating average velocities\:\n
 Erreur de calcul du d\xE9bit\:\n=Error while calculating the discharge\:\n
 Erreur de filtrage des vitesses\:\n=Error while filtering the velocities\:\n
-Erreur de moyennation des vitesses\:\n=Error while averaging the velocities\:\n
 Erreur de reconditionnement du transect\:\n=Error while repacking the transect\:\n
-Erreur de reconditionnement\:\n=Repack error\:\n
 Erreur de transformation de l'image {0}\:\n=Error while picture {0} transformation\:\n
 Erreur de transformation des vitesses instantan\xE9es\:\n=Error while instantaneous velocities transformation\:\n
 Erreur de v\xE9rification de l'orthorectification\:\n=Error while checking orthorectification\:\n
@@ -68,6 +75,8 @@
 Fichier contenant les param\xE8tres de calcul=File containing the calculation parameters
 Fichier contenant les points d'orthorectification=File containing the orthorectification points
 Fichier contenant les points de grille=File containing the grid points
+Fichier contenant les r\xE9sultats instantan\xE9s r\xE9els=File containing real instantaneous results
+Fichier contenant les r\xE9sultats moyenn\xE9s calcul\xE9es=File containing average results
 Fichier contenant les vitesses calcul\xE9es=File containing the calculated velocities
 Fichier contenant les vitesses instantan\xE9es r\xE9elles=File containing real instantaneous velocities
 Fichier contenant un transect=File containing a transect
@@ -78,7 +87,7 @@
 Filtrage des vitesses=Velocity filtering
 Filtrage interrompu=Filtering interrupted
 Filtrage ok=Filtering ok
-Filtrage/moyennation des vitesses instantan\xE9es=Filtering/averaging of instantaneous velocities
+Filtrage/moyenne des r\xE9sultats instantan\xE9s=Filtering/averaging of instantaneous results
 Fin de saisie=Input finished
 Flux d'entr\xE9e non trouv\xE9=Input flux not found
 Format de fichier invalide \: Format GRP attendu=Wrong file format \: GRP format expected
@@ -101,6 +110,7 @@
 Interruption en cours. Merci de patienter=Interruption in progress. Please wait
 Intervalle de temps (s)=Time step (s)
 Intervalle de temps=Time step
+Isolignes / Isosurfaces=Isolines / Isosurfaces
 LSPIV=LSPIV
 La biblioth\xE8que JAI Image I/O n'est probablement pas install\xE9e.\nElle doit l'\xEAtre dans le r\xE9pertoire des extensions Java.\n\nL'application ne fonctionnera pas correctement=The JAI Image I/O library is probably not installed.\nIt must be installed in the Java extensions directory.\n\nThe application will not work properly
 La cr\xE9ation/mise \xE0 jour des caches de toutes les images peut prendre\n plusieurs minutes=Caches creation/update for all images can take several\nminutes
@@ -120,8 +130,8 @@
 Le projet doit contenir au moins 1 image transform\xE9e=The project must contain at least 1 transformed image
 Le projet doit contenir au moins 2 images transform\xE9es=The project must contain at least 2 transformed images
 Le projet doit \xEAtre cr\xE9\xE9=The project must be created
-Le projet ne contient aucun champ de vitesses instantan\xE9es=The project does not contain any instantaneous velocity field
 Le projet ne contient aucune image \xE0 transformer=The project does not contain any image to be transformed
+Le projet ne contient aucune valeur de r\xE9sultats instantan\xE9s=The project does not contain any instantaneous value results
 Le projet ne contient pas de r\xE9sultats moyenn\xE9s=The project does not contain averaged results
 Le r\xE9pertoire des ex\xE9cutables n'a pas encore \xE9t\xE9 pr\xE9cis\xE9 ou n'est pas valide=The executable file directory has not been specified yet or is not valid
 Le transect n'a pas \xE9t\xE9 d\xE9fini=The transect was not defined
@@ -148,10 +158,8 @@
 Min vitesse transversale=Min transverse velocity
 Modification des points de r\xE9f\xE9rence=Modification of the reference points
 Modification du contour de grille=Modification of the grid outline
+Modification du transect initial=Modification of the initial transect
 Modification du transect=Modification of the transect
-Moyennation des vitesses=Averaging velocities
-Moyennation interrompue=Averaging interrupted
-Moyennation ok=Averaging ok
 Niveau d'eau (m)=Water level (m)
 Nombre de points sur les segments 1-2/3-4=Number of points in segments 1-2/3-4
 Nombre de points sur les segments 2-3/4-1=Number of points in segments 2-3/4-1
@@ -159,10 +167,12 @@
 N\xB0=#
 Orthorectification=Orthorectification
 Ouverture d'un projet=Opening a project
+PIV average results=PIV average results
 PIV average velocities=PIV average velocities
 PIV discharge=PIV discharge
 PIV global data=PIV global data
 PIV grid=PIV grid
+PIV instant real results=PIV instant real results
 PIV instant real velocities=PIV instant real velocities
 PIV ortho params=PIV ortho params
 PIV params=PIV params
@@ -199,6 +209,8 @@
 R\xE9pertoire contenant les executables=Directory containing the executable files
 R\xE9solution (m/pix)=Resolution (m/pix)
 R\xE9sultat \: {0}=Result \: {0}
+R\xE9sultats instantan\xE9s=Instantaneous results
+R\xE9sultats moyenn\xE9s=Average results
 R\xE9sultats=Results
 R\xE9sultats\: point n\xB0=Results\: point #
 SA en bleu=SA in blue
@@ -209,6 +221,7 @@
 Sip=Sip
 Sjm=Sjm
 Sjp=Sjp
+Souhaitez vous remplacer le transect initial par celui calcul\xE9 ?=Would you replace initial transect by that calculated ?
 Stop=Stop
 S\xE9lection d'un fichier GRP=Selection of the GRP file
 S\xE9lection d'un fichier de grille=Selection of the grid file
@@ -220,6 +233,8 @@
 Taille de l'aire\: Doit \xEAtre un entier positif et pair=Area size\: Must be an even positive integer
 Terminer la saisie des points et valider=End input of the points and validate
 Tous droits r\xE9serv\xE9s=All rights reserved
+Tracer des isolignes=Isolines drawing
+Tracer des isosurfaces=Isosurfaces drawing
 Traitement des images sources=Sources images processing
 Transect=Transect
 Transformation de l'image {0} sur {1}=Transformation of image {0} out of {1}
@@ -229,6 +244,7 @@
 Transformation interrompue=Transformation interrupted
 Transformation ok=Transformation ok
 Transformer les images=Transform the images
+Triangulation=Meshing
 Un seul fichier projet est autoris\xE9 pour le transfert=Only one project file is authorized during transfer
 Un transect doit \xEAtre d\xE9fini et des r\xE9sultats moyenn\xE9s doivent exister=A transect must be specified and averaged results must exist
 Un transect existe d\xE9j\xE0. Voulez-vous le remplacer ?=A transect already exists. Do you want to replace it?
@@ -238,12 +254,13 @@
 Verification interrompue=Verification interrupted
 Vit. instantan\xE9es=Instantaneous vel.
 Vit. instantan\xE9es\: point n\xB0=Instantaneous vel.\: point n\xB0
-Vit. moyennes sur vert=Depth-average vel
-Vit. surf. instantan\xE9es=Instantaneous surf. vel.
-Vit. surf. moyennes=Average surf. vel.
-Vitesse X=X velocity
-Vitesse Y=Y velocity
+Vit. moy. prof=Depth-average vel
+Vit. surf. inst=Instant. surf. vel
+Vit. surf. moy=Average surf. vel.
 Vitesse moyenne sur la section (m/s)=Section-averaged velocity (m/s)
+Vitesses de surface instantan\xE9es=Instantaneous surface velocities
+Vitesses de surface moyenn\xE9es=Average surface velocities
+Vitesses moyenn\xE9es sur la profondeur=Depth-average velocities
 Voir les vitesses moyennes de surface=Show average surface velocities
 Voir les vitesses moyennes sur la verticale=Show depth-averaged velocities
 Voulez-vous au pr\xE9alable modifier le contour de grille ?=Do you want to modify the grid outline first?

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:[8268] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque/ZCalqueFleche.java

From: <bma...@us...> - 2013-02-14 13:56:48

Revision: 8268
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8268&view=rev
Author:   bmarchan
Date:     2013-02-14 13:56:36 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Calque fleche : Acceptation de modele null

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

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFleche.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFleche.java	2013-02-14 13:55:29 UTC (rev 8267)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueFleche.java	2013-02-14 13:56:36 UTC (rev 8268)
@@ -241,7 +241,7 @@
 
   @Override
   public void setModele(ZModeleSegment _s) {
-    if (_s instanceof ZModeleFleche)
+    if (_s==null || _s instanceof ZModeleFleche)
       setFlecheModele((ZModeleFleche) _s);
     else {
       FuLog.error(new Throwable("ZmodeleFleche is expected"));

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:[8267] trunk/framework/ctulu-fu/src/main/java/com/memoire /fu/FuLog.java

From: <bma...@us...> - 2013-02-14 13:55:41

Revision: 8267
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8267&view=rev
Author:   bmarchan
Date:     2013-02-14 13:55:29 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Fix : Remise en sortie console des messages FuLog.

Modified Paths:
--------------
    trunk/framework/ctulu-fu/src/main/java/com/memoire/fu/FuLog.java

Modified: trunk/framework/ctulu-fu/src/main/java/com/memoire/fu/FuLog.java
===================================================================
--- trunk/framework/ctulu-fu/src/main/java/com/memoire/fu/FuLog.java	2013-02-14 12:07:15 UTC (rev 8266)
+++ trunk/framework/ctulu-fu/src/main/java/com/memoire/fu/FuLog.java	2013-02-14 13:55:29 UTC (rev 8267)
@@ -349,6 +349,7 @@
               }
             }
 
+            System.out.println(sb.toString());
             if (LOGSTREAM != null) {
               LOGSTREAM.println(sb.toString());
             }

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:[8266] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque

From: <de...@us...> - 2013-02-14 12:07:25

Revision: 8266
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8266&view=rev
Author:   deniger
Date:     2013-02-14 12:07:15 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
cas ?\195?\160 g?\195?\169rer si titre du calque est null.

Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BGroupeCalque.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java	2013-02-13 15:38:28 UTC (rev 8265)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalqueModel.java	2013-02-14 12:07:15 UTC (rev 8266)
@@ -34,6 +34,7 @@
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
+import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluLibArray;
 import org.fudaa.ctulu.CtuluResource;
@@ -278,7 +279,13 @@
   }
 
   protected void renameLayer(final BCalque _calque) {
-    final String title = _calque.getTitle();
+    String title = _calque.getTitle();
+    if(title==null){
+      title=_calque.getName();
+    }
+    if(title==null){
+      title=StringUtils.EMPTY;
+    }
     final BuTextField ft = new BuTextField(title);
     ft.setColumns(title.length() + 2);
     final CtuluDialogPanel pn = new CtuluDialogPanel();

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BGroupeCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BGroupeCalque.java	2013-02-13 15:38:28 UTC (rev 8265)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BGroupeCalque.java	2013-02-14 12:07:15 UTC (rev 8266)
@@ -269,10 +269,10 @@
   private static String findUniqueName(final String _pref, final BCalque _parent, final int _idx) {
     final BCalque[] cqs = _parent.getCalques();
     final String defaultName=buildName(_pref, _idx);
+    if (cqs == null || cqs.length == 0) { return defaultName; }
 //    final String defaultName = _pref + '_' + CtuluLibString.getString(_idx);
 
     // Aucun calque trouv\xE9 avec ce nom.
-    if (cqs == null || cqs.length == 0) { return defaultName; }
     final String[] cqNames = new String[cqs.length];
     final int nb = cqNames.length;
     boolean found = false;

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8265] trunk/soft/fudaa-crue/ui-emh/src/main/java/org/ fudaa/fudaa/crue/emh/EMHTreePanel.java

From: <de...@us...> - 2013-02-13 15:38:35

Revision: 8265
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8265&view=rev
Author:   deniger
Date:     2013-02-13 15:38:28 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
CRUE-411

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/EMHTreePanel.java

Modified: trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/EMHTreePanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/EMHTreePanel.java	2013-02-08 10:47:13 UTC (rev 8264)
+++ trunk/soft/fudaa-crue/ui-emh/src/main/java/org/fudaa/fudaa/crue/emh/EMHTreePanel.java	2013-02-13 15:38:28 UTC (rev 8265)
@@ -17,7 +17,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.swing.AbstractListModel;
 import javax.swing.BorderFactory;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -274,7 +273,6 @@
       this.properties = properties;
       fmtPdt = properties.getFormatter("pdt", DecimalFormatEpsilonEnum.COMPARISON);
       keys.addAll(loi.getResultatKeys());
-      Collections.sort(keys);
     }
 
     @Override
@@ -442,30 +440,8 @@
 
   }
 
-  @SuppressWarnings("serial")
-  private class PasDeTempsListModel extends AbstractListModel {
+ 
 
-    final Crue9ResultatCalculPasDeTemps pdt;
-
-    /**
-     * @param pdt
-     */
-    public PasDeTempsListModel(final Crue9ResultatCalculPasDeTemps pdt) {
-      super();
-      this.pdt = pdt;
-    }
-
-    @Override
-    public Object getElementAt(final int index) {
-      return Integer.valueOf(index);
-    }
-
-    @Override
-    public int getSize() {
-      return pdt.getNbResultats();
-    }
-  }
-
   @SuppressWarnings("serial")
   private static class ResultatValueColumnCellRenderer extends CtuluCellTextRenderer {
 

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:[8263] trunk/framework/ctulu-gis/src/main/java/org/fudaa/ ctulu/gis/GISZoneCollection.java

From: <de...@us...> - 2013-02-08 10:44:32

Revision: 8263
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8263&view=rev
Author:   deniger
Date:     2013-02-08 10:44:25 +0000 (Fri, 08 Feb 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISZoneCollection.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISZoneCollection.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISZoneCollection.java	2013-02-08 10:37:06 UTC (rev 8262)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/GISZoneCollection.java	2013-02-08 10:44:25 UTC (rev 8263)
@@ -166,10 +166,15 @@
         if (attribute.isAtomicValue()) {
           CtuluListObject newObject = new CtuluListObject();
           for (int j = 0; j < modelToCopy.getSize(); j++) {
-            CtuluCollection collection = (CtuluCollection) modelToCopy.getObjectValueAt(j);
-            final GISAttributeModelObservable newAtomicModel = attribute.createAtomicModel(collection.getObjectValues(),
-                    collection.getSize());
-            newObject.addObject(newAtomicModel, null);
+            if (modelToCopy.getObjectValueAt(j) instanceof CtuluCollection) {
+              CtuluCollection collection = (CtuluCollection) modelToCopy.getObjectValueAt(j);
+              final GISAttributeModelObservable newAtomicModel = attribute.createAtomicModel(collection.getObjectValues(),
+                      collection.getSize());
+              newObject.addObject(newAtomicModel, null);
+            }
+            else{
+              newObject.addObject(modelToCopy.getObjectValueAt(j), null);
+            }
           }
           cloned.attr_[i].initWith(newObject, false);
         } else {

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:[8262] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque/edition/ZSceneEditor.java

From: <de...@us...> - 2013-02-08 10:37:14

Revision: 8262
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8262&view=rev
Author:   deniger
Date:     2013-02-08 10:37:06 +0000 (Fri, 08 Feb 2013)
Log Message:
-----------


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

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java	2013-02-07 16:36:52 UTC (rev 8261)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZSceneEditor.java	2013-02-08 10:37:06 UTC (rev 8262)
@@ -107,12 +107,15 @@
     final CtuluCommandComposite cmp = new CtuluCommandComposite(
             EbliLib.getS("D\xE9placer s\xE9lection"));
     int nb = getScene().getSelectionHelper().getNbTotalSelectedObject();
+    boolean ok = false;
     for (int i = 0; i < cqs.length; i++) {
-      cqs[i].moveSelectedObjects(_dx, _dy, _dz, cmp, ui_);
+      ok |= cqs[i].moveSelectedObjects(_dx, _dy, _dz, cmp, ui_);
     }
-    final String msg = EbliLib.getS("{0} objet(s) d\xE9plac\xE9(s)", Integer.toString(nb));
-    FuLog.warning("MOD:" + msg);
-    getUI().message(null, msg, true);
+    if (ok) {
+      final String msg = EbliLib.getS("{0} objet(s) d\xE9plac\xE9(s)", Integer.toString(nb));
+      FuLog.warning("MOD:" + msg);
+      getUI().message(null, msg, true);
+    }
     if (editorListener != null) {
       editorListener.globalMovedEnd();
     }
@@ -126,6 +129,9 @@
     final CtuluCommandComposite cmp = new CtuluCommandComposite(
             EbliLib.getS("Supprimer s\xE9lection"));
     int nb = getScene().getSelectionHelper().getNbTotalSelectedObject();
+    if (nb == 0) {
+      return;
+    }
     for (int i = 0; i < cqs.length; i++) {
       cqs[i].removeSelectedObjects(cmp, ui_);
     }

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:[8261] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque

From: <de...@us...> - 2013-02-07 16:36:59

Revision: 8261
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8261&view=rev
Author:   deniger
Date:     2013-02-07 16:36:52 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleImageRaster.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleImageRaster.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleImageRaster.java	2013-02-07 16:36:22 UTC (rev 8260)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleImageRaster.java	2013-02-07 16:36:52 UTC (rev 8261)
@@ -59,4 +59,6 @@
 
   BufferedImage getImage(GrBoite _clipReel, int _widthEcran, int _heightEcran, AffineTransform _toReel, boolean _quick);
 
+  public ZModeleImageRaster cloneModel();
+
 }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java	2013-02-07 16:36:22 UTC (rev 8260)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java	2013-02-07 16:36:52 UTC (rev 8261)
@@ -46,8 +46,8 @@
 import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
 
 /**
- * Un modele simple pour le modele Image. Les points et la boite retournes sont des objets r\xE9initialises. Il est possible
- * d'auto-appliquer les morphismes sur ces objets.
+ * Un modele simple pour le modele Image. Les points et la boite retournes sont des objets r\xE9initialises. Il est possible d'auto-appliquer les
+ * morphismes sur ces objets.
  *
  * @version $Id: ZModeleStatiqueImageRaster.java,v 1.20 2007-05-04 13:49:43 deniger Exp $
  * @author Fred Deniger
@@ -135,12 +135,12 @@
   }
 
   public static double[] getErreurs(final Point2D.Double[] _img, final Point2D.Double[] _reel,
-                                    final AffineTransform _trans) {
+          final AffineTransform _trans) {
     return getErreurs(_img, _reel, _trans, null);
   }
 
   public static double[] getErreurs(final Point2D.Double[] _img, final Point2D.Double[] _reel,
-                                    final AffineTransform _trans, final double[] _error) {
+          final AffineTransform _trans, final double[] _error) {
     if (CtuluLibArray.isEmpty(_img) || CtuluLibArray.isEmpty(_reel) || _trans == null) {
       return null;
     }
@@ -164,6 +164,17 @@
   }
 
   @Override
+  public ZModeleImageRaster cloneModel() {
+    ZModeleStatiqueImageRaster res = new ZModeleStatiqueImageRaster();
+    res.pts_ = (GISZoneCollectionPoint) pts_.clone();
+    res.image_ = new CtuluImageContainer(image_.getFile());
+    res.erreurs_ = CtuluLibArray.copy(erreurs_);
+    res.path_ = path_;
+    res.raster_ = raster_;
+    return res;
+  }
+
+  @Override
   protected ZModeleStatiqueImageRaster clone() {
     try {
       ZModeleStatiqueImageRaster cloned = (ZModeleStatiqueImageRaster) super.clone();
@@ -208,8 +219,8 @@
 
   @Override
   public BufferedImage getImage(final GrBoite _clipReel, final int _widthEcran, final int _heightEcran,
-                                final AffineTransform _toReel,
-                                final boolean _quick) {
+          final AffineTransform _toReel,
+          final boolean _quick) {
     _toReel.setToIdentity();
     BufferedImage res;
     int xOffset = 0;
@@ -304,8 +315,8 @@
   BufferedImage lastImage_;
 
   /**
-   * Retourne une partie de l'image. Methode optimis\xE9e qui retourne un cache si les dimensions et ratio ne sont pas modifi\xE9s
-   * depuis le dernier appel.
+   * Retourne une partie de l'image. Methode optimis\xE9e qui retourne un cache si les dimensions et ratio ne sont pas modifi\xE9s depuis le dernier appel.
+   *
    * @param _r Le rectangle de l'image.
    * @param _ratioX Le ratio suivant X
    * @param _ratioY Le ratio suivant Y
@@ -314,7 +325,7 @@
   private BufferedImage getImage(final Rectangle _r, final float _ratioX, final float _ratioY) {
     // Les dimensions et ratio ne sont pas modifi\xE9s => L'image cache est retourn\xE9e si elle existe.
     if (lastRec_ != null && lastImage_ != null && lastRec_.contains(_r) && _ratioX <= lastRatioX_
-        && _ratioY <= lastRatioY_) {
+            && _ratioY <= lastRatioY_) {
       if (Fu.DEBUG && FuLog.isDebug()) {
         FuLog.debug("ECA: on recupere l'ancienne image");
       }
@@ -348,10 +359,10 @@
     final BuTable r = new CtuluTable(new ImgTableModel());
     EbliTableInfoPanel.setTitle(r, _layer.getTitle());
     EbliTableInfoPanel.setComponent(r, new BuLabel("<html>"
-                                                   + EbliLib.getS(
+            + EbliLib.getS(
             "Les coordonn\xE9es de l'image sont donn\xE9es \xE0 partir d'en bas \xE0 droite.")
-                                                   + "<br>"
-                                                   + EbliLib.getS(
+            + "<br>"
+            + EbliLib.getS(
             "La colonne '{0}' du tableau permet de conna\xEEtre l'ordonn\xE9e du point depuis le haut de l'image",
             r.getModel().getColumnName(3))));
     return r;
@@ -422,7 +433,7 @@
       final int i = _layer.getLayerSelection().getMaxIndex();
       final int i2 = _layer.getLayerSelection().getMinIndex();
       _d.put(EbliLib.getS("Distance entre les 2 points"),
-             CtuluLib.DEFAULT_NUMBER_FORMAT.format(CtuluLibGeometrie.getDistance(getX(i), getY(i), getX(i2), getY(i2))));
+              CtuluLib.DEFAULT_NUMBER_FORMAT.format(CtuluLibGeometrie.getDistance(getX(i), getY(i), getX(i2), getY(i2))));
       return;
     }
     if (nb != 1) {
@@ -431,11 +442,11 @@
     final int idxNode = _layer.getLayerSelection().getMaxIndex();
     _d.setTitle(EbliLib.getS("Point {0}", CtuluLibString.getString(idxNode + 1)));
     _d.put(EbliLib.getS("Pixels "), (getXImgCalage(idxNode)) + CtuluLibString.VIR
-                                    + (getHImg() - getYImgCalageFromTop(idxNode)));
+            + (getHImg() - getYImgCalageFromTop(idxNode)));
     _d.put(EbliLib.getS("Pixels (depuis haut,gauche)"), getXImgCalage(idxNode) + CtuluLibString.VIR
-                                                        + getYImgCalageFromTop(idxNode));
+            + getYImgCalageFromTop(idxNode));
     _d.put(EbliLib.getS("Reel"), CtuluLib.DEFAULT_NUMBER_FORMAT.format(getX(idxNode)) + CtuluLibString.VIR
-                                 + CtuluLib.DEFAULT_NUMBER_FORMAT.format(getY(idxNode)));
+            + CtuluLib.DEFAULT_NUMBER_FORMAT.format(getY(idxNode)));
 
   }
 
@@ -597,7 +608,7 @@
    */
   @Override
   public void setProj(final Point2D.Double[] _img, final Point2D.Double[] _reel, final AffineTransform _trans,
-                      final double[] _err) {
+          final double[] _err) {
     if (CtuluLibArray.isEmpty(_img) || CtuluLibArray.isEmpty(_reel)) {
       clear();
       return;
@@ -644,4 +655,4 @@
   public void objectAction(Object _source, int _indexObj, Object _obj, int _action) {
     autoUpdate();
   }
-}
\ No newline at end of file
+}

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:[8259] trunk/soft/fudaa-crue/crue-compare/src/test/java/ org/fudaa/dodico/crue/comparaison/ComparaisonSelectorReaderTest.java

From: <de...@us...> - 2013-02-04 07:27:54

Revision: 8259
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8259&view=rev
Author:   deniger
Date:     2013-02-04 07:27:48 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ComparaisonSelectorReaderTest.java

Modified: trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ComparaisonSelectorReaderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ComparaisonSelectorReaderTest.java	2013-02-03 21:16:35 UTC (rev 8258)
+++ trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ComparaisonSelectorReaderTest.java	2013-02-04 07:27:48 UTC (rev 8259)
@@ -8,6 +8,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections.PredicateUtils;
 import org.fudaa.ctulu.CtuluLibFile;
 import org.fudaa.ctulu.CtuluLog;
 import org.fudaa.ctulu.CtuluLogLevel;
@@ -98,8 +99,8 @@
       CrueOperationResult<ComparaisonSelectorContent> readAndValid = reader.readAndValid(siteDir, ComparaisonSelectorEnum.C9_C9);
       ComparaisonSelectorContent result = readAndValid.getResult();
       testPredicate(result.getPredicate(ComparaisonSelectorEnum.C9_C9), "DCLM1", "DCLM2");
-      assertNull(result.getPredicate(ComparaisonSelectorEnum.C9_C10));
-      assertNull(result.getPredicate(ComparaisonSelectorEnum.C10_C10));
+      assertEquals(PredicateUtils.truePredicate(),result.getPredicate(ComparaisonSelectorEnum.C9_C10));
+      assertEquals(PredicateUtils.truePredicate(),result.getPredicate(ComparaisonSelectorEnum.C10_C10));
       assertFalse(readAndValid.getLogs().containsSomething());
     } catch (IOException iOException) {
       fail(iOException.getMessage());

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:[8258] trunk/soft/fudaa-crue

From: <de...@us...> - 2013-02-03 21:16:43

Revision: 8258
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8258&view=rev
Author:   deniger
Date:     2013-02-03 21:16:35 +0000 (Sun, 03 Feb 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-compare/pom.xml
    trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTesterBean.java
    trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
    trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBeanMap.java
    trunk/soft/fudaa-crue/crue-config/pom.xml
    trunk/soft/fudaa-crue/crue-core/pom.xml
    trunk/soft/fudaa-crue/crue-emh/pom.xml
    trunk/soft/fudaa-crue/crue-io/pom.xml
    trunk/soft/fudaa-crue/crue-otfa/pom.xml
    trunk/soft/fudaa-crue/crue-project/pom.xml
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/IntegrationHelper.java
    trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
    trunk/soft/fudaa-crue/crue-test/pom.xml
    trunk/soft/fudaa-crue/crue-validation/pom.xml
    trunk/soft/fudaa-crue/pom.xml
    trunk/soft/fudaa-crue/ui-application/pom.xml
    trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
    trunk/soft/fudaa-crue/ui-branding/pom.xml
    trunk/soft/fudaa-crue/ui-commandline/pom.xml
    trunk/soft/fudaa-crue/ui-common/pom.xml
    trunk/soft/fudaa-crue/ui-comparison/pom.xml
    trunk/soft/fudaa-crue/ui-emh/pom.xml
    trunk/soft/fudaa-crue/ui-loader/pom.xml
    trunk/soft/fudaa-crue/ui-loi/pom.xml
    trunk/soft/fudaa-crue/ui-modelling/pom.xml
    trunk/soft/fudaa-crue/ui-options/pom.xml
    trunk/soft/fudaa-crue/ui-otfa/pom.xml
    trunk/soft/fudaa-crue/ui-planimetry/pom.xml
    trunk/soft/fudaa-crue/ui-post/pom.xml
    trunk/soft/fudaa-crue/ui-report/pom.xml
    trunk/soft/fudaa-crue/ui-study/pom.xml
    trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
    trunk/soft/fudaa-crue/ui-wrapper/pom.xml

Added Paths:
-----------
    trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu201.java
    trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip

Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-compare</artifactId>
   <name>Crue Compare</name>

Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTesterBean.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTesterBean.java	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTesterBean.java	2013-02-03 21:16:35 UTC (rev 8258)
@@ -47,9 +47,11 @@
   String notDefined;
   Collection<String> propToIgnore = new HashSet<String>(Arrays.asList("class", "value"));
   boolean useNameForLoi = true;
-
-  public AbstractEqualsTesterBean(final FactoryEqualsTester factory) {
+private final boolean compareClass;
+  
+  public AbstractEqualsTesterBean(final FactoryEqualsTester factory,final boolean compareClass) {
     this.factory = factory;
+    this.compareClass=compareClass;
   }
 
   protected ResultatTest addDiff(final Object o1, final ResultatTest res, final String propName, final Object a, final Object b, final TesterContext context) {
@@ -243,7 +245,7 @@
   public boolean isSameSafe(final T o1, final T o2, final ResultatTest res, final TesterContext context, final Collection<String> propToUse) {
 
     boolean classEquals = o1.getClass().equals(o2.getClass());
-    if (CollectionUtils.isEmpty(context.getPropToCompare()) && !classEquals) {
+    if (compareClass && CollectionUtils.isEmpty(context.getPropToCompare()) && !classEquals) {
       if (res != null) {
         String prefix1 = toString(o1);
         if (o1 instanceof Pdt) {

Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java	2013-02-03 21:16:35 UTC (rev 8258)
@@ -21,7 +21,7 @@
    * @param factory la factory
    */
   public EqualsTesterBean(final FactoryEqualsTester factory) {
-    super(factory);
+    super(factory,true);
   }
 
   @Override

Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBeanMap.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBeanMap.java	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBeanMap.java	2013-02-03 21:16:35 UTC (rev 8258)
@@ -21,7 +21,7 @@
    * @param factory la factory
    */
   public EqualsTesterBeanMap(final FactoryEqualsTester factory) {
-    super(factory);
+    super(factory,false);
   }
 
   @Override

Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-config</artifactId>
   <name>Crue Config</name>

Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-core</artifactId>
   <name>Crue Core</name>

Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-emh</artifactId>
   <name>Crue EMH</name>

Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-io</artifactId>
   <name>Crue IO</name>

Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-otfa</artifactId>
   <name>Crue OTFA</name>

Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-project</artifactId>
   <name>Crue Project</name>

Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/IntegrationHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/IntegrationHelper.java	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/IntegrationHelper.java	2013-02-03 21:16:35 UTC (rev 8258)
@@ -97,7 +97,7 @@
     final OrdResDynamicPropertyFilter filter = new OrdResDynamicPropertyFilter(scenario1.getOrdResScenario(),
             scenario2.getOrdResScenario());
     final ExecuteComparaison comp = new ExecuteComparaison(read, projet.getPropDefinition(), filter);
-    final List<ExecuteComparaisonResult> launch = comp.launch(scenario1, scenario2,PredicateUtils.truePredicate());
+    final List<ExecuteComparaisonResult> launch = comp.launch(scenario1, scenario2, PredicateUtils.truePredicate());
     Collections.sort(launch);
     Collection<String> comparisonIds = new HashSet<String>();
     for (ExecuteComparaisonResult executeComparaisonResult : launch) {
@@ -116,6 +116,17 @@
     return comparisonIds;
   }
 
+  public static List<ExecuteComparaisonResult> compareResult(EMHProjet projet, EMHScenario scenario1, EMHScenario scenario2) {
+    final ReaderConfig readerConfig = new ReaderConfig();
+    final ConfComparaisonConteneur read = readerConfig.read(ReaderConfig.class.getResource("default-comparaison.xml"));
+    final OrdResDynamicPropertyFilter filter = new OrdResDynamicPropertyFilter(scenario1.getOrdResScenario(),
+            scenario2.getOrdResScenario());
+    final ExecuteComparaison comp = new ExecuteComparaison(read, projet.getPropDefinition(), filter);
+    final List<ExecuteComparaisonResult> launch = comp.launch(scenario1, scenario2, PredicateUtils.truePredicate());
+    Collections.sort(launch);
+    return launch;
+  }
+
   public static CrueOperationResult<EMHScenarioContainer> loadScenario(ManagerEMHScenario managerEMHScenario, EMHProjet projet) {
     return loadScenario(managerEMHScenario, projet, true);
   }
@@ -157,7 +168,7 @@
     toCrue9.exportFor(new File(targetDir, nomFichierTo).getAbsolutePath());
     assertFalse(toCrue9.getErrorManager().containsFatalError());
     ManagerEMHScenario managerScenarioTo = projet.getScenario(nomScenarioTo);
-    loader = new ScenarioLoader(managerScenarioTo, projet, projet.getCoeurConfig() );
+    loader = new ScenarioLoader(managerScenarioTo, projet, projet.getCoeurConfig());
     result = loader.loadRunCourant();
     testErrorsManager(result.getLogs());
     assertFalse(result.getLogs().containsFatalError());

Copied: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu201.java (from rev 8048, trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu30.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu201.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu201.java	2013-02-03 21:16:35 UTC (rev 8258)
@@ -0,0 +1,68 @@
+/**
+ * License GPL v2
+ */
+package org.fudaa.dodico.crue.integration;
+
+import java.io.File;
+import java.util.List;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.dodico.crue.comparaison.ExecuteComparaisonResult;
+import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.projet.EMHScenarioContainer;
+import org.fudaa.dodico.crue.test.AbstractTestCase;
+import org.junit.*;
+import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+
+/**
+ *
+ * @author deniger
+ */
+@Category(org.fudaa.dodico.crue.test.TestIntegration.class)
+public class TestIntegrationEtu201 {
+  
+  static File target;
+  static EMHProjet projet;
+  
+  public TestIntegrationEtu201() {
+  }
+  
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+    target = CtuluLibFile.createTempDir();
+    AbstractTestCase.exportZip(target, "/integration/Etu201.zip");
+    final File file = new File(target, "Etu201.etu.xml");
+    assertTrue(file.exists());
+    projet = IntegrationHelper.loadEtu(file, TestCoeurConfig.INSTANCE);
+    assertNotNull(projet);
+  }
+  
+  @AfterClass
+  public static void tearDownClass() throws Exception {
+    CtuluLibFile.deleteDir(target);
+    
+  }
+  
+  public static ExecuteComparaisonResult find(List<ExecuteComparaisonResult> compare, String id) {
+    for (ExecuteComparaisonResult executeComparaisonResult : compare) {
+      if (id.equals(executeComparaisonResult.getId())) {
+        return executeComparaisonResult;
+      }
+    }
+    return null;
+  }
+  
+  @Test
+  public void testRuns() {
+    
+    EMHScenarioContainer runc9 = IntegrationHelper.loadRun("Sc_M201-1_c9c9", projet, 0);
+    EMHScenarioContainer runc10 = IntegrationHelper.loadRun("Sc_M201-1_c9c9c10", projet, 0);
+    assertNotNull(runc9.getEmhScenario().getModeles().get(0).getResultatCalculPasDeTemps());
+    assertNotNull(runc9.getEmhScenario().getModeles().get(0).getResultatCalculPasDeTemps());
+    final List<ExecuteComparaisonResult> compare = IntegrationHelper.compareResult(projet, runc9.getEmhScenario(), runc10.getEmhScenario());
+    ExecuteComparaisonResult find = find(compare, "RCAL4.1");
+    assertEquals(346, find.getNbDifferences());
+  }
+  
+}

Added: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
===================================================================
(Binary files differ)


Property changes on: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-sysdoc</artifactId>
   <name>Crue Sysdoc</name>

Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>crue-test</artifactId>

Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>crue-validation</artifactId>
   <name>Crue Validation</name>

Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-crue</groupId>
   <artifactId>fudaa-crue</artifactId>
-  <version>0.66-SNAPSHOT</version>
+  <version>0.65-SNAPSHOT</version>
   <name>Fudaa-Crue</name>
   <packaging>pom</packaging>
   <ciManagement>

Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>application</artifactId>

Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf	2013-02-03 21:16:35 UTC (rev 8258)
@@ -1,7 +1,7 @@
 # ${HOME} will be replaced by user home directory according to platform
 #default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
 #default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\0.66"
+default_userdir="${HOME}\.${APPNAME}\0.65"
 default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.66/"
 # options used by the launcher by default, can be overridden by explicit
 # command line switches

Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-branding</artifactId>

Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>ui-commandline</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-common</artifactId>

Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>ui-comparison</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>ui-emh</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>ui-loader</artifactId>
   <packaging>nbm</packaging>

Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-loi</artifactId>

Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-modelling</artifactId>

Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <artifactId>ui-options</artifactId>
   <name>Crue UI Options</name>

Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-otfa</artifactId>

Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-planimetry</artifactId>

Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-post</artifactId>

Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-report</artifactId>

Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-study</artifactId>

Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-sysdoc</artifactId>

Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml	2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml	2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>0.66-SNAPSHOT</version>
+    <version>0.65-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-wrapper</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:[8255] trunk/framework/ctulu-gis/src/main/java/org/fudaa/ ctulu/gis/gml

From: <de...@us...> - 2013-01-24 09:54:08

Revision: 8255
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8255&view=rev
Author:   deniger
Date:     2013-01-24 09:54:00 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLInputTemplate.java
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLReader.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLInputTemplate.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLInputTemplate.java	2013-01-24 09:45:57 UTC (rev 8254)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLInputTemplate.java	2013-01-24 09:54:00 UTC (rev 8255)
@@ -205,14 +205,13 @@
    *
    * @param _tag an XML tag name
    */
-  public boolean isGeometryElement(final String _tag) {
-    int t;
-    String s;
+  public boolean isGeometryElement(final String _tagInit) {
+    String _tag=_tagInit.toLowerCase();
 
-    for (t = 0; t < geometryElements_.size(); t++) {
-      s = (String) geometryElements_.get(t);
+    for (int t = 0; t < geometryElements_.size(); t++) {
+     String s = (String) geometryElements_.get(t);
 
-      if (s.equalsIgnoreCase(_tag)) {
+      if (s.equals(_tag)) {
         return true;
       }
     }

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLReader.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLReader.java	2013-01-24 09:45:57 UTC (rev 8254)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GMLReader.java	2013-01-24 09:54:00 UTC (rev 8255)
@@ -280,17 +280,18 @@
     state_ = STATE_INIT;
   }
 
-  private ArrayList convertToMultiIfNecessary(ArrayList _geometry, String _qName) {
+  private ArrayList convertToMultiIfNecessary(ArrayList _geometry, String _qNameInit) {
     if (_geometry.size() != 1) {
       return _geometry;
     }
+    String _qName = _qNameInit.toLowerCase();
 
     ArrayList l = new ArrayList();
-    if (_qName.equalsIgnoreCase("multipoint") || _qName.equalsIgnoreCase("gml:multipoint")) {
+    if (_qName.equals("multipoint") || _qName.equals("gml:multipoint")) {
       l.add(geometryFactory_.createMultiPoint((Point[]) _geometry.toArray(new Point[0])));
-    } else if (_qName.equalsIgnoreCase("multilinestring") || _qName.equalsIgnoreCase("gml:multilinestring")) {
+    } else if (_qName.equals("multilinestring") || _qName.equals("gml:multilinestring")) {
       l.add(geometryFactory_.createMultiLineString((LineString[]) _geometry.toArray(new LineString[0])));
-    } else if (_qName.equalsIgnoreCase("multipolygon") || _qName.equalsIgnoreCase("gml:multipolygon")) {
+    } else if (_qName.equals("multipolygon") || _qName.equals("gml:multipolygon")) {
       l.add(geometryFactory_.createMultiPolygon((Polygon[]) _geometry.toArray(new Polygon[0])));
     } else {
       l = _geometry;
@@ -352,29 +353,30 @@
 
           return;
         }
+        String qNameLowerCase = _qName.toLowerCase();
 
         // these correspond to <coord><X>0.0</X><Y>0.0</Y></coord>
-        if ((_qName.compareToIgnoreCase("X") == 0) || (_qName.compareToIgnoreCase("gml:X") == 0)) {
+        if ((qNameLowerCase.compareTo("x") == 0) || (qNameLowerCase.compareTo("gml:x") == 0)) {
           // singleCoordinate.x = (new Double(tagBody)).doubleValue(); [sstein, 10.10.2005]
           singleCoordinate_.x = (Double.valueOf(tagBody_.toString())).doubleValue();
-        } else if ((_qName.compareToIgnoreCase("Y") == 0) || (_qName.compareToIgnoreCase("gml:y") == 0)) {
+        } else if ((qNameLowerCase.compareTo("y") == 0) || (qNameLowerCase.compareTo("gml:y") == 0)) {
           // singleCoordinate.y = (new Double(tagBody)).doubleValue(); [sstein, 10.10.2005]
           singleCoordinate_.y = (Double.valueOf(tagBody_.toString())).doubleValue();
-        } else if ((_qName.compareToIgnoreCase("Z") == 0) || (_qName.compareToIgnoreCase("gml:z") == 0)) {
+        } else if ((qNameLowerCase.compareTo("z") == 0) || (qNameLowerCase.compareTo("gml:z") == 0)) {
           // singleCoordinate.z = (new Double(tagBody)).doubleValue(); [sstein, 10.10.2005]
           singleCoordinate_.z = (Double.valueOf(tagBody_.toString())).doubleValue();
-        } else if ((_qName.compareToIgnoreCase("COORD") == 0) || (_qName.compareToIgnoreCase("gml:coord") == 0)) {
+        } else if ((qNameLowerCase.compareTo("coord") == 0) || (qNameLowerCase.compareTo("gml:coord") == 0)) {
           pointList_.add(new Coordinate(singleCoordinate_)); // remember it
         } // this corresponds to <gml:coordinates>1195156.78946687,382069.533723461</gml:coordinates>
-        else if ((_qName.compareToIgnoreCase("COORDINATES") == 0)
-                || (_qName.compareToIgnoreCase("gml:coordinates") == 0)) {
+        else if ((qNameLowerCase.compareTo("coordinates") == 0)
+                || (qNameLowerCase.compareTo("gml:coordinates") == 0)) {
           // tagBody has a wack-load of points in it - we need
           // to parse them into the pointList list.
           // assume that the x,y,z coordinate are "," separated, and the points are CtuluLibString.ESPACE separated
           // parsePoints(tagBody, geometryFactory); [sstein, 10.10.2005]
           parsePoints(tagBody_.toString(), geometryFactory_);
-        } else if ((_qName.compareToIgnoreCase("linearring") == 0)
-                || (_qName.compareToIgnoreCase("gml:linearring") == 0)) {
+        } else if ((qNameLowerCase.compareTo("linearring") == 0)
+                || (qNameLowerCase.compareTo("gml:linearring") == 0)) {
           Coordinate[] c = new Coordinate[0];
 
           c = (Coordinate[]) pointList_.toArray(c);
@@ -382,34 +384,35 @@
           // c= (Coordinate[])l;
           linearRing_ = geometryFactory_.createLinearRing(c);
           geometry_.add(linearRing_);
-        } else if ((_qName.compareToIgnoreCase("outerBoundaryIs") == 0)
-                || (_qName.compareToIgnoreCase("gml:outerBoundaryIs") == 0)) {
+        } else if ((qNameLowerCase.compareTo("outerboundaryis") == 0)
+                || (qNameLowerCase.compareTo("gml:outerboundaryis") == 0)) {
           geometry_.remove(linearRing_);
           outerBoundary_ = linearRing_;
-        } else if ((_qName.compareToIgnoreCase("innerBoundaryIs") == 0)
-                || (_qName.compareToIgnoreCase("gml:innerBoundaryIs") == 0)) {
+        } else if ((qNameLowerCase.compareTo("innerboundaryis") == 0)
+                || (qNameLowerCase.compareTo("gml:innerboundaryis") == 0)) {
           innerBoundaries_.add(linearRing_);
           geometry_.remove(linearRing_);
-        } else if ((_qName.compareToIgnoreCase("polygon") == 0) || (_qName.compareToIgnoreCase("gml:polygon") == 0)) {
+        } else if ((qNameLowerCase.compareTo("polygon") == 0) || (qNameLowerCase.compareTo("gml:polygon") == 0)) {
           // LinearRing[] lrs = new LinearRing[1];
           LinearRing[] lrs = new LinearRing[0];
 
           lrs = (LinearRing[]) innerBoundaries_.toArray(lrs);
           polygon_ = geometryFactory_.createPolygon(outerBoundary_, lrs);
           geometry_.add(polygon_);
-        } else if ((_qName.compareToIgnoreCase("linestring") == 0)
-                || (_qName.compareToIgnoreCase("gml:linestring") == 0)) {
+        } else if ((qNameLowerCase.compareTo("linestring") == 0)
+                || (qNameLowerCase.compareTo("gml:linestring") == 0)) {
           Coordinate[] c = new Coordinate[0];
 
           c = (Coordinate[]) pointList_.toArray(c);
 
           lineString_ = geometryFactory_.createLineString(c);
           geometry_.add(lineString_);
-        } else if ((_qName.compareToIgnoreCase("point") == 0) || (_qName.compareToIgnoreCase("gml:point") == 0)) {
+        } else if ((qNameLowerCase.compareTo("point") == 0) || (qNameLowerCase.compareTo("gml:point") == 0)) {
           apoint_ = geometryFactory_.createPoint((Coordinate) pointList_.get(0));
           geometry_.add(apoint_);
         }
       } else if (state_ == STATE_GET_COLUMNS) {
+        //on laisse le ignoreCase ici car featureTag_ peut etre en majuscule ou autre...
         if (_qName.compareToIgnoreCase(gmlInput_.featureTag_) == 0) {
           // tagBody = ""; [sstein, 10.10.2005]
           tagBody_ = new StringBuilder();
@@ -762,24 +765,24 @@
           // srid_);
         }
       }
-
+      String qNameToLowerCase = _qName.toLowerCase();
       if ((state_ >= STATE_PARSE_GEOM_SIMPLE)
-              && ((_qName.compareToIgnoreCase("coord") == 0) || (_qName.compareToIgnoreCase("gml:coord") == 0))) {
+              && ((qNameToLowerCase.compareTo("coord") == 0) || (qNameToLowerCase.compareTo("gml:coord") == 0))) {
         singleCoordinate_.x = Double.NaN;
         singleCoordinate_.y = Double.NaN;
         singleCoordinate_.z = Double.NaN;
       }
 
       if ((state_ >= STATE_PARSE_GEOM_SIMPLE)
-              && (!((_qName.compareToIgnoreCase("X") == 0) || (_qName.compareToIgnoreCase("gml:x") == 0)
-              || (_qName.compareToIgnoreCase("y") == 0) || (_qName.compareToIgnoreCase("gml:y") == 0)
-              || (_qName.compareToIgnoreCase("z") == 0) || (_qName.compareToIgnoreCase("gml:z") == 0)
-              || (_qName.compareToIgnoreCase("coord") == 0) || (_qName.compareToIgnoreCase("gml:coord") == 0)))) {
+              && (!((qNameToLowerCase.compareTo("x") == 0) || (qNameToLowerCase.compareTo("gml:x") == 0)
+              || (qNameToLowerCase.compareTo("y") == 0) || (qNameToLowerCase.compareTo("gml:y") == 0)
+              || (qNameToLowerCase.compareTo("z") == 0) || (qNameToLowerCase.compareTo("gml:z") == 0)
+              || (qNameToLowerCase.compareTo("coord") == 0) || (qNameToLowerCase.compareTo("gml:coord") == 0)))) {
         pointList_.clear(); // clear out any accumulated points
       }
 
       if ((state_ >= STATE_PARSE_GEOM_SIMPLE)
-              && ((_qName.compareToIgnoreCase("polygon") == 0) || (_qName.compareToIgnoreCase("gml:polygon") == 0))) {
+              && ((qNameToLowerCase.compareTo("polygon") == 0) || (qNameToLowerCase.compareTo("gml:polygon") == 0))) {
         innerBoundaries_.clear(); // polygon just started - clear out the last one
       }
 
@@ -812,12 +815,10 @@
    */
   private boolean isGeometryTag(final String _st) {
     // remove the "gml:" if its there
-    String s = _st;
-    if ((s.length() > 5) && (s.substring(0, 4).compareToIgnoreCase("gml:") == 0)) {
+    String s = _st.toLowerCase();
+    if ((s.length() > 5) && StringUtils.startsWith(s, "gml:")) {
       s = s.substring(4);
     }
-    s = s.toLowerCase();
-
     return ((s.compareTo("multigeometry") == 0) || (s.compareTo("multipoint") == 0)
             || (s.compareTo("multilinestring") == 0) || (s.compareTo("multipolygon") == 0) || (s.compareTo("polygon") == 0)
             || (s.compareTo("linestring") == 0) || (s.compareTo("point") == 0) || (s.compareTo("geometrycollection") == 0));
@@ -830,12 +831,10 @@
    * @return The multiGeometryTag value
    */
   private boolean isMultiGeometryTag(final String _s) {
-    String s = _s;
-    // remove the "gml:" if its there
-    if ((s.length() > 5) && (s.substring(0, 4).compareToIgnoreCase("gml:") == 0)) {
+    String s = _s.toLowerCase();
+    if ((s.length() > 5) && StringUtils.startsWith(s, "gml:")) {
       s = s.substring(4);
     }
-    s = s.toLowerCase();
     return ((s.compareTo("multigeometry") == 0) || (s.compareTo("multipoint") == 0)
             || (s.compareTo("multilinestring") == 0) || (s.compareTo("multipolygon") == 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:[8254] trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/ fudaa/modeleur/MdlImplementation.java

From: <de...@us...> - 2013-01-24 09:46:08

Revision: 8254
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8254&view=rev
Author:   deniger
Date:     2013-01-24 09:45:57 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
incr?\195?\169ment version

Modified Paths:
--------------
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java

Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java	2013-01-24 07:46:01 UTC (rev 8253)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java	2013-01-24 09:45:57 UTC (rev 8254)
@@ -95,8 +95,8 @@
 
   static {
     isMdl_.name = MdlResource.getS("Modeleur");
-    isMdl_.version = "1.2RC7";
-    isMdl_.date = "2013-01-21";
+    isMdl_.version = "1.2RC8";
+    isMdl_.date = "2013-01-24";
     isMdl_.rights = MdlResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)1999-2011";
     isMdl_.license = "GPL2";
     isMdl_.languages = "fr,en";
@@ -484,7 +484,9 @@
             FudaaSaveZipLoader loader = new FudaaSaveZipLoader(f);
             // Recup des infos pour utilisateur.
             BuInformationsSoftware is = FudaaSaveProject.getSoftwareInfos(loader);
-            FuLog.trace("File version : " + (is.version == null ? "Undefined" : is.version));
+            if (is != null) {
+              FuLog.trace("File version : " + (is.version == null ? "Undefined" : is.version));
+            }
 
             r = FudaaSaveLib.restoreFille(MdlImplementation.this, mdl2dFrame_, _proj, loader);
           } catch (final IOException _evt) {
@@ -733,7 +735,7 @@
    */
   @Override
   protected void buildPreferences(final List<BuAbstractPreferencesPanel> _frAddTab) {
-    
+
     _frAddTab.add(new FudaaPerformancePreferencesPanel(this));
     _frAddTab.add(new BuUserPreferencesPanel(this));
     _frAddTab.add(new BuLanguagePreferencesPanel(this));

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:[8253] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr

From: <de...@us...> - 2013-01-24 07:46:11

Revision: 8253
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8253&view=rev
Author:   deniger
Date:     2013-01-24 07:46:01 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
PREPRO-338

Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java	2013-01-24 07:44:05 UTC (rev 8252)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java	2013-01-24 07:46:01 UTC (rev 8253)
@@ -1,6 +1,9 @@
 /**
- * @creation 24 mai 2004 @modification $Date: 2007-12-04 09:09:26 $ @license GNU General Public License 2 @copyright (c)1998-2001
- * CETMEF 2 bd Gambetta F-60231 Compiegne @mail de...@fu...
+ * @creation 24 mai 2004
+ * @modification $Date: 2007-12-04 09:09:26 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
  */
 package org.fudaa.fudaa.tr;
 
@@ -69,8 +72,8 @@
 
     infoSoft = new BuInformationsSoftware();
     infoSoft.name = "prepro";
-    infoSoft.version = "1.2-RC20";
-    infoSoft.date = "2013-01-22";
+    infoSoft.version = "1.2-RC21";
+    infoSoft.date = "2013-01-24";
     infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
     infoSoft.contact = "fre...@fu...";
     infoSoft.license = "GPL2";
@@ -120,7 +123,6 @@
     }
     _impl.setLauncher(launcher);
     final Runnable r = new Runnable() {
-
       @Override
       public void run() {
         f.startApp(_impl);
@@ -251,7 +253,7 @@
     final String init = TrPreferences.TR.getStringProperty("tr.code.id", null);
     final String[] choix = getChoices();
     final BuDialogChoice dialc = new BuDialogChoice(null, TrEditorImplementation.informationsSoftware(),
-                                                    TrResource.getS("Configuration cha\xEEne de calcul"), TrResource.getS(
+            TrResource.getS("Configuration cha\xEEne de calcul"), TrResource.getS(
             "Veuillez s\xE9lectionner la cha\xEEne de calcul utilis\xE9e"), choix);
     dialc.setSize(200, 200);
     if (init != null) {
@@ -330,7 +332,6 @@
   public void openLogFrame(final File _f) {
     if (tail_ == null) {
       new CtuluTaskOperationGUI(null, FudaaLib.getS("Console")) {
-
         @Override
         public void act() {
           try {
@@ -381,7 +382,6 @@
 
     final TrPostImplementation post = (TrPostImplementation) launch(null, TrLauncherDefault.this, new TrPostImplementation());
     BuLib.invokeLater(new Runnable() {
-
       @Override
       public void run() {
         if (_f != null) {
@@ -414,7 +414,6 @@
 
     final TrPostImplementation post = (TrPostImplementation) launch(null, TrLauncherDefault.this, new TrPostImplementation());
     BuLib.invokeLater(new Runnable() {
-
       @Override
       public void run() {
         if (_f != null) {
@@ -445,7 +444,6 @@
 
     final TrPostImplementation post = (TrPostImplementation) launch(null, TrLauncherDefault.this, new TrPostImplementation());
     BuLib.invokeLater(new Runnable() {
-
       @Override
       public void run() {
         if (_f != null) {
@@ -461,7 +459,6 @@
   public void openSupervisor() {
     if (supervisor_ == null) {
       BuLib.invokeLater(new Runnable() {
-
         @Override
         public void run() {
           supervisor_ = (TrSupervisorImplementation) launch(null, TrLauncherDefault.this, new TrSupervisorImplementation());
@@ -510,7 +507,7 @@
     final TrEditorImplementation alreadyOpened = findImplWithOpenedFile(_projectFile);
     if (alreadyOpened != null) {
       alreadyOpened.warn(TrResource.getS("Ouverture"), TrResource.getS("Le fichier {0} est d\xE9j\xE0 ouvert", _projectFile.getName()),
-                         false);
+              false);
       alreadyOpened.getFrame().setVisible(true);
       alreadyOpened.getFrame().setState(Frame.NORMAL);
       alreadyOpened.getFrame().requestFocus();
@@ -518,13 +515,11 @@
 
     }
     BuLib.invokeNow(new Runnable() {
-
       @Override
       public void run() {
         final TrEditorImplementation impl = (TrEditorImplementation) launch(null, TrLauncherDefault.this,
-                                                                            new TrEditorImplementation());
+                new TrEditorImplementation());
         BuLib.invokeLater(new Runnable() {
-
           @Override
           public void run() {
             if (_projectFile != null) {

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java	2013-01-24 07:44:05 UTC (rev 8252)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java	2013-01-24 07:46:01 UTC (rev 8253)
@@ -76,29 +76,18 @@
   private final GrPolygone p_ = new GrPolygone();
   private boolean showMeshes_ = true;
   TraceBox boxNb_;
-
   GrBoite domaine_;
   TraceIcon inputIc_;
   TraceIcon outputIc_;
-
   Set ouvToDisplay_;
-
   int[] paintTempo_;
-
   List paletteId_;
-
   boolean showEdgeDesc_;
-
   boolean showEdges_ = true;
-
   boolean showElementDesc_;
-
   boolean showMeshesCenter_ = true;
-
   boolean showWorkNumber_;
-
   TraceLigne tlPoly_;
-
   TraceLigne tlPolyInterne_;
 
   public TrRubarOuvrageLayer(final TrRubarOuvrageLayerModel _m) {
@@ -542,7 +531,7 @@
     final BConfigurableInterface[] sect = new BConfigurableInterface[getNbSet() + 2];
 
     for (int i = 1; i < sect.length; i++) {
-      ZCalqueAffichageDonneesTraceConfigure traceConfigure = new ZCalqueAffichageDonneesTraceConfigure(this, i-1);
+      ZCalqueAffichageDonneesTraceConfigure traceConfigure = new ZCalqueAffichageDonneesTraceConfigure(this, i - 1);
       traceConfigure.setShowColor(false);
       traceConfigure.setShowIconType(false);
       sect[i] = traceConfigure;
@@ -648,8 +637,7 @@
 
   @Override
   /**
-   * Devrait \xEAtre remplac\xE9 par getDomaineOnSelected(). Je ne touche pas a cet ajustement, le calcul de la marge autour
-   * du zoom me semble douteux. B.M.
+   * Devrait \xEAtre remplac\xE9 par getDomaineOnSelected(). Je ne touche pas a cet ajustement, le calcul de la marge autour du zoom me semble douteux. B.M.
    */
   public GrBoite getDomaineOnSelected() {
     if (isSelectionEmpty()) {
@@ -900,7 +888,7 @@
   @Override
   public void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran, final GrBoite _clipReel) {
     if (getM().isModeElt()) {
-      super.paintSelection(_g, _trace, _versEcran, _clipReel);
+      super.doPaintSelection(_g, _trace, _versEcran, _clipReel);
       return;
     }
     if (isSelectionEmpty() || getM().isEmpty()) {
@@ -1033,7 +1021,7 @@
       getM().getElt(p_, o.getElt1());
       p_.boite(tmp);
       if ((polyEnv.contains(tmp.e_.x_, tmp.e_.y_)) && (polyEnv.contains(tmp.o_.x_, tmp.o_.y_))
-          && VecteurGrPoint.estSelectionneEnv(c, polyEnv, _poly, tester, p_.sommets_, _mode)) {
+              && VecteurGrPoint.estSelectionneEnv(c, polyEnv, _poly, tester, p_.sommets_, _mode)) {
         // on teste l'element 2
         boolean goOne = true;
         if (o.isElt2Set()) {
@@ -1050,7 +1038,7 @@
             getM().getElt(p_, o.getMailleIntern(iInt));
             p_.boite(tmp);
             if ((polyEnv.contains(tmp.e_.x_, tmp.e_.y_)) && (polyEnv.contains(tmp.o_.x_, tmp.o_.y_))
-                && !VecteurGrPoint.estSelectionneEnv(c, polyEnv, _poly, tester, p_.sommets_, _mode)) {
+                    && !VecteurGrPoint.estSelectionneEnv(c, polyEnv, _poly, tester, p_.sommets_, _mode)) {
               all = false;
             }
           }
@@ -1090,7 +1078,6 @@
    */
   @Override
   public void setForeground(final Color _v) {
-
   }
 
   /**
@@ -1116,5 +1103,4 @@
     }
     repaint();
   }
-
 }
\ No newline at end of file

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:[8252] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig/layer/FSigImageImportAction.java

From: <de...@us...> - 2013-01-24 07:44:12

Revision: 8252
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8252&view=rev
Author:   deniger
Date:     2013-01-24 07:44:05 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigImageImportAction.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigImageImportAction.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigImageImportAction.java	2013-01-23 22:57:04 UTC (rev 8251)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigImageImportAction.java	2013-01-24 07:44:05 UTC (rev 8252)
@@ -60,7 +60,7 @@
     @Override
     public void actionPerformed(final ActionEvent _e) {
       final ZCalqueImageRaster img = (ZCalqueImageRaster) visu_.getArbreCalqueModel().getSelectedCalque();
-      if (!img.getModelImage().getGeomData().isGeomModifiable()) {
+      if (img.getModelImage().getGeomData().isGeomModifiable()) {
         final FSigImageWizardTask task = new FSigImageWizardTask(visu_.getEditor().getPanel().getArbreCalqueModel());
         task.setModelToModiy(img);
         afficheWizard(task);

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:[8251] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque/edition

From: <de...@us...> - 2013-01-23 22:57:16

Revision: 8251
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8251&view=rev
Author:   deniger
Date:     2013-01-23 22:57:04 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2013-01-23 22:47:43 UTC (rev 8250)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2013-01-23 22:57:04 UTC (rev 8251)
@@ -56,7 +56,7 @@
  * @version $Id: EbliSingleObjectEditorPanel.java,v 1.10.6.2 2008-04-01 07:28:15 bmarchan Exp $
  */
 public class EbliSingleObjectEditorPanel extends CtuluDialogPanel {
-
+  
   protected boolean isGeomModifiable() {
     return this.modeleSrc_.getGeomData().isGeomModifiable();
   }
@@ -144,7 +144,7 @@
           public void modeleAdapterError(String _message) {
             setErrorText(_message);
           }
-
+          
           @Override
           public void modeleAdpaterNoError() {
             setErrorText("");
@@ -161,11 +161,11 @@
         final BuButton btUp_ = new BuButton(BuResource.BU.getIcon("monter"));
         btUp_.setToolTipText(EbliLib.getS("D\xE9cr\xE9menter l'index"));
         btUp_.setEnabled(false);
-
+        
         final BuButton btDown_ = new BuButton(BuResource.BU.getIcon("descendre"));
         btDown_.setToolTipText(EbliLib.getS("Incr\xE9menter l'index"));
         btDown_.setEnabled(false);
-
+        
         btUp_.addActionListener(new ActionListener() {
           @Override
           public void actionPerformed(ActionEvent e) {
@@ -200,11 +200,11 @@
         final BuButton btAdd_ = new BuButton(BuResource.BU.getIcon("ajouter"), EbliLib.getS("Ajouter"));
         btAdd_.setToolTipText(EbliLib.getS("Ajouter un sommet avant la s\xE9lection (ou en dernier si aucune s\xE9lection)"));
         btAdd_.setEnabled(isGeomModifiable());
-
+        
         final BuButton btDel_ = new BuButton(BuResource.BU.getIcon("enlever"), EbliLib.getS("Supprimer"));
         btDel_.setToolTipText(EbliLib.getS("Supprimer un sommet"));
         btDel_.setEnabled(false);
-
+        
         btAdd_.addActionListener(new ActionListener() {
           @Override
           public void actionPerformed(ActionEvent e) {
@@ -222,7 +222,7 @@
         });
         pnAdd.add(btAdd_);
         pnAdd.add(btDel_);
-
+        
         table_.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
           @Override
           public void valueChanged(ListSelectionEvent e) {
@@ -230,7 +230,7 @@
               return;
             }
             final boolean geomModifiable = isGeomModifiable();
-
+            
             btUp_.setEnabled(geomModifiable && table_.getSelectedRowCount() > 0);
             btDown_.setEnabled(geomModifiable && table_.getSelectedRowCount() > 0);
             btAdd_.setEnabled(geomModifiable && table_.getSelectedRowCount() <= 1);
@@ -255,7 +255,7 @@
             }
           }
         });
-
+        
         pnStructure.add(pnAdd, BuBorderLayout.WEST);
         pnStructure.add(pnOrder, BuBorderLayout.CENTER);
         pnStructure.add(modeChangement_, BuBorderLayout.EAST);
@@ -418,11 +418,12 @@
     tableRep_ = new TableRepresentation(_editAttribut, _editVertexAttribut, _defs);
     add(tableRep_, BuBorderLayout.CENTER);
   }
-
+  
   public void setDeferredModifications(boolean _active) {
     modelData_.setDeferredModifications(_active);
+    this.tableRep_.modeChangement_.setSelected(_active);
   }
-
+  
   public EbliSingleObjectTableModel getTableModel() {
     return modelData_;
   }
@@ -436,7 +437,7 @@
   public void addNewTab(String _title, BuPanel _pn) {
     if (tabbedPane_ == null) {
       tabbedPane_ = new JTabbedPane();
-
+      
       remove(tableRep_);
       tabbedPane_.add(EbliLib.getS("Table"), tableRep_);
       add(tabbedPane_, BuBorderLayout.CENTER);
@@ -490,7 +491,7 @@
     modelData_.setSource(null, -1);
     modeleSrc_.modificationDone();
   }
-
+  
   @Override
   public boolean cancel() {
     // D\xE9active le model
@@ -500,11 +501,11 @@
     }
     return super.cancel();
   }
-
+  
   public final CtuluCommandContainer getCmd() {
     return cmd_;
   }
-
+  
   public final void setCmd(final CtuluCommandContainer _cmd) {
     cmd_ = _cmd;
   }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java	2013-01-23 22:47:43 UTC (rev 8250)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java	2013-01-23 22:57:04 UTC (rev 8251)
@@ -47,15 +47,14 @@
 import org.fudaa.ebli.commun.EbliLib;
 
 /**
- * Cette classe permet d'adapter l'interface d'un ZModeleGeometry sur une g\xE9om\xE9trie sp\xE9cifique. C'est \xE0 dire que l'adapter se
- * greffe sur le mod\xE8le et selectionne une des g\xE9om\xE9tries. Toutes les m\xE9thodes propos\xE9es par cette interface seront r\xE9alis\xE9es sur
- * cette g\xE9om\xE9trie.
+ * Cette classe permet d'adapter l'interface d'un ZModeleGeometry sur une g\xE9om\xE9trie sp\xE9cifique. C'est \xE0 dire que l'adapter se greffe sur le mod\xE8le et
+ * selectionne une des g\xE9om\xE9tries. Toutes les m\xE9thodes propos\xE9es par cette interface seront r\xE9alis\xE9es sur cette g\xE9om\xE9trie.
  *
- * Ce model contient : en premi\xE8re colonne : index en seconde colonne : x en troisi\xE8me colonne : y en quatri\xE8me colonne : z (si il
- * existe et qu'il est atomique) les autres attributs atomiques dans l'ordre de la GISZoneCollection etc...
+ * Ce model contient : en premi\xE8re colonne : index en seconde colonne : x en troisi\xE8me colonne : y en quatri\xE8me colonne : z (si il existe et qu'il est
+ * atomique) les autres attributs atomiques dans l'ordre de la GISZoneCollection etc...
  *
- * Deux modes d'application des modifications sont pr\xE9sents : - un mode imm\xE9diate : les modifications sont imm\xE9diatements
- * appliqu\xE9s \xE0 la gis. - un mode diff\xE9r\xE9 : les modifications sont mises en cache et aplliqu\xE9 quand flushData() est appel\xE9.
+ * Deux modes d'application des modifications sont pr\xE9sents : - un mode imm\xE9diate : les modifications sont imm\xE9diatements appliqu\xE9s \xE0 la gis. - un
+ * mode diff\xE9r\xE9 : les modifications sont mises en cache et aplliqu\xE9 quand flushData() est appel\xE9.
  *
  * Le model se charge de mettre la g\xE9o\xE9mtrie \xE0 'Modifi\xE9' lorsque celle-ci l'est.
  *
@@ -65,8 +64,8 @@
 public class EbliSingleObjectTableModel implements TableModel {
 
   /**
-   * Classe interface permettant de faire le lien entre la classe m\xE8re et les classes g\xE9rant les \xE9tats sp\xE9cifiques. Utilisation du
-   * design pattern Stat.
+   * Classe interface permettant de faire le lien entre la classe m\xE8re et les classes g\xE9rant les \xE9tats sp\xE9cifiques. Utilisation du design pattern
+   * Stat.
    *
    * @author Emmanuel MARTIN
    * @version $Id$
@@ -86,6 +85,7 @@
 
     /**
      * Supprime les sommets d'indice donn\xE9es.
+     *
      * @param _idx Les indices, dans l'ordre croissant.
      * @param _cmd Le container de commandes.
      */
@@ -93,6 +93,7 @@
 
     /**
      * Ajoute un sommet \xE0 la g\xE9om\xE9trie
+     *
      * @param _idxBefore L'indice apr\xE8s lequel le sommet sera ins\xE9r\xE9. Si -1, le sommet est ins\xE9r\xE9 en 0.
      * @param _x La coordonn\xE9e X du sommet.
      * @param _y La coordonn\xE9e Y du sommet
@@ -144,6 +145,7 @@
     @Override
     public void setValueAt(Object value, int rowIndex, int columnIndex) {
       CtuluCommandComposite cmd = new CtuluCommandComposite(EbliLib.getS("Modification d'une g\xE9om\xE9trie"));
+      modele_.modificationWillBeDone();
       if (columnIndex == 1 || columnIndex == 2) {
         putGeomModified(cmd);
         clearError();
@@ -176,6 +178,7 @@
 
     @Override
     public void switchPoints(int _idx1, int _idx2, CtuluCommandContainer _cmd) {
+      modele_.modificationWillBeDone();
       putGeomModified(_cmd);
 
       CoordinateSequence newseq = new GISCoordinateSequenceFactory().create(coordSeq_);
@@ -218,7 +221,7 @@
       if (!(zone_ instanceof GISZoneCollectionGeometry)) {
         return;
       }
-
+      modele_.modificationWillBeDone();
       GISZoneCollectionGeometry zone = (GISZoneCollectionGeometry) zone_;
       CtuluListSelection sel = new CtuluListSelection(_idx);
       zone.removeAtomics(idxSelected_, sel, null, _cmd);
@@ -233,7 +236,7 @@
       if (!(zone_ instanceof GISZoneCollectionGeometry)) {
         return -1;
       }
-
+      modele_.modificationWillBeDone();
       GISZoneCollectionGeometry zone = (GISZoneCollectionGeometry) zone_;
       int inew = zone.addAtomic(idxSelected_, _idxBefore, _x, _y, _cmd);
       // La sequence a \xE9t\xE9 modifi\xE9e
@@ -288,7 +291,7 @@
           coordSeq_.setOrdinate(coordSeq_.size() - 1, _idxCol - 1, (Double) _value);
         }
       } else if (_idxCol > 2) {
-        modificationDone_=true;
+        modificationDone_ = true;
         lattmdls.get(_idxCol - 3).setObject(_idxRow, _value, null);
       }
 
@@ -436,8 +439,8 @@
       for (int i = 0; i < lattmdls.size(); i++) {
         final GISAttributeModel m = getModel(i);
         final GISReprojectInterpolateurI interpolateur =
-                                         GISZoneAttributeFactory.create1DInterpolateur(lattmdls.get(i).getAttribute(), coordSeq_,
-                                                                                       seq, m);
+                GISZoneAttributeFactory.create1DInterpolateur(lattmdls.get(i).getAttribute(), coordSeq_,
+                seq, m);
         lattmdls.set(i, m.deriveNewModel(seq.size(), interpolateur));
       }
 
@@ -450,6 +453,7 @@
 
   /**
    * Une classe d'adaptation du modele pour les attributs
+   *
    * @author Bertrand Marchand (mar...@de...)
    */
   public class AttributesDataModelAdapter implements ZEditionAttributesDataI {
@@ -591,6 +595,7 @@
 
     /**
      * Desactive temporairement le listener pour eviter des evenements en boucle.
+     *
      * @param _b
      */
     public void setInactive(boolean _b) {
@@ -607,7 +612,7 @@
    * @exception IllegalArgumentException si _idxSelected n'appartient pas \xE0 _zone.
    */
   public EbliSingleObjectTableModel(ZModeleEditable _modele, int _idxSelected, EbliCoordinateDefinition[] _defs,
-                                    CtuluCommandContainer _cmd, boolean _showAttributes) {
+          CtuluCommandContainer _cmd, boolean _showAttributes) {
     if ((_modele == null && _idxSelected != -1) || (_modele != null && _idxSelected != -1 && (_idxSelected < 0 || _idxSelected >= _modele.getNombre()))) {
       throw new IllegalArgumentException("L'index de g\xE9om\xE9trie n'appartient pas \xE0 la zone.");
     }
@@ -864,13 +869,14 @@
     if (modele_ == null || idxSelected_ == -1) {
       throw new IllegalArgumentException("Aucun modele ou aucune g\xE9om\xE9trie selectionn\xE9e.");
     }
-    if (value != null && !value.equals(getValueAt(rowIndex, columnIndex)) ) {
+    if (value != null && !value.equals(getValueAt(rowIndex, columnIndex))) {
       stat_.setValueAt(value, rowIndex, columnIndex);
     }
   }
 
   /**
    * Incr\xE9mente de n les index donn\xE9s. Pour d\xE9cr\xE9menter donner un indice n\xE9gatif. _idx est modifi\xE9 dans l'op\xE9ration
+   *
    * @return le tableau des nouveaux index.
    */
   public int[] movePoints(int[] _idx, int n) {
@@ -919,6 +925,7 @@
 
   /**
    * Ajoute un point avant l'indice pass\xE9 en argument.
+   *
    * @param _idxAfter L'indice. Peut \xEAtre -1, pour ajouter un point en fin de tableau.
    */
   public int addPoint(int _idxAfter) {
@@ -1063,7 +1070,7 @@
     analyzer_.clear();
 
     if (modele_.isCoordinateValid(coordSeq_, analyzer_)
-        && modele_.isDataValid(coordSeq_, getAttributDataModelAdapter(), analyzer_)) {
+            && modele_.isDataValid(coordSeq_, getAttributDataModelAdapter(), analyzer_)) {
       return null;
     } else {
       return analyzer_.getFatalError();
@@ -1103,6 +1110,7 @@
 
   /**
    * Retourne vrai si _value est dans _table
+   *
    * @param _value
    * @param _table
    * @return

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:[8250] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig/layer/FSigEditor.java

From: <de...@us...> - 2013-01-23 22:47:54

Revision: 8250
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8250&view=rev
Author:   deniger
Date:     2013-01-23 22:47:43 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java	2013-01-23 22:47:23 UTC (rev 8249)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java	2013-01-23 22:47:43 UTC (rev 8250)
@@ -106,23 +106,25 @@
   public boolean changeState(String s) {
     return super.changeState(s);
   }
-
   /**
-   * Contient l'index de l'onglet selectionn\xE9 dans le panel d'edition d'objet seul. C'est pour que d'une \xE9dition \xE0
-   * l'autre le m\xEAme onglet soit automatiquement selectionn\xE9.
+   * Contient l'index de l'onglet selectionn\xE9 dans le panel d'edition d'objet seul. C'est pour que d'une \xE9dition \xE0 l'autre le m\xEAme onglet soit
+   * automatiquement selectionn\xE9.
    */
   private int selectedTabInSingleObjectEditorPanel_ = 0;
 
   /**
    * L'\xE9dition pour un objet selectionn\xE9 unique.
-   * 
+   *
    * @param _target Le calque cible editable.
    */
   @Override
   protected void editSingleObject(final ZCalqueEditable _target) {
     final int idxSelected = ((ZCalqueAffichageDonnees) _target).getLayerSelection().getMaxIndex();
     final EbliSingleObjectEditorPanel ed = new EbliSingleObjectEditorPanel(_target.getModelEditable(), idxSelected, true, true,
-        getCoordinateDefinitions());
+            getCoordinateDefinitions());
+    if (isDeferredModificationAsDefault()) {
+      ed.setDeferredModifications(true);
+    }
     ed.setCmd(getMng());
     GISZoneCollection zone = _target.getModelEditable().getGeomData();
     GISAttributeDouble zAttr = zone.getAttributeIsZ();
@@ -137,9 +139,8 @@
   }
 
   /**
-   * L'import peut \xEAtre fait si le calque selectionn\xE9 est un groupe de calques SIG ou un calque poss\xE9dant une geometrie
-   * modifiable
-   * 
+   * L'import peut \xEAtre fait si le calque selectionn\xE9 est un groupe de calques SIG ou un calque poss\xE9dant une geometrie modifiable
+   *
    * @return true : L'import est possible, false : impossible.
    */
   public boolean canImportInSelectedLayer() {
@@ -155,10 +156,19 @@
 
   public GISPolygone[] getEnglobPolygone() {
     final GrBoite b = getPanel().getDonneesCalque().getDomaine();
-    return new GISPolygone[] { GISGeometryFactory.INSTANCE.createLinearRing(b.o_.x_, b.e_.x_, b.o_.y_, b.e_.y_) };
+    return new GISPolygone[]{GISGeometryFactory.INSTANCE.createLinearRing(b.o_.x_, b.e_.x_, b.o_.y_, b.e_.y_)};
   }
 
+  public static boolean isDeferredModificationAsDefault() {
+    return "true".equals(System.getProperty("USED_DEFERRED_AS_DEFAUT"));
+  }
+
+  public static void activeDeferredModificationAsDefault() {
+    System.setProperty("USED_DEFERRED_AS_DEFAUT", "true");
+  }
+
   private static class ZCalqueEditionGroupFromGeomLayer extends ZCalqueEditionGroup {
+
     private final ZCalqueEditable calque;
     private final CtuluCommandContainer cmd;
 
@@ -171,7 +181,7 @@
     public GISAttributeInterface[] getAttributes() {
       return calque.getModelEditable().getGeomData().getAttributes();
     }
-    
+
     @Override
     public boolean canAddNewLayer() {
       return false;
@@ -201,7 +211,6 @@
     public ZCalquePointEditable addPointLayerAct(String _title, GISZoneCollectionPoint _zone, CtuluCommandContainer _cmd) {
       return null;
     }
-
   }
 
   public void importSelectedLayer() {
@@ -298,29 +307,22 @@
     }
     final GISPoint translate = isTranslate ? new GISPoint(x, y, 0) : null;
     new CtuluRunnable(FudaaLib.getS("Export") + ' ' + parent[0].getTitle(), getUi()) {
-
       @Override
       public boolean run(ProgressionInterface _proj) {
         final CtuluIOOperationSynthese op = filter.exportTo((FSigLayerExporterI) filterExporter.get(fileChooser.getFileFilter()), getUi(), f,
-            translate, _proj);
+                translate, _proj);
         if (op != null) {
           getUi().manageErrorOperationAndIsFatal(op);
         }
         return true;
       }
-
     }.run();
 
   }
-
   EbliActionSimple[] editAction_;
-
   EbliActionSimple exportAction_;
-
   EbliActionSimple visuAction_;
-
   EbliActionSimple importAction_;
-
   EbliActionSimple joinAction_;
 
   /**
@@ -328,7 +330,7 @@
    */
   public EbliActionSimple[] getEditAction() {
     if (editAction_ == null) {
-      editAction_ = new EbliActionSimple[] { new EditAction() };
+      editAction_ = new EbliActionSimple[]{new EditAction()};
     }
     return editAction_;
   }
@@ -370,7 +372,7 @@
     public void updateStateBeforeShow() {
       final BCalque cq = FSigEditor.this.getPanel().getArbreCalqueModel().getSelectedCalque();
       super.setEnabled((cq instanceof ZCalqueAffichageDonnees) && (!((ZCalqueAffichageDonnees) cq).isSelectionEmpty())
-          && ((((ZCalqueAffichageDonnees) cq).modeleDonnees() instanceof ZModeleGeometry)));
+              && ((((ZCalqueAffichageDonnees) cq).modeleDonnees() instanceof ZModeleGeometry)));
     }
 
     @Override
@@ -445,9 +447,11 @@
       // R\xE9cup\xE9ration des calques contenant des g\xE9om\xE9tries selectionn\xE9es \\
       ZCalqueAffichageDonneesInterface[] calques = getSupport().getAllLayers();
       ArrayList<ZCalqueAffichageDonneesInterface> claquesWithSelectedObjects = new ArrayList<ZCalqueAffichageDonneesInterface>();
-      for (int i = 0; i < calques.length; i++)
-        if (!calques[i].isSelectionEmpty() && calques[i] instanceof ZCalqueEditable)
+      for (int i = 0; i < calques.length; i++) {
+        if (!calques[i].isSelectionEmpty() && calques[i] instanceof ZCalqueEditable) {
           claquesWithSelectedObjects.add(calques[i]);
+        }
+      }
       super.setEnabled(claquesWithSelectedObjects.size() > 0);
     }
 
@@ -478,7 +482,6 @@
 
   @Override
   public void attributeAction(Object _source, int att, GISAttributeInterface _att, int _action) {
-
   }
 
   @Override
@@ -501,5 +504,4 @@
   public void geometryAction(Object _source, int geom, Geometry _geom, int _action) {
     objectAction(_source, geom, _geom, _action);
   }
-
 }

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:[8249] trunk/soft/fudaa-crue/ui-planimetry/src/main/java/ org/fudaa/fudaa/crue/planimetry

From: <de...@us...> - 2013-01-23 22:47:33

Revision: 8249
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8249&view=rev
Author:   deniger
Date:     2013-01-23 22:47:23 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfigurationInfo.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/CasierConfigurationInfo.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LabelConfigurationInfo.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfigurationInfo.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationInfo.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfigurationInfo.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/SectionConfigurationInfo.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerLigneBriseeExternController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerPointExternController.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryExternDrawLayerGroup.java

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -74,6 +74,7 @@
     createFindActions();
     getVueCalque().setCheckTtranslation(false);
     ((FSigEditor) gisEditor_).setDisplayInfo(false);
+    FSigEditor.activeDeferredModificationAsDefault();
   }
 
   public PlanimetryVisuPanelConfigurer getConfigurer() {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfigurationInfo.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/BrancheConfigurationInfo.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -35,7 +35,7 @@
     iconForAtomic.setDisplayName(NbBundle.getMessage(BrancheConfigurationInfo.class,
                                                      "BrancheConfiguration.AtomicPoint.DisplayName"));
     res.add(iconForAtomic);
-    res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_BRANCHES));
+    res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_BRANCHES,false));
     res.add(createColorSheet(in));
     return res;
   }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/CasierConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/CasierConfigurationInfo.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/CasierConfigurationInfo.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -36,7 +36,7 @@
       res.add(iconForAtomic);
       iconForAtomic.setDisplayName(NbBundle.getMessage(CasierConfigurationInfo.class,
               "CasierConfiguration.AtomicPoint.DisplayName"));
-      res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_CASIERS));
+      res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_CASIERS,false));
     } catch (Exception exception) {
       Exceptions.printStackTrace(exception);
     }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LabelConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LabelConfigurationInfo.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LabelConfigurationInfo.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -1,5 +1,6 @@
 package org.fudaa.fudaa.crue.planimetry.configuration;
 
+import java.awt.Color;
 import org.fudaa.fudaa.crue.common.config.ConfigurationInfoHelper;
 import org.fudaa.fudaa.crue.planimetry.configuration.editor.LabelAlignmentPropertyEditorSupport;
 import java.awt.Font;
@@ -62,11 +63,11 @@
     return get.containsNumber(value);
   }
 
-  public static Sheet.Set createSet(LabelConfiguration in, String prefix) {
-    return createSet(in, prefix, null);
+  public static Sheet.Set createSet(LabelConfiguration in, String prefix, boolean addColor) {
+    return createSet(in, prefix, null, addColor);
   }
 
-  public static Sheet.Set createSet(LabelConfiguration in, String prefix, Node.Property<?> first) {
+  public static Sheet.Set createSet(LabelConfiguration in, String prefix, Node.Property<?> first, boolean addColor) {
     Sheet.Set set = Sheet.createPropertiesSet();
     if (first != null) {
       set.put(first);
@@ -79,6 +80,9 @@
       set.put(createDistance(in));
       set.put(createFont(in));
       set.put(createLabelAlignment(in));
+      if (addColor) {
+        set.put(createTextColor(in));
+      }
     } catch (NoSuchMethodException noSuchMethodException) {
       Exceptions.printStackTrace(noSuchMethodException);
     }
@@ -106,6 +110,12 @@
     return res;
   }
 
+  private static Reflection createTextColor(LabelConfiguration in) throws NoSuchMethodException {
+    PropertySupport.Reflection res = ConfigurationInfoHelper.create(LabelConfiguration.PROP_TEXT_COLOR,
+            Color.class, in, VisuConfigurationInfo.class);
+    return res;
+  }
+
   private static Reflection createLabelAlignment(LabelConfiguration in) throws NoSuchMethodException {
     PropertySupport.Reflection res = ConfigurationInfoHelper.create(LabelConfiguration.PROP_ALIGMNENT,
             Integer.TYPE, in, VisuConfigurationInfo.class);

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfigurationInfo.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LigneBriseeConfigurationInfo.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -25,7 +25,7 @@
     res.add(set);
     res.add(TraceIconModelConfigurationInfo.createSet(in.icon, PREFIX_LINE));
     res.add(TraceLineModelConfigurationInfo.createSet(in.line, PREFIX_LINE, true));
-    res.add(LabelConfigurationInfo.createSet(in.labelConfiguration, PREFIX_LINE));
+    res.add(LabelConfigurationInfo.createSet(in.labelConfiguration, PREFIX_LINE, true));
     return res;
   }
 }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationInfo.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/NodeConfigurationInfo.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -31,7 +31,7 @@
       PropertySupport.Reflection displayCasierName = ConfigurationInfoHelper.create(NodeConfiguration.PROP_DISPLAY_CASIER_NAME,
               Boolean.TYPE, in,
               "NodeConfiguration.DisplayCasierName", VisuConfigurationInfo.class);
-      res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_NODES, displayCasierName));
+      res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_NODES, displayCasierName, false));
     } catch (NoSuchMethodException noSuchMethodException) {
       Exceptions.printStackTrace(noSuchMethodException);
     }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfigurationInfo.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/PointConfigurationInfo.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -6,8 +6,9 @@
 import org.openide.util.NbBundle;
 
 /**
- ** Attention. Les name des set sont utilisés pour la persistence dans le xml. Donc, ne pas changer sans rejouer les tests
- * unitaires et faire des reprises
+ ** Attention. Les name des set sont utilisés pour la persistence dans le xml. Donc, ne pas changer sans rejouer les tests unitaires et faire des
+ * reprises
+ *
  * @author deniger ( genesis)
  */
 public class PointConfigurationInfo {
@@ -23,7 +24,7 @@
     set.setShortDescription(set.getDisplayName());
     res.add(set);
     res.add(TraceIconModelConfigurationInfo.createSet(in.iconModel, PREFIX_POINTS));
-    res.add(LabelConfigurationInfo.createSet(in.labelConfiguration, PREFIX_POINTS));
+    res.add(LabelConfigurationInfo.createSet(in.labelConfiguration, PREFIX_POINTS, true));
 
     return res;
   }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/SectionConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/SectionConfigurationInfo.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/SectionConfigurationInfo.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -30,7 +30,7 @@
     set.setShortDescription(set.getDisplayName());
     res.add(set);
     res.add(TraceIconModelConfigurationInfo.createSet(in.iconModel, PREFIX_SECTIONS));
-    res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_SECTIONS));
+    res.add(LabelConfigurationInfo.createSet(in.getLabelConfiguration(), PREFIX_SECTIONS, false));
     res.add(createColorSheet(in));
     return res;
   }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -42,7 +42,7 @@
       //label nom de section
       final Reflection createSectionNamePosition = createSectionNamePosition(in);
       final Set labelSection = LabelConfigurationInfo.createSet(in.getSectionLabelConfiguration(), PREFIX_TRACES,
-              createSectionNamePosition);
+              createSectionNamePosition, false);
       labelSection.put(createSectionNamePosition);
       labelSection.setDisplayName(NbBundle.getMessage(TraceConfigurationInfo.class, "TraceConfiguration.LabelSection.DisplayName", VisuConfigurationInfo.class));
       labelSection.setShortDescription(labelSection.getDisplayName());
@@ -56,7 +56,7 @@
 
 
       //label des lits
-      final Set labelLits = LabelConfigurationInfo.createSet(in.getLitLabelConfiguration(), PREFIX_TRACES + ".lits");
+      final Set labelLits = LabelConfigurationInfo.createSet(in.getLitLabelConfiguration(), PREFIX_TRACES + ".lits", false);
       labelLits.setDisplayName(NbBundle.getMessage(TraceConfigurationInfo.class, "TraceConfiguration.LabelLits.DisplayName", VisuConfigurationInfo.class));
       res.add(labelLits);
     } catch (NoSuchMethodException ex) {

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -24,20 +24,20 @@
  * @author Frederic Deniger
  */
 public abstract class AbstractGroupExternController<T extends AbstractPlanimetryExternLayerGroup> extends Observable implements LayerController {
-
+  
   public static final String PROPERTY_LAYER_ADDED = "LayerAdded";
   public static final String PROPERTY_LAYER_REMOVED = "LayerRemoved";
   CalqueAddRemoveListener calquesListener;
   boolean editable;
   protected final PlanimetryController controller;
   private final T groupLayer;
-
+  
   public AbstractGroupExternController(PlanimetryController controller, T groupLayer) {
     this.controller = controller;
     this.groupLayer = groupLayer;
     createCalqueListener();
   }
-
+  
   public BCalque addAdditionalLayer(PlanimetryAdditionalLayerContrat layer) {
     BCalque calque = (BCalque) layer;
     //nom unique
@@ -47,16 +47,17 @@
     } else if (calque instanceof ZCalqueLigneBriseeEditable) {
       ((ZCalqueLigneBriseeEditable) calque).setEditor(controller.getVisuPanel().getEditor());
     }
+    layer.getLayerController().init(getHelper());
     layer.installed();
     groupLayer.enDernier(calque);
     return calque;
   }
-
+  
   public void addAdditionnalLayer(List<PlanimetryAdditionalLayerContrat> additionnalLayer) {
     for (PlanimetryAdditionalLayerContrat layer : additionnalLayer) {
       addAdditionalLayer(layer);
     }
-
+    
   }
 
   /**
@@ -65,46 +66,46 @@
    */
   public List<PlanimetryAdditionalLayerContrat> getAdditionnalLayers() {
     BCalque[] calques = getGroupLayer().getCalques();
-
+    
     List<PlanimetryAdditionalLayerContrat> res = new ArrayList<PlanimetryAdditionalLayerContrat>();
     for (BCalque bCalque : calques) {
       res.add((PlanimetryAdditionalLayerContrat) bCalque);
     }
     return res;
   }
-
+  
   @Override
   public void cancel() {
   }
-
+  
   @Override
   public void changeDone() {
   }
-
+  
   @Override
   public void changeWillBeDone() {
   }
-
+  
   public T getGroupLayer() {
     return groupLayer;
   }
-
+  
   @Override
   public boolean isEditable() {
     return editable;
   }
-
+  
   @Override
   public void saveDone() {
   }
-
+  
   protected final void createCalqueListener() {
     if (calquesListener == null) {
       calquesListener = new CalqueAddRemoveListener();
       getGroupLayer().addContainerListener(calquesListener);
     }
   }
-
+  
   public void setArbreEditable(boolean editable) {
     this.editable = editable;
     getGroupLayer().setArbreEditable(editable);
@@ -113,31 +114,39 @@
       planimetryAdditionalLayerContrat.getLayerController().setEditable(editable);
     }
   }
-
+  
+  public PlanimetryControllerHelper getHelper() {
+    return controller.getHelper();
+  }
+  
   @Override
   public void init(PlanimetryControllerHelper helper) {
+    List<PlanimetryAdditionalLayerContrat> additionnalLayers = getAdditionnalLayers();
+    for (PlanimetryAdditionalLayerContrat planimetryAdditionalLayerContrat : additionnalLayers) {
+      planimetryAdditionalLayerContrat.getLayerController().init(helper);
+    }
   }
 
   //ne fait rien car les actions de ce groupe sont controllees par l'arbre.
   @Override
   public void setEditable(boolean editable) {
   }
-
+  
   @Override
   public void setVisuConfiguration(VisuConfiguration cloned) {
   }
-
+  
   private class CalqueAddRemoveListener implements ContainerListener, PropertyChangeListener {
-
+    
     public CalqueAddRemoveListener() {
     }
-
+    
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
       AbstractGroupExternController.this.setChanged();
       AbstractGroupExternController.this.notifyObservers(evt.getPropertyName());
     }
-
+    
     @Override
     public void componentAdded(ContainerEvent e) {
       final BCalque c = (BCalque) e.getChild();
@@ -146,7 +155,7 @@
       AbstractGroupExternController.this.setChanged();
       AbstractGroupExternController.this.notifyObservers(PROPERTY_LAYER_ADDED);
     }
-
+    
     @Override
     public void componentRemoved(ContainerEvent e) {
       final BCalque c = (BCalque) e.getChild();

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerLigneBriseeExternController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerLigneBriseeExternController.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerLigneBriseeExternController.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -37,10 +37,6 @@
   }
 
   @Override
-  public void init(PlanimetryControllerHelper helper) {
-  }
-
-  @Override
   public void resetModification() {
     super.resetModification();
     cloned = null;
@@ -53,7 +49,7 @@
 
   @Override
   public void changeWillBeDone() {
-    super.cloneDataIfNeeded();
+    super.changeWillBeDone();
     if (cloned == null) {
       LigneBriseeConfiguration layerConfiguration = layer.getLayerConfiguration();
       Cloner cloner = new Cloner();

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerPointExternController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerPointExternController.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerPointExternController.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -48,7 +48,7 @@
 
   @Override
   public void changeWillBeDone() {
-    super.cloneDataIfNeeded();
+    super.changeWillBeDone();
     if (cloned == null) {
       PointConfiguration layerConfiguration = layer.getLayerConfiguration();
       Cloner cloner = new Cloner();

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryExternDrawLayerGroup.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryExternDrawLayerGroup.java	2013-01-23 22:45:35 UTC (rev 8248)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryExternDrawLayerGroup.java	2013-01-23 22:47:23 UTC (rev 8249)
@@ -43,6 +43,7 @@
           final CtuluCommandContainer _cmd) {
     final PlanimetryPointExternModifiableLayer layer = GroupExternDrawController.createLayerPoints(_zone, getGisEditor());
     layer.setName(BGroupeCalque.findUniqueChildName(this, "point"));
+    layer.getLayerController().init(controller.getHelper());
     layer.setTitle(_title);
     finishActionCreation(this, _cmd, layer, false);
     return layer;
@@ -53,6 +54,7 @@
     final PlanimetryLigneBriseeExternModifiableLayer layer = GroupExternDrawController.createLayerLignes(_zone, getGisEditor());
     layer.setName(BGroupeCalque.findUniqueChildName(this, "poly"));
     layer.setTitle(_title);
+    layer.getLayerController().init(controller.getHelper());
     finishActionCreation(this, _cmd, layer, false);
     return layer;
   }

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:[8248] trunk/framework

From: <de...@us...> - 2013-01-23 22:45:44

Revision: 8248
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8248&view=rev
Author:   deniger
Date:     2013-01-23 22:45:35 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java	2013-01-23 21:45:29 UTC (rev 8247)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java	2013-01-23 22:45:35 UTC (rev 8248)
@@ -43,6 +43,7 @@
 import com.memoire.fu.FuLog;
 import com.vividsolutions.jts.geom.Geometry;
 import java.util.Date;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.gis.GISDataModelFeatureAdapter;
 
@@ -214,9 +215,9 @@
             StringBuilder sb = new StringBuilder();
             if (value instanceof GISAttributeModel) {
               GISAttributeModel md = (GISAttributeModel) value;
-              sb.append('{').append(StringUtils.replace(md.getObjectValueAt(0).toString(), GISDataModelFeatureAdapter.VALUE_SEPARATOR, GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING));
+              sb.append('{').append(StringUtils.replace(ObjectUtils.toString(md.getObjectValueAt(0)), GISDataModelFeatureAdapter.VALUE_SEPARATOR, GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING));
               for (int k = 1; k < md.getSize(); k++) {
-                sb.append(',').append(StringUtils.replace(md.getObjectValueAt(k).toString(), GISDataModelFeatureAdapter.VALUE_SEPARATOR, GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING));
+                sb.append(',').append(StringUtils.replace(ObjectUtils.toString(md.getObjectValueAt(k)), GISDataModelFeatureAdapter.VALUE_SEPARATOR, GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING));
               }
               sb.append('}');
             } else if (value != null) {

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2013-01-23 21:45:29 UTC (rev 8247)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2013-01-23 22:45:35 UTC (rev 8248)
@@ -419,6 +419,10 @@
     add(tableRep_, BuBorderLayout.CENTER);
   }
 
+  public void setDeferredModifications(boolean _active) {
+    modelData_.setDeferredModifications(_active);
+  }
+
   public EbliSingleObjectTableModel getTableModel() {
     return modelData_;
   }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java	2013-01-23 21:45:29 UTC (rev 8247)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java	2013-01-23 22:45:35 UTC (rev 8248)
@@ -288,6 +288,7 @@
           coordSeq_.setOrdinate(coordSeq_.size() - 1, _idxCol - 1, (Double) _value);
         }
       } else if (_idxCol > 2) {
+        modificationDone_=true;
         lattmdls.get(_idxCol - 3).setObject(_idxRow, _value, null);
       }
 

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

[Fudaa-svn-commit] SF.net SVN: fudaa:[8247] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig

From: <de...@us...> - 2013-01-23 21:45:38

Revision: 8247
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8247&view=rev
Author:   deniger
Date:     2013-01-23 21:45:29 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java

Added Paths:
-----------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigLoadResultToAtomicProcess.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java	2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java	2013-01-23 21:45:29 UTC (rev 8247)
@@ -53,7 +53,7 @@
 
 /**
  * Une implementation d'un groupe de calques GIS. Il peut contenir des calques SIG points ou polylignes, avec attributs.
- * 
+ *
  * @author Fred Deniger
  * @version $Id$
  */
@@ -64,6 +64,7 @@
    * @version $Id$
    */
   static final class CommandForLayerCreation implements CtuluCommand {
+
     private final BCalque parent_;
     private final ZCalqueAffichageDonnees la_;
 
@@ -91,16 +92,17 @@
    * @author fred deniger
    * @version $Id$
    */
-  static final class NewNamePanel extends CtuluDialogPanel {
+  public static final class NewNamePanel extends CtuluDialogPanel {
+
     /**
-     * 
+     *
      */
     private final BuTextField ft_;
 
     /**
      * @param _ft
      */
-    NewNamePanel(final BuTextField _ft) {
+    public NewNamePanel(final BuTextField _ft) {
       ft_ = _ft;
     }
 
@@ -114,35 +116,26 @@
       return true;
     }
   }
-
   int grIdx_;
-
   EbliActionInterface actionAddGroup_;
-
- protected EbliActionInterface actionAddPoint_;
-
- protected EbliActionInterface actionAddPoly_;
-
+  protected EbliActionInterface actionAddPoint_;
+  protected EbliActionInterface actionAddPoly_;
   EbliActionInterface actionModifyAtt_;
-
   transient FSigAttibuteTypeManager att_;
-
   GISAttributeInterface[] attributes_;
-
   // final boolean canAddGroup_;
-
   protected transient final FSigVisuPanel visu_;
 
   FSigLayerGroup(final FSigVisuPanel _impl, final EbliActionInterface _actPoint, final EbliActionInterface _actPoly,
-      final EbliActionInterface _modifyAttributes) {
+          final EbliActionInterface _modifyAttributes) {
     // canAddGroup_ = false;
     visu_ = _impl;
     att_ = visu_.getAttributeMng();
     actionAddPoly_ = _actPoly;
     actionAddPoint_ = _actPoint;
     actionModifyAtt_ = _modifyAttributes;
-    setActions(new EbliActionInterface[] { actionAddPoly_, actionAddPoint_, null, actionModifyAtt_, null,
-        visu_.getEditor().getExportAction(), visu_.getEditor().getImportAction() });
+    setActions(new EbliActionInterface[]{actionAddPoly_, actionAddPoint_, null, actionModifyAtt_, null,
+              visu_.getEditor().getExportAction(), visu_.getEditor().getImportAction()});
   }
 
   /**
@@ -160,7 +153,7 @@
     buildAddPoint();
     buildAddPoly();
     buildModifyAtt();
-    setActions(new EbliActionInterface[] { actionAddGroup_, null, visu_.getEditor().getExportAction() });
+    setActions(new EbliActionInterface[]{actionAddGroup_, null, visu_.getEditor().getExportAction()});
     att_ = visu_.getAttributeMng();
     attributes_ = _att;
   }
@@ -170,7 +163,7 @@
   }
 
   public FSigLayerGroup addGroupAct(final String _title, final BCalque _parent, final boolean _enPremier,
-      final GISAttributeInterface[] _att) {
+          final GISAttributeInterface[] _att) {
     /*
      * if (!canAddGroup_) { return null; }
      */
@@ -198,7 +191,6 @@
     visu_.getEditor().updatePalette();
 
   }
-
   /**
    * Pour le titre propose par d\xE9faut d'un calque de lignes bris\xE9es.
    */
@@ -210,7 +202,7 @@
 
   protected String askForName(final String _title, final boolean _poly) {
     final BuTextField ft = new BuTextField(CtuluLib.getS("Nouveau")
-        + CtuluLibString.getEspaceString(_poly ? idxPoly_ : idxPt_));
+            + CtuluLibString.getEspaceString(_poly ? idxPoly_ : idxPt_));
     ft.setColumns(12);
     final CtuluDialogPanel pn = new NewNamePanel(ft);
     pn.addLabel(BuResource.BU.getString("Nom"));
@@ -243,14 +235,18 @@
     }
   }
 
+  protected void setAttributes(GISAttributeInterface[] attributes_) {
+    this.attributes_ = attributes_;
+  }
+
   protected void buildModifyAtt() {
     if (actionModifyAtt_ == null) {
       actionModifyAtt_ = new FSigLayerAction.ModifyAttributeAction(visu_.getArbreCalqueModel());
     }
   }
 
-  private void finishActionCreation(final BCalque _parent, final CtuluCommandContainer _cmd,
-      final ZCalqueAffichageDonnees _la, final boolean _addCancel) {
+  protected void finishActionCreation(final BCalque _parent, final CtuluCommandContainer _cmd,
+          final ZCalqueAffichageDonnees _la, final boolean _addCancel) {
     final List action = new ArrayList(5);
     action.addAll(Arrays.asList(visu_.getEditor().getEditAction()));
     action.add(visu_.getEditor().getActionDelete());
@@ -276,12 +272,12 @@
 
   @Override
   public ZCalqueLigneBrisee addLigneBriseeLayerAct(final String _title, final GISZoneCollectionLigneBrisee _zone,
-      final CtuluCommandContainer _cmd) {
+          final CtuluCommandContainer _cmd) {
     return addLigneBriseeLayerAct(_title, new ZModeleLigneBriseeEditable(_zone), _cmd);
   }
 
   public ZCalqueLigneBrisee addLigneBriseeLayerAct(final String _title, final ZModeleLigneBriseeEditable _model,
-      final CtuluCommandContainer _cmd) {
+          final CtuluCommandContainer _cmd) {
     final ZCalqueLigneBriseeEditable la = new FSigLayerLineEditable(_model, visu_.getEditor());
     la.setName(BGroupeCalque.findUniqueChildName(this, "poly"));
     la.setTitle(_title);
@@ -295,12 +291,12 @@
 
   @Override
   public ZCalquePointEditable addPointLayerAct(final String _title, final GISZoneCollectionPoint _zone,
-      final CtuluCommandContainer _cmd) {
+          final CtuluCommandContainer _cmd) {
     return addPointLayerAct(_title, new ZModelePointEditable(_zone), _cmd);
   }
 
   public ZCalquePointEditable addPointLayerAct(final String _title, final ZModelePointEditable _modele,
-      final CtuluCommandContainer _cmd) {
+          final CtuluCommandContainer _cmd) {
     final FSigLayerPointEditable la = new FSigLayerPointEditable(_modele, visu_.getEditor());
     la.setName(BGroupeCalque.findUniqueChildName(this, "point"));
     la.setTitle(_title);
@@ -337,7 +333,6 @@
     basicDetruire(_c);
     if (idx >= 0) {
       getCmdMng().addCmd(new CtuluCommand() {
-
         @Override
         public void redo() {
           FSigLayerGroup.this.basicDetruire(_c);
@@ -348,7 +343,6 @@
           FSigLayerGroup.this.add(_c, idx);
 
         }
-
       });
 
     }
@@ -365,7 +359,6 @@
   /*
    * public final boolean isCanAddGroup() { return canAddGroup_; }
    */
-
   @Override
   public boolean isTitleModifiable() {
     return true;
@@ -377,7 +370,9 @@
   }
 
   public static void editFor(final FSigLayerGroup _layer) {
-    if (_layer == null) { return; }
+    if (_layer == null) {
+      return;
+    }
     final FSigAttributeTableModel model = new FSigAttributeTableModel(_layer.getAttributes(), true);
     final CtuluListEditorPanel panel = model.buildEditor();
     final CtuluDialogPanel pn = new CtuluDialogPanel();
@@ -388,9 +383,10 @@
       final BCalque[] cq = _layer.getCalques();
       final GISAttributeInterface[] att = model.getAttributes();
       final Map newName = model.getRenamedAttribute();
-      if (Arrays.equals(att, _layer.attributes_) && newName.size() == 0) { return; }
+      if (Arrays.equals(att, _layer.attributes_) && newName.size() == 0) {
+        return;
+      }
       final CtuluCommandComposite cmp = new CtuluCommandComposite() {
-
         @Override
         protected void actionToDoAfterUndoOrRedo() {
           _layer.visu_.getArbreCalqueModel().fireObservableChanged();
@@ -404,7 +400,7 @@
       };
       for (int i = 0; i < cq.length; i++) {
         if (cq[i] instanceof ZCalqueAffichageDonneesInterface
-            && ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees() instanceof ZModeleGeometry) {
+                && ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees() instanceof ZModeleGeometry) {
           final ZModeleGeometry donnees = (ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees();
           donnees.getGeomData().setAttributes(att, cmp);
         }
@@ -412,7 +408,6 @@
       final GISAttributeInterface[] old = _layer.attributes_;
       _layer.attributes_ = att;
       cmp.addCmd(new CtuluCommand() {
-
         @Override
         public void redo() {
           _layer.attributes_ = att;
@@ -424,14 +419,12 @@
           _layer.attributes_ = old;
 
         }
-
       });
 
       final boolean changed = FSigAttributeTableModel.rename(newName);
       if (changed) {
 
         cmp.addCmd(new CtuluCommand() {
-
           @Override
           public void redo() {
             FSigAttributeTableModel.rename(newName);
@@ -442,7 +435,6 @@
           public void undo() {
             FSigAttributeTableModel.rename(newName);
           }
-
         });
       }
       if (cmp.getNbCmd() > 0) {
@@ -460,11 +452,10 @@
 
   /**
    * On autorise la modification du manager d'attribut
-   * 
+   *
    * @param _att the att to set
    */
   public void setAtt(FSigAttibuteTypeManager _att) {
     att_ = _att;
   }
-
 }

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java	2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java	2013-01-23 21:45:29 UTC (rev 8247)
@@ -30,5 +30,6 @@
   public BCalquePersistenceInterface getPersistenceMng() {
     return new FSigLayerLinePersistence();
   }
+  
 
 }

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java	2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java	2013-01-23 21:45:29 UTC (rev 8247)
@@ -45,13 +45,9 @@
 
   GISAttributeInterface[] atts_;
   Object[][] cacheAtt_;
-
   final FeatureType features_;
-
   Geometry[] geoms_;
-
   int[] idxInSrc_;
-
   int nbGeom_ = -1;
   final FeatureSource src_;
 
@@ -65,15 +61,14 @@
     features_ = src_.getSchema();
     updateNumGeom(_progress);
   }
-  
+
   @Override
   public GISDataModel createTranslate(GISPoint xyToAdd) {
-    if(xyToAdd==null){
+    if (xyToAdd == null) {
       return this;
     }
     return new GisDataModelTranslated(this, xyToAdd);
   }
-  
 
   /**
    * @param _factory l'usine de dataStore
@@ -82,7 +77,7 @@
    * @throws IOException
    */
   public FSigDataModelStoreAdapter(final FileDataStoreFactorySpi _factory, final File _f,
-      final ProgressionInterface _progress) throws IOException {
+          final ProgressionInterface _progress) throws IOException {
     final DataStore dataStore = _factory.createDataStore(_f.toURI().toURL());
     final String[] name = dataStore.getTypeNames();
     if (name == null || name.length == 0) {
@@ -186,7 +181,6 @@
    * 0; i--) { r[i] = feature.getAttribute(idxInSrc_[i]); } return r; } } catch (final Exception e) { if
    * (FuLog.isTrace()) FuLog.warning(e); } finally { if (it != null) it.close(); } return null; }
    */
-
   protected void replacePolygonWithLine(final int _i) {
     geoms_[_i] = ((Polygon) geoms_[_i]).getExteriorRing();
   }
@@ -426,5 +420,4 @@
     }
 
   }
-
 }

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java	2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java	2013-01-23 21:45:29 UTC (rev 8247)
@@ -22,36 +22,49 @@
 import org.fudaa.fudaa.sig.FSigGeomSrcData;
 
 /**
- * Une classe contenant des objets GIS import\xE9s depuis un ou plusieurs fichiers contenant des
- * informations GIS. Cette classe est charg\xE9e par l'interface de chargement 
- * {@link FSigFileLoaderI}, qui peut \xEAtre appel\xE9e plusieurs fois de facon iterative.
- * 
+ * Une classe contenant des objets GIS import\xE9s depuis un ou plusieurs fichiers contenant des informations GIS. Cette classe est charg\xE9e par
+ * l'interface de chargement {@link FSigFileLoaderI}, qui peut \xEAtre appel\xE9e plusieurs fois de facon iterative.
+ *
  * @author Fred Deniger
  * @version $Id: FSigFileLoadResult.java,v 1.1.6.2 2008-04-01 17:11:49 bmarchan Exp $
  */
 public class FSigFileLoadResult {
 
   private boolean first_ = true;
-
   public Set<GISAttributeInterface> allAttribute_ = new HashSet<GISAttributeInterface>();
   public Set<GISAttributeInterface> attribute_ = new HashSet<GISAttributeInterface>();
-  
-  /** La somme des points contenus dans tous les mod\xE8les de points */
+  /**
+   * La somme des points contenus dans tous les mod\xE8les de points
+   */
   public int nbPoint_;
-  /** La somme des points contenus dans tous les mod\xE8les (points, polylignes, polygones, etc.) */
+  /**
+   * La somme des points contenus dans tous les mod\xE8les (points, polylignes, polygones, etc.)
+   */
   public int nbPointTotal_;
-  /** La somme des polygones contenus dans tous les mod\xE8les de polygones */
+  /**
+   * La somme des polygones contenus dans tous les mod\xE8les de polygones
+   */
   public int nbPolygones_;
-  /** La somme des poylignes contenus dans tous les mod\xE8les de polylignes */
+  /**
+   * La somme des poylignes contenus dans tous les mod\xE8les de polylignes
+   */
   public int nbPolylignes_;
-  /** La liste des mod\xE8les {@link GISDataModel} de polylignes */
+  /**
+   * La liste des mod\xE8les {@link GISDataModel} de polylignes
+   */
   public List<GISDataModel> ligneModel_ = new ArrayList<GISDataModel>();
-  /** La liste des mod\xE8les {@link GISDataModel} de points */
+  /**
+   * La liste des mod\xE8les {@link GISDataModel} de points
+   */
   public List<GISDataModel> pointModel_ = new ArrayList<GISDataModel>();
-  /** La liste des mod\xE8les {@link GISDataModel} de polygones */
+  /**
+   * La liste des mod\xE8les {@link GISDataModel} de polygones
+   */
   public List<GISDataModel> polygoneModel_ = new ArrayList<GISDataModel>();
-  /** La liste des mod\xE8les {@link GISDataModel} de multipoints */
-  
+
+  /**
+   * La liste des mod\xE8les {@link GISDataModel} de multipoints
+   */
   public void addUsedAttributes(final GISAttributeInterface[] _att) {
     if (_att == null) {
       return;
@@ -84,6 +97,20 @@
     return res;
   }
 
+  /**
+   * permet de prendre en compte les attributs atomiques stock\xE9s comme tableau dans les attributs globaux.
+   *
+   * @return
+   */
+  public FSigGeomSrcData createDataWithAtomic() {
+    if (isEmpty()) {
+      return null;
+    }
+    final FSigGeomSrcData res = createData();
+    FSigLoadResultToAtomicProcess process = new FSigLoadResultToAtomicProcess();
+    return process.transform(res);
+  }
+
   public GISAttributeInterface findOrCreateAttribute(final H2dVariableType _t, final boolean _isAtomic) {
     if (_t == H2dVariableType.BATHYMETRIE && _isAtomic) {
       allAttribute_.add(GISAttributeConstants.BATHY);
@@ -102,7 +129,7 @@
     GISAttributeInterface res = findAttributes(_name, _data, _isAtomic);
     if (res == null) {
       res = GISLib.createAttributeFrom(_name, _data, _isAtomic);
-      if(res!=null) {
+      if (res != null) {
         allAttribute_.add(res);
       }
     }

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java	2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java	2013-01-23 21:45:29 UTC (rev 8247)
@@ -276,7 +276,7 @@
       }
     }
     super.valideData();
-    return res == null ? null : res.createData();
+    return res == null ? null : res.createDataWithAtomic();
   }
 
   /**

Added: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigLoadResultToAtomicProcess.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigLoadResultToAtomicProcess.java	                        (rev 0)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigLoadResultToAtomicProcess.java	2013-01-23 21:45:29 UTC (rev 8247)
@@ -0,0 +1,72 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.sig.wizard;
+
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISDataModel;
+import org.fudaa.ctulu.gis.GISDataModelAttributeToAtomicSubstitutionAdapter;
+import org.fudaa.ctulu.gis.GISLib;
+import org.fudaa.fudaa.sig.FSigGeomSrcData;
+
+/**
+ * Permet de transformer les attributs d'un chargement en atomique.
+ *
+ * @author Frederic Deniger
+ */
+public class FSigLoadResultToAtomicProcess {
+
+  private GISDataModel transform(GISDataModel gisDataModel) {
+    GISDataModel res = gisDataModel;
+    int nbAttributes = gisDataModel.getNbAttributes();
+    for (int i = 0; i < nbAttributes; i++) {
+      GISAttributeInterface attribute = gisDataModel.getAttribute(i);
+      GISAttributeInterface target = null;
+      if (!attribute.isAtomicValue()) {
+        target = GISLib.createAttributeFrom(attribute.getName(), attribute.getDataClass());
+        if (!target.isAtomicValue()) {
+          target = null;
+        }
+      }
+      if (target != null) {
+        res = new GISDataModelAttributeToAtomicSubstitutionAdapter(res, attribute, target);
+      }
+    }
+    return res;
+  }
+
+  public FSigGeomSrcData transform(FSigGeomSrcData init) {
+    FSigGeomSrcData res = new FSigGeomSrcData();
+    res.setNbPoints(init.getNbPoints());
+    res.setNbPointsTotal(init.getNbPointsTotal());
+    res.setNbPolygones(init.getNbPolygones());
+    res.setNbPolylignes(init.getNbPolylignes());
+    //doit on transformer les points
+    res.setPoints(init.getPoints());
+    res.setPolygones(transformPolygons(init));
+    res.setPolylignes(transformPolylines(init));
+
+    return res;
+
+  }
+
+  public GISDataModel[] transformPolygons(FSigGeomSrcData init) {
+    GISDataModel[] polygones = init.getPolygones();
+    GISDataModel[] targetPolygones = new GISDataModel[polygones.length];
+    for (int i = 0; i < targetPolygones.length; i++) {
+      targetPolygones[i] = transform(polygones[i]);
+    }
+    return targetPolygones;
+
+  }
+
+  public GISDataModel[] transformPolylines(FSigGeomSrcData init) {
+    GISDataModel[] polylines = init.getPolylignes();
+    GISDataModel[] targetPolylines = new GISDataModel[polylines.length];
+    for (int i = 0; i < targetPolylines.length; i++) {
+      targetPolylines[i] = transform(polylines[i]);
+    }
+    return targetPolylines;
+
+  }
+}

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:[8244] trunk/soft/fudaa-prepro/ui/src/main

From: <de...@us...> - 2013-01-23 09:10:19

Revision: 8244
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8244&view=rev
Author:   deniger
Date:     2013-01-23 09:10:10 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionBilan.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java
    trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java	2013-01-22 17:00:30 UTC (rev 8243)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java	2013-01-23 09:10:10 UTC (rev 8244)
@@ -81,37 +81,29 @@
 
 /**
  * InternalFrame qui contient la scene EbliScene.
- * 
+ *
  * @author Adrien Hadoux
  */
 public class TrPostLayoutFille extends BuInternalFrame implements CtuluFilleWithComponent, CtuluUndoRedoInterface, BuUndoRedoInterface,
-    BuCutCopyPasteInterface, CtuluSelectionInterface, EbliWidgetEditModeListener, CtuluImageProducer, EbliPageable, CtuluExportDataInterface {
+        BuCutCopyPasteInterface, CtuluSelectionInterface, EbliWidgetEditModeListener, CtuluImageProducer, EbliPageable, CtuluExportDataInterface {
 
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = -2769884291563880931L;
-
   /**
    * scene de l internalFrame.
    */
   // final private EbliScene scene_;
   public TrPostLayoutPanelController controller_;
-
   final JComponent defaultSouth_ = new JLabel(TrResource.getS("Details:"));
-
   private EbliPageableDelegate delegueImpression_;
-
   boolean ecrasePrevious_ = true;
-
   JComponent editorEnCours_;
   BuInformationsDocument id_;
   BuMenu menuLayoutManager_;
-
   JMenuBar menuModifiable_ = new BuMenuBar();
-
   JMenu[] menus_;
-
   Dimension oldSize_;
   /**
    * Scroll qui contient le tree a droite. Ce panel est modifi\xE9 des que l on change de type d elements.
@@ -121,24 +113,18 @@
    * palette d infos pour le calque associe.
    */
   JComponent palette_;
-
   /**
    * Panel qui contient le tree modifiable
    */
   // JPanel conteneurTree_;
   JComponent panelSouthSuiviSouris_;
-
   public String previousTitleFrame = getTitle();
-
   TrPostProjet projet_;
-
   JComponent right_;
-
   /**
    * Toolbar modifiable qui se met a jour selon la selection de la widget.
    */
   JToolBar toolBarModifiable_ = new BuToolBar();
-
   JComponent[] tools_;
 
   /**
@@ -177,11 +163,11 @@
    * @param _preferedDimension
    * @param _calque
    * @return
-   * @see org.fudaa.fudaa.tr.post.TrPostLayoutPanelController#addCalque(java.lang.String, java.awt.Point,
-   *      java.awt.Dimension, org.fudaa.ebli.calque.ZEbliCalquesPanel)
+   * @see org.fudaa.fudaa.tr.post.TrPostLayoutPanelController#addCalque(java.lang.String, java.awt.Point, java.awt.Dimension,
+   * org.fudaa.ebli.calque.ZEbliCalquesPanel)
    */
   public EbliNode addCalque(final String _title, final Point _preferredLocation, final Dimension _preferedDimension, final TrPostVisuPanel _calque,
-      final CalqueLegendeWidgetAdapter _legende) {
+          final CalqueLegendeWidgetAdapter _legende) {
     return controller_.addCalque(_title, _preferredLocation, _preferedDimension, _calque);
   }
 
@@ -195,7 +181,7 @@
 
   /**
    * change le component south de la frame. dans le cas du calque il s agit du suivi souris.
-   * 
+   *
    * @param _controller
    */
   private void changeSouth(final EbliWidgetInterface _controller) {
@@ -212,7 +198,7 @@
 
   /**
    * Methode qui modifie la toolbar associee au calque selectionne
-   * 
+   *
    * @param _calque
    */
   private void changeToolbar(final EbliWidgetControllerInterface _controller) {
@@ -268,7 +254,7 @@
 
   /**
    * Methode appelee pour les widget qui contiennent des graphes.
-   * 
+   *
    * @param _controller
    * @param creator
    */
@@ -282,7 +268,9 @@
       final ArrayList<EbliActionSimple> listeActions = new ArrayList<EbliActionSimple>();
       final EGFillePanel _graphe = creator.getGraphePanel();
       if (_graphe.getGraphe().getModel() instanceof MvProfileTreeModel) {
-        listeActions.add(new TrPostActionBilan(((MvProfileTreeModel) _graphe.getGraphe().getModel()), projet_.getImpl()));
+        listeActions.add(new TrPostActionBilan(
+                creator.getWidget().getEbliScene(),
+                (MvProfileTreeModel) _graphe.getGraphe().getModel(), projet_.getImpl()));
       }
 
       // -- ajout de l'importation dans les courbes de l'action --//
@@ -302,7 +290,7 @@
 
   /**
    * Methode qui met a jour le tree de droite avec le tree du calque ou graphe selectionne.
-   * 
+   *
    * @param _widget
    */
   @SuppressWarnings("unchecked")
@@ -347,7 +335,7 @@
     for (final Iterator<EbliNode> it = ((Set<EbliNode>) getScene().getSelectedObjects()).iterator(); it.hasNext();) {
       final EbliNode node = it.next();
       if (!(node.getCreator() instanceof EbliWidgetCreatorLegende)
-          && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) {
+              && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) {
         projet_.nodesCopyied.add(node);
       }
     }
@@ -390,7 +378,7 @@
     for (final Iterator<EbliNode> it = ((Set<EbliNode>) getScene().getSelectedObjects()).iterator(); it.hasNext();) {
       final EbliNode node = it.next();
       if (!(node.getCreator() instanceof EbliWidgetCreatorLegende)
-          && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) {
+              && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) {
         projet_.nodesCutted.add(node);
       }
 
@@ -455,10 +443,7 @@
       changeToolbar(node.getWidget().getController());
       setTitle(previousTitleFrame);
 
-    }
-    
-
-    else {
+    } else {
       // -- etape 1: on fout eventuellement le tree des layouts --//
       changeTree(getScene());
       // -- etape 2: rechargement de la toolbar specifique dans this --//
@@ -519,12 +504,11 @@
 
   @Override
   public String[] getEnabledActions() {
-    return new String[] { "TOUTSELECTIONNER", "INVERSESELECTION", "CLEARSELECTION", "IMPRIMER", "MISEENPAGE", "PREVISUALISER",
-        CtuluLibImage.SNAPSHOT_COMMAND, "COLLER", "COPIER", "COUPER", CtuluExportDataInterface.EXPORT_CMD };
+    return new String[]{"TOUTSELECTIONNER", "INVERSESELECTION", "CLEARSELECTION", "IMPRIMER", "MISEENPAGE", "PREVISUALISER",
+              CtuluLibImage.SNAPSHOT_COMMAND, "COLLER", "COPIER", "COUPER", CtuluExportDataInterface.EXPORT_CMD};
   }
 
   // ---methode du listener d ecoute de la scene
-
   // /**
   // * Called to notify that an object was added to an object scene. This is called when an object-widget mapping is
   // * registered in an ObjectScene only. At the moment of the call, the object is still not reqistered in the
@@ -560,7 +544,6 @@
   // ObjectState newState) {
   //
   // }
-
   @Override
   public BuInformationsDocument getInformationsDocument() {
     if (id_ == null) {
@@ -602,7 +585,7 @@
   @Override
   public JMenu[] getSpecificMenus() {
     if (menus_ == null) {
-      menus_ = new JMenu[] { controller_.createMenu() };
+      menus_ = new JMenu[]{controller_.createMenu()};
       menus_[0].setText(getTitle());
     }
     return menus_;
@@ -618,7 +601,7 @@
 
   /**
    * Methode utilisee dans la classe fille TrPostFille pour recuperer le calque principal et enregistrer.
-   * 
+   *
    * @return
    */
   public final ZEbliCalquesPanel getVisuPanel() {
@@ -704,7 +687,6 @@
     g2d.translate(xCentre, yCentre);
     try {
       Runnable runnable = new Runnable() {
-
         @Override
         public void run() {
           scene.produceImage(g2d, (int) wCompDessine, (int) hCompDessine, null);
@@ -783,7 +765,7 @@
 
   /**
    * Met en place la menubar et la rend floatable false.
-   * 
+   *
    * @param _toolBar
    */
   public void setToolBar(final JToolBar _toolBar) {

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionBilan.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionBilan.java	2013-01-22 17:00:30 UTC (rev 8243)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionBilan.java	2013-01-23 09:10:10 UTC (rev 8244)
@@ -2,6 +2,7 @@
 
 import java.awt.event.ActionEvent;
 import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.visuallibrary.EbliScene;
 import org.fudaa.fudaa.tr.common.TrLib;
 import org.fudaa.fudaa.tr.common.TrResource;
 import org.fudaa.fudaa.tr.post.TrPostCommonImplementation;
@@ -21,6 +22,7 @@
   final MvProfileTreeModel modelGraphe_;
   final boolean startWithCalque;
   TrPostCommonImplementation impl_;
+  private EbliScene scene;
 
   public TrPostActionBilan(final TrPostVisuPanel _visu, final TrPostCommonImplementation impl) {
     super(TrLib.getString("Calcul des bilans"), TrResource.TR.getIcon("bilan"), "BILAN");
@@ -30,12 +32,14 @@
     impl_ = impl;
   }
 
-  public TrPostActionBilan(final MvProfileTreeModel _model, final TrPostCommonImplementation impl) {
+  public TrPostActionBilan(EbliScene scene, final MvProfileTreeModel _model, final TrPostCommonImplementation impl) {
     super(TrLib.getString("Calcul des bilans"), TrResource.TR.getIcon("bilan"), "BILAN");
+    setDefaultToolTip(TrLib.getString("Afin de d\xE9terminer la ligne support, s\xE9lectionner une courbe avec de lancer le calcul"));
     modelGraphe_ = _model;
     panel_ = null;
     startWithCalque = false;
     impl_ = impl;
+    this.scene = scene;
   }
 
   @Override
@@ -44,7 +48,7 @@
     if (startWithCalque) {
       new TrPostDialogBilan(panel_, impl_);
     } else {
-      new TrPostDialogBilan(modelGraphe_, impl_);
+      new TrPostDialogBilan(scene,modelGraphe_, impl_);
     }
   }
 }

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java	2013-01-22 17:00:30 UTC (rev 8243)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java	2013-01-23 09:10:10 UTC (rev 8244)
@@ -16,6 +16,7 @@
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.List;
 import javax.swing.AbstractAction;
 import javax.swing.AbstractListModel;
 import javax.swing.BorderFactory;
@@ -47,6 +48,7 @@
 import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsI;
 import org.fudaa.dodico.ef.operation.EfLineIntersectorActivity;
 import org.fudaa.dodico.h2d.type.H2dVariableType;
+import org.fudaa.ebli.courbe.EGCourbeChild;
 import org.fudaa.ebli.courbe.EGObject;
 import org.fudaa.ebli.ressource.EbliResource;
 import org.fudaa.ebli.visuallibrary.EbliScene;
@@ -105,6 +107,7 @@
   double res_;
   double resMax_;
   double resMin_;
+  private EbliScene scene;
 
   private void updateResValues() {
     tfRes_.setText(currentFmt_.format(res_));
@@ -142,9 +145,10 @@
    * @param _panelVariables
    * @param _source
    */
-  public TrPostDialogBilan(final MvProfileTreeModel _modelGraphe, final TrPostCommonImplementation impl) {
+  public TrPostDialogBilan(EbliScene scene, final MvProfileTreeModel _modelGraphe, final TrPostCommonImplementation impl) {
     visuPanel = null;
     impl_ = impl;
+    this.scene = scene;
     modelGraphe_ = _modelGraphe;
     source_ = (TrPostSource) _modelGraphe.target_.getData();
     modelVariables_ = new CtuluComboBoxModelAdapter(source_.getNewVarListModel());
@@ -408,12 +412,19 @@
   protected LineString getSelectedLine() {
     if (this.modelGraphe_ != null) {
       EGObject selectedObject = modelGraphe_.getSelectedObject();
+      if (selectedObject == null) {
+        List<EGCourbeChild> allCourbesChild = modelGraphe_.getAllCourbesChild();
+        if (allCourbesChild.size() == 1) {
+          selectedObject = allCourbesChild.get(0);
+        }
+      }
       if (selectedObject instanceof MvProfileCourbe) {
         MvProfileCourbe profile = (MvProfileCourbe) selectedObject;
         if (profile.getProfileModel() instanceof MVProfileCourbeModel) {
           return ((MVProfileCourbeModel) profile.getProfileModel()).getInitLine();
         }
       }
+
     }
     return visuPanel == null ? null : visuPanel.getSelectedLine();
   }
@@ -439,6 +450,9 @@
 
   @Override
   public EbliScene getScene() {
+    if (scene != null) {
+      return scene;
+    }
     return getVisuPanel().getPostImpl().getCurrentLayoutFille().getScene();
   }
 

Modified: trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt	2013-01-22 17:00:30 UTC (rev 8243)
+++ trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt	2013-01-23 09:10:10 UTC (rev 8244)
@@ -1,4 +1,5 @@
 Le fichier r\xE9sultat utilis\xE9 actuellement=The current source used
+Afin de d\xE9terminer la ligne support, s\xE9lectionner une courbe avec de lancer le calcul=To determine the line to use, select one curve before launching the computation
 La frame graphe ne trouve pas la variable qui correspond \xE0 l'ID {0}=The variable {0} is not found by the graph view
 La tentative de rejouer les donn\xE9es pour le graphe \xE9volution temporel {0} a \xE9chou\xE9 avec le fichier d'id {1}=The time evolution {0} for the source {1} can't be rebuilt
 Ouvrir et recalculer=Open and recompute

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:[8243] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr/post/TrIsoLayerDefault.java

From: <de...@us...> - 2013-01-22 17:00:41

Revision: 8243
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8243&view=rev
Author:   deniger
Date:     2013-01-22 17:00:30 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java	2013-01-22 16:59:58 UTC (rev 8242)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java	2013-01-22 17:00:30 UTC (rev 8243)
@@ -657,6 +657,10 @@
   @Override
   public LineString getSelectedLine() {
     if (getIsoModelAbstract().isCurrentDataElementType()) {
+      int[] twoFirstSelected = super.getTwoFirstSelected();
+      if (twoFirstSelected.length == 2) {
+        return ZCalquePolygone.getSelectedLine(twoFirstSelected[0], twoFirstSelected[1], getIsoModelAbstract());
+      }
       return ZCalquePolygone.getSelectedLine(this, getIsoModelAbstract());
     }
     return super.getSelectedLine();
@@ -899,7 +903,7 @@
     int w = getWidth() + 1;
     CtuluListSelection memory = new CtuluListSelection(w * getHeight());
     if (isos != null) {
-      isos.setDimension(getWidth(), getHeight(), selection_);
+      isos.setDimension(getWidth(), getHeight(), memory);
     }
     Envelope envReel = _clipReel.getEnv();
     for (idxElt = 0; idxElt < n; idxElt++) {

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

Flat | Threaded

<< < 1 .. 37 38 39 40 41 .. 198 > >> (Page 39 of 198)