fudaa-svn-commit — svn commit with diffs

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

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

Revision: 8559
          http://sourceforge.net/p/fudaa/svn/8559
Author:   deniger
Date:     2014-01-07 20:14:39 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
CRUE-609 lors de l'export d'un shapefile, les identifiants sont utilis?\195?\169es et plus les noms complets. Cela occasionne des conflits ?\195?\160 l'import.

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java
    trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties

Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java	2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CtuluUIForNetbeans.java	2014-01-07 20:14:39 UTC (rev 8559)
@@ -2,6 +2,7 @@
 
 import java.awt.Component;
 import java.util.Collection;
+import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.CtuluAnalyze;
@@ -72,7 +73,8 @@
   @Override
   public void error(String _titre, String _msg, boolean _tempo) {
     if (_tempo) {
-      NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-non-bloquante.png"), _msg, null);
+      NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-non-bloquante.png"), _msg,
+              null);
     } else {
       DialogHelper.showError(_titre, _msg);
     }
@@ -104,7 +106,16 @@
     log.setDesc(_analyze.getDesci18n());
     Collection<LogRecord> records = _analyze.getRecords();
     for (LogRecord logRecord : records) {
-      log.addRecord(CtuluLogLevel.WARNING, logRecord.getMessage());
+      Level level = logRecord.getLevel();
+      CtuluLogLevel targetLevel = CtuluLogLevel.ERROR;
+      if (level.equals(Level.WARNING)) {
+        targetLevel = CtuluLogLevel.WARNING;
+      } else if (level.equals(CtuluAnalyze.FATAL)) {
+        targetLevel = CtuluLogLevel.FATAL;
+      } else if (level.equals(Level.INFO)) {
+        targetLevel = CtuluLogLevel.INFO;
+      }
+      log.addRecord(targetLevel, logRecord.getMessage());
     }
     LogsDisplayer.displayError(log, _analyze.getDesci18n());
     return _analyze.containsFatalError();
@@ -136,9 +147,11 @@
   public void message(String _titre, String _msg, boolean _tempo) {
     if (_tempo) {
       if (_titre == null && _msg != null) {
-        NotificationDisplayer.getDefault().notify(_msg, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.EMPTY, null);
+        NotificationDisplayer.getDefault().notify(_msg, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"),
+                StringUtils.EMPTY, null);
       } else {
-        NotificationDisplayer.getDefault().notify(StringUtils.defaultString(_titre), CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.defaultString(_msg), null);
+        NotificationDisplayer.getDefault().notify(StringUtils.defaultString(_titre), CrueIconsProvider.getIcon(
+                "org/fudaa/fudaa/crue/common/icons/information.png"), StringUtils.defaultString(_msg), null);
       }
     } else {
       DialogHelper.showInfo(_titre, _msg);

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java	2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java	2014-01-07 20:14:39 UTC (rev 8559)
@@ -14,5 +14,6 @@
 
   public PlanimetryGisEditor(ZEbliCalquesPanel _panel) {
     super(_panel, new PlanimetrySceneEditor(_panel.getScene(), _panel));
+    setExportWithId(true);
   }
 }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java	2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AbstractSigLoaderAction.java	2014-01-07 20:14:39 UTC (rev 8559)
@@ -32,7 +32,7 @@
  */
 public abstract class AbstractSigLoaderAction extends EbliActionSimple {
 
-   final PlanimetryController controller;
+  final PlanimetryController controller;
 
   public AbstractSigLoaderAction(String name, PlanimetryController controller) {
     super(name, null, name.toUpperCase());
@@ -67,15 +67,19 @@
   protected final void loadData(final FSigFileLoaderI loader,
           final Pair<File, BuFileFilter> file, final EnumFormat fmt) {
 
-
     ProgressRunnable<Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>> worker = new ProgressRunnable<Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>>() {
       @Override
       public Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> run(ProgressHandle ph) {
         ph.switchToIndeterminate();
         FSigFileLoadResult result = new FSigFileLoadResult();
         CtuluAnalyze analyse = new CtuluAnalyze();
-        loader.setInResult(result, file.first, file.first.getAbsolutePath(), CtuluUIForNetbeans.DEFAULT.getMainProgression(),
-                analyse);
+        try {
+          loader.setInResult(result, file.first, file.first.getAbsolutePath(), CtuluUIForNetbeans.DEFAULT.getMainProgression(),
+                  analyse);
+        } catch (IllegalArgumentException ex) {
+          analyse.addFatalError(org.openide.util.NbBundle.getMessage(AbstractSigLoaderAction.class, "sig.import.error", ex.getMessage()));
+        }
+
         if (CtuluUIForNetbeans.DEFAULT.manageAnalyzeAndIsFatal(analyse)) {
           return null;
         }
@@ -93,7 +97,8 @@
         return new Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee>(pt, lignes);
       }
     };
-    Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun = CrueProgressUtils.showProgressDialogAndRun(worker, getTitle());
+    Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun = CrueProgressUtils.showProgressDialogAndRun(worker,
+            getTitle());
     finishImportData(showProgressDialogAndRun, file.first, fmt);
   }
 
@@ -127,5 +132,6 @@
     }
   }
 
-  protected abstract void finishImportData(Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun, File file, EnumFormat fmt);
+  protected abstract void finishImportData(Pair<GISZoneCollectionPoint, GISZoneCollectionLigneBrisee> showProgressDialogAndRun, File file,
+          EnumFormat fmt);
 }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java	2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/SigLoaderAction.java	2014-01-07 20:14:39 UTC (rev 8559)
@@ -5,6 +5,10 @@
 import javax.swing.Action;
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
+import org.fudaa.ctulu.editor.CtuluValueEditorDouble;
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
 import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
 import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
 import org.fudaa.dodico.crue.common.Pair;
@@ -70,12 +74,29 @@
 
     }
     if (importPoint) {
+      GISAttributeInterface[] attributes = points.getAttributes();
+      setNotEditable(attributes);
       controller.getGroupExternController().addLayerPointUnmodifiable(points, file, fmt, type);
     }
     if (importLigne) {
+      GISAttributeInterface[] attributes = lignes.getAttributes();
+      setNotEditable(attributes);
       controller.getGroupExternController().addLayerLignesUnmodifiable(lignes, file, fmt, type);
     }
   }
 
- 
+  protected void setNotEditable(GISAttributeInterface[] attributes) {
+    if (attributes != null) {
+      for (GISAttributeInterface attribute : attributes) {
+        if (attribute != null) {
+          if (Double.class.equals(attribute.getDataClass())) {
+            ((GISAttribute) attribute).setInternEditor(new CtuluValueEditorDouble(false));
+          }
+          attribute.getEditor().setEditable(false);
+        }
+
+      }
+    }
+  }
+
 }

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties	2014-01-06 22:29:59 UTC (rev 8558)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties	2014-01-07 20:14:39 UTC (rev 8559)
@@ -34,3 +34,4 @@
 SimplifyProfils.Name=Simplifier les profils
 importJGW.action=Importer une image g\u00e9or\u00e9f\u00e9renc\u00e9e (JGW)
 jgwFileNotFound.text=Le fichier de g\u00e9or\u00e9f\u00e9rencement {0} n''a pas \u00e9t\u00e9 trouv\u00e9
+sig.import.error=Erreur lors de l''import: {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:[8558] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig/layer

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

Revision: 8558
          http://sourceforge.net/p/fudaa/svn/8558
Author:   deniger
Date:     2014-01-06 22:29:59 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
support de l'export des attributs via l'ID au lieu du nom

Modified Paths:
--------------
    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/FSigLayerExporterI.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilterAbstract.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	2014-01-06 20:52:41 UTC (rev 8557)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java	2014-01-06 22:29:59 UTC (rev 8558)
@@ -79,15 +79,28 @@
  */
 public class FSigEditor extends ZEditorDefault implements GISZoneListener, ZModelGeometryListener {
 
+  private boolean exportWithId = false;
+
   /**
    * @param _panel
    */
   public FSigEditor(final ZEbliCalquesPanel _panel, final ZSceneEditor _editor) {
     super(_panel, _editor);
-    //    setMng(_cmd);
   }
 
   /**
+   *
+   * @return true si les exports doivent utiliser les id \xE0 la place des noms.
+   */
+  public boolean isExportWithId() {
+    return exportWithId;
+  }
+
+  public void setExportWithId(boolean exportWithId) {
+    this.exportWithId = exportWithId;
+  }
+
+  /**
    * @param _panel
    */
   public FSigEditor(final ZEbliCalquesPanel _panel) {
@@ -244,6 +257,7 @@
       return;
     }
     final FSigLayerFilter filter = new FSigLayerFilter();
+    filter.setExportWithId(isExportWithId());
     final int nb = parent.length;
     for (int i = 0; i < nb; i++) {
       parent[i].apply(filter);

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java	2014-01-06 20:52:41 UTC (rev 8557)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java	2014-01-06 22:29:59 UTC (rev 8558)
@@ -78,45 +78,46 @@
    * @return Le filtre de fichier associ\xE9 au writer
    */
   public BuFileFilter getFileFilter();
-
+  
   public class ToGML extends DataStore {
-
+    
     public ToGML() {
       super(new GMLDataStoreFactory());
     }
   }
-
+  
   public class ToShape extends DataStore {
-
+    
     public ToShape() {
       super(new ShapefileDataStoreFactory());
     }
   }
-
+  
   public class ToMIF extends DataStore {
-
+    
     public ToMIF() {
       super(new MIFDataStoreFactory());
     }
   }
-
+  
   public class DataStore implements FSigLayerExporterI {
-
+    
     final FileDataStoreFactorySpi dataStore_;
     final BuFileFilter fileFilter_;
-
+    
     public DataStore(final FileDataStoreFactorySpi _dataStore) {
       dataStore_ = _dataStore;
       fileFilter_ = GISExportDataStoreFactory.buildFileFilterFor(_dataStore);
     }
-
+    
     @Override
     public CtuluIOOperationSynthese exportTo(final FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _file, GISPoint translateXY,
             final ProgressionInterface _prog) {
       final GISGMLZoneExporter exporter = new GISGMLZoneExporter();
+      exporter.setUseIdAsName(_filter.isExportWithId());
       try {
         final boolean one = _filter.getNbZone() == 1;
-
+        
         final Set nameUsed = new HashSet();
         final File dir = _file.getParentFile();
         final String name = _file.getName();
@@ -170,24 +171,24 @@
             exporter.process(_prog, collect, attIsZ,
                     GISExportDataStoreFactory.createDataStore(dataStore_, file.toURL(), collect.getEnvelopeInternal(), true));
           }
-
+          
         }
-
+        
       } catch (final Exception _e) {
         _impl.error(FudaaLib.getS("Export") + ' ' + _file.getName(), _e.getMessage(), false);
         FuLog.warning(_e);
       }
       return null;
     }
-
+    
     @Override
     public BuFileFilter getFileFilter() {
       return fileFilter_;
     }
   }
-
+  
   public static class ToSinusX implements FSigLayerExporterI {
-
+    
     @Override
     public CtuluIOOperationSynthese exportTo(final FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _f, GISPoint translateXY,
             final ProgressionInterface _prog) {
@@ -222,22 +223,22 @@
         z = zTranslated;
       }
       return SinusxFileFormat.getInstance().write(f, z, _prog);
-
+      
     }
-
+    
     @Override
     public BuFileFilter getFileFilter() {
       return SinusxFileFormat.getInstance().createFileFilter();
     }
   }
-
+  
   public static class ToDunes implements FSigLayerExporterI {
-
+    
     @Override
     public CtuluIOOperationSynthese exportTo(final FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _f, GISPoint translateXY,
             final ProgressionInterface _prog) {
       File f = CtuluLibFile.appendExtensionIfNeeded(_f, DunesGEOFileFormat.getInstance().getExtensions()[0]);
-
+      
       List<GISDataModel> mdls = new ArrayList<GISDataModel>();
       for (int i = 0; i < _filter.pointCq_.size(); i++) {
         mdls.add(new GISDataModelPointToMultiPointAdapter(GISDataModelFilterAdapter.buildAdapter(_filter.getCollect(_filter.pointCq_.get(i)), null)));
@@ -249,10 +250,10 @@
         final GISDataModel collec = _filter.getCollect(_filter.polyCq_.get(i));
         mdls.add(collec);
       }
-
+      
       return DunesGEOFileFormat.getInstance().write(f, mdls.toArray(new GISDataModel[0]), _prog);
     }
-
+    
     @Override
     public BuFileFilter getFileFilter() {
       return DunesGEOFileFormat.getInstance().createFileFilter();
@@ -266,7 +267,7 @@
    * @version $Id$
    */
   public static class ToRubar implements FSigLayerExporterI {
-
+    
     @Override
     public CtuluIOOperationSynthese exportTo(final FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _f, GISPoint translateXY,
             final ProgressionInterface _prog) {
@@ -281,7 +282,7 @@
       List<GISDataModel> mdlligdir = new ArrayList<GISDataModel>();
       List<GISDataModel> mdlsemis = new ArrayList<GISDataModel>();
       List<GISDataModel> mdlautres = new ArrayList<GISDataModel>();
-
+      
       for (int i = 0; i < _filter.pointCq_.size(); i++) {
         mdlsemis.add(new GISDataModelPointToMultiPointAdapter(GISDataModelFilterAdapter.buildAdapter(_filter.getCollect(_filter.pointCq_.get(i)),
                 null)));
@@ -297,10 +298,10 @@
         int idxAtt = col.getIndiceOf(GISAttributeConstants.NATURE);
         if (idxAtt == -1) {
           mdlautres.add(GISDataModelFilterAdapter.buildAdapter(_filter.getCollect(_filter.polyCq_.get(i)), new GISAttributeInterface[]{
-                    GISAttributeConstants.TITRE, GISAttributeConstants.COMMENTAIRE_HYDRO}));
+            GISAttributeConstants.TITRE, GISAttributeConstants.COMMENTAIRE_HYDRO}));
         } else {
           GISDataModel mdl = GISDataModelFilterAdapter.buildAdapter(_filter.getCollect(_filter.polyCq_.get(i)), new GISAttributeInterface[]{
-                    GISAttributeConstants.TITRE, GISAttributeConstants.NATURE, GISAttributeConstants.COMMENTAIRE_HYDRO});
+            GISAttributeConstants.TITRE, GISAttributeConstants.NATURE, GISAttributeConstants.COMMENTAIRE_HYDRO});
           if (GISAttributeConstants.ATT_NATURE_CN.equals(col.getValue(idxAtt, 0))) {
             mdlniv.add(mdl);
           } else if (GISAttributeConstants.ATT_NATURE_PF.equals(col.getValue(idxAtt, 0))) {
@@ -319,7 +320,7 @@
         mdlsemis = translate(mdlsemis, translateXY);
         mdlautres = translate(mdlautres, translateXY);
       }
-
+      
       FileFormatUnique ff;
 
       // Les semis
@@ -327,10 +328,10 @@
         ff = new RubarSEMFileFormat();
         GISDataModel mdl = new GISDataModelMultiAdapter(mdlsemis.toArray(new GISDataModel[0]));
         ana = ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[0]), new RubarSEMWriterGISAdapter(mdl), _prog).getAnalyze();
-
+        
         int nbsemis = mdl.getNumGeometries();
         ana.addInfo(DodicoLib.getS("{0} semis sur {1} ont \xE9t\xE9 export\xE9s", "" + nbsemis, "" + nbsemis), -1);
-
+        
         synt.getAnalyze().merge(ana);
         if (synt.containsSevereError()) {
           return synt;
@@ -377,10 +378,10 @@
           return synt;
         }
       }
-
+      
       return synt;
     }
-
+    
     private List<GISDataModel> translate(List<GISDataModel> in, GISPoint translateXY) {
       // Regroupement des mod\xE8les suivant leur nature.
       List<GISDataModel> out = new ArrayList<GISDataModel>(in.size());
@@ -388,9 +389,9 @@
         out.add(gisDataModel.createTranslate(translateXY));
       }
       return out;
-
+      
     }
-
+    
     @Override
     public BuFileFilter getFileFilter() {
       return RubarStCnFileFormat.getInstance().createFileFilter();

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java	2014-01-06 20:52:41 UTC (rev 8557)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java	2014-01-06 22:29:59 UTC (rev 8558)
@@ -25,15 +25,18 @@
 
 /**
  * Un filtre sur les calques a exporter. Les calques a exporter peuvent \xEAtre uniquement les calques visibles.
+ *
  * @author Fred Deniger
  * @version $Id$
  */
 public class FSigLayerFilter extends FSigLayerFilterAbstract {
-  protected boolean bonlyVisible_=false;
-  protected boolean onlySelectedGeometries_=false;
-  protected boolean bonlyOnVisibleGeometries_=true;
-  final Set<ZCalqueAffichageDonneesInterface> cqs_=new HashSet<ZCalqueAffichageDonneesInterface>();
 
+  protected boolean bonlyVisible_ = false;
+  protected boolean onlySelectedGeometries_ = false;
+  protected boolean bonlyOnVisibleGeometries_ = true;
+  final Set<ZCalqueAffichageDonneesInterface> cqs_ = new HashSet<ZCalqueAffichageDonneesInterface>();
+  
+
   /**
    *
    */
@@ -45,72 +48,71 @@
   protected GISDataModel getCollect(final ZCalqueAffichageDonneesInterface _o) {
     GISZoneCollection zone = ((ZModeleGeometry) _o.modeleDonnees()).getGeomData();
     zone.prepareExport();
-    
+
     // On ne retient que les g\xE9om\xE9tries s\xE9lectionn\xE9es.
     if (onlySelectedGeometries_) {
       return new GISDataModelFilterAdapter(zone, null, _o.getSelectedObjectInTable());
-    }
-
-    // On ne retient que les g\xE9om\xE9tries visibles du calque.
+    } // On ne retient que les g\xE9om\xE9tries visibles du calque.
     else if (bonlyOnVisibleGeometries_) {
-      ZModeleGeometry md=(ZModeleGeometry)_o.modeleDonnees();
-      TIntArrayList idx=new TIntArrayList(md.getNombre());
-      for (int id=0; id<md.getNombre(); id++) {
-        if (md.isGeometryVisible(id))
+      ZModeleGeometry md = (ZModeleGeometry) _o.modeleDonnees();
+      TIntArrayList idx = new TIntArrayList(md.getNombre());
+      for (int id = 0; id < md.getNombre(); id++) {
+        if (md.isGeometryVisible(id)) {
           idx.add(id);
+        }
       }
       return new GISDataModelFilterAdapter(zone, null, idx.toNativeArray());
+    } else {
+      return zone;
     }
-    else
-      return zone;
   }
 
-//  final GISDataModel getCollect(final Object _o) {
-//    return getCollect((ZCalqueAffichageDonneesInterface) _o);
-//  }
-
   /**
    * Le traitement ne s'applique qu'aux seuls calques visibles.
+   *
    * @param _b True : Uniquement les calques visibles sont consid\xE9r\xE9s.
    */
   public void setTreatmentOnlyOnVisible(boolean _b) {
-    bonlyVisible_=_b;
+    bonlyVisible_ = _b;
   }
 
   /**
    * Le traitement ne se fait que sur les g\xE9om\xE9tries visibles.
+   *
    * @param _b True : Uniquement les g\xE9om\xE9tries visibles des calques s\xE9lectionn\xE9s sont consid\xE9r\xE9es.
    */
   public void setTreatmentOnlyOnVisibleGeometries(boolean _b) {
-    bonlyOnVisibleGeometries_=_b;
+    bonlyOnVisibleGeometries_ = _b;
   }
-  
+
   /**
    * Le traitement s'applique uniquement aux g\xE9om\xE9tries selectionn\xE9es.
    */
   public void setTreatmentOnlySelectedGeometries(boolean _b) {
-    onlySelectedGeometries_=_b;
+    onlySelectedGeometries_ = _b;
   }
-  
+
   @Override
   public boolean visit(final BCalque _cq) {
     // Calque non trait\xE9 si invisible.
-    if (bonlyVisible_&&!_cq.isVisible())
+    if (bonlyVisible_ && !_cq.isVisible()) {
       return true;
+    }
 
-    if (!cqs_.contains(_cq)&&_cq instanceof ZCalqueAffichageDonneesInterface
-        &&((ZCalqueAffichageDonneesInterface)_cq).modeleDonnees() instanceof ZModeleGeometry) {
+    if (!cqs_.contains(_cq) && _cq instanceof ZCalqueAffichageDonneesInterface
+            && ((ZCalqueAffichageDonneesInterface) _cq).modeleDonnees() instanceof ZModeleGeometry) {
 
-      ZCalqueAffichageDonneesInterface calque=(ZCalqueAffichageDonneesInterface)_cq;
-      ZModeleGeometry geom=(ZModeleGeometry)calque.modeleDonnees();
+      ZCalqueAffichageDonneesInterface calque = (ZCalqueAffichageDonneesInterface) _cq;
+      ZModeleGeometry geom = (ZModeleGeometry) calque.modeleDonnees();
       cqs_.add(calque);
-      if (!onlySelectedGeometries_||!calque.isSelectionEmpty()) {
-        if (geom.getGeomData().getDataStoreClass().equals(Point.class))
+      if (!onlySelectedGeometries_ || !calque.isSelectionEmpty()) {
+        if (geom.getGeomData().getDataStoreClass().equals(Point.class)) {
           pointCq_.add(calque);
-        else if (LineString.class.isAssignableFrom(geom.getGeomData().getDataStoreClass()))
+        } else if (LineString.class.isAssignableFrom(geom.getGeomData().getDataStoreClass())) {
           polyCq_.add(calque);
-        else if (MultiPoint.class.isAssignableFrom(geom.getGeomData().getDataStoreClass()))
+        } else if (MultiPoint.class.isAssignableFrom(geom.getGeomData().getDataStoreClass())) {
           mlptsCq_.add(calque);
+        }
       }
     }
     return true;

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilterAbstract.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilterAbstract.java	2014-01-06 20:52:41 UTC (rev 8557)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerFilterAbstract.java	2014-01-06 22:29:59 UTC (rev 8558)
@@ -18,29 +18,40 @@
 
 /**
  * Un filtre g\xE9n\xE9rique sur des calques \xE0 exporter, rempli par un visitor a implementer.
- * 
+ *
  * @author mar...@de...
  */
 public abstract class FSigLayerFilterAbstract implements BCalqueVisitor {
+
   protected List<ZCalqueAffichageDonneesInterface> mlptsCq_ = new ArrayList<ZCalqueAffichageDonneesInterface>();
   protected List<ZCalqueAffichageDonneesInterface> pointCq_ = new ArrayList<ZCalqueAffichageDonneesInterface>();
   protected List<ZCalqueAffichageDonneesInterface> polyCq_ = new ArrayList<ZCalqueAffichageDonneesInterface>();
+  private boolean exportWithId = false;
 
   public FSigLayerFilterAbstract() {
     super();
   }
 
-  public CtuluIOOperationSynthese exportTo(final FSigLayerExporterI _exporter, final CtuluUI _impl, final File _file, GISPoint translateXY,final ProgressionInterface _prog) {
+  public boolean isExportWithId() {
+    return exportWithId;
+  }
+
+  public void setExportWithId(boolean exportWithId) {
+    this.exportWithId = exportWithId;
+  }
+
+  public CtuluIOOperationSynthese exportTo(final FSigLayerExporterI _exporter, final CtuluUI _impl, final File _file, GISPoint translateXY,
+          final ProgressionInterface _prog) {
     return _exporter.exportTo(this, _impl, _file, translateXY, _prog);
   }
-  
+
   public CtuluIOOperationSynthese exportTo(final FSigLayerExporterI _exporter, final CtuluUI _impl, final File _file, final ProgressionInterface _prog) {
     return _exporter.exportTo(this, _impl, _file, null, _prog);
   }
 
   /**
    * Retourne l'attribut pris pour Z dans la zone.
-   * 
+   *
    * @param _o Le calque
    * @return L'attribut pris pour Z. Peut \xEAtre null.
    */
@@ -65,7 +76,7 @@
 
   /**
    * Retourne la collection pour le calque donn\xE9. Peut eventuellement \xEAtre filtr\xE9e.
-   * 
+   *
    * @param _cq Le calque
    * @return La collection
    */

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

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

Revision: 8557
          http://sourceforge.net/p/fudaa/svn/8557
Author:   deniger
Date:     2014-01-06 20:52:41 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
CRUE-595: la fenetre param?\195?\168tres num?\195?\169rique ?\195?\169taient affich?\195?\169es dans les x n?\195?\169gatifs.

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
    trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
    trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml

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	2014-01-06 15:51:43 UTC (rev 8556)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf	2014-01-06 20:52:41 UTC (rev 8557)
@@ -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}\1.0"
+default_userdir="${HOME}\.${APPNAME}\1.1"
 default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/1.0/"
 # options used by the launcher by default, can be overridden by explicit
 # command line switches

Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf	2014-01-06 15:51:43 UTC (rev 8556)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf	2014-01-06 20:52:41 UTC (rev 8557)
@@ -1,5 +1,5 @@
 # ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}\.${APPNAME}\1.0RC2"
+default_userdir="${HOME}\.${APPNAME}\1.1"
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches

Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml	2014-01-06 15:51:43 UTC (rev 8556)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml	2014-01-06 20:52:41 UTC (rev 8557)
@@ -6,7 +6,7 @@
   <constraints>
     <path orientation="horizontal" number="226" weight="0.5"/>
   </constraints>
-  <bounds x="-778" y="95" width="536" height="436" />
+  <bounds x="250" y="95" width="536" height="436" />
   <frame state="0"/>
   <empty-behavior permanent="true"/>
 </mode>

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

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

Revision: 8552
          http://sourceforge.net/p/fudaa/svn/8552
Author:   deniger
Date:     2013-12-15 13:42:38 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
ajout annotations

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

Modified: trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnTest.java	2013-12-15 13:04:32 UTC (rev 8551)
+++ trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnTest.java	2013-12-15 13:42:38 UTC (rev 8552)
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import junit.framework.TestCase;
+import org.apache.commons.jxpath.JXPathContext;
 import org.fudaa.dodico.crue.common.BusinessMessages;
 import org.fudaa.dodico.crue.common.PropertyUtilsCache;
 import org.fudaa.dodico.crue.comparaison.config.ConfSelection;
@@ -31,13 +32,15 @@
  */
 public class ConvertSelectOnTest extends TestCase {
 
+  
+
   public void testSelectionSimple() {
 
     final ConfSelection sel = new ConfSelection();
     final ConfSelectionItemMerge merge = createMergeBrancheRequete();
     sel.getItems().add(merge);
-    final EMHSousModele m1 = createModele("titi", "tata");
-    final EMHSousModele m2 = createModele("tata", "titi");
+    final EMHSousModele m1 = createSousModele("br1", "br2");
+    final EMHSousModele m2 = createSousModele("br2", "br1");
     final ConvertSelectOn builder = new ConvertSelectOn();
     builder.setA(m1);
     builder.setB(m2);
@@ -48,7 +51,9 @@
       final ComparaisonNodeFinal mp = res.get(0);
       assertEquals(m1, mp.objetA);
       assertEquals(m2, mp.objetB);
+      //m1 a 2 branches
       assertEquals(2, mp.listObjectA.size());
+      //m2 a 2 branches
       assertEquals(2, mp.listObjectB.size());
 
     } catch (final Exception e) {
@@ -99,8 +104,8 @@
   }
 
   public void testComparaisonIn() {
-    final EMHSousModele sm1 = createModele("1", "2");
-    final EMHSousModele sm2 = createModele("1", "2");
+    final EMHSousModele sm1 = createSousModele("1", "2");
+    final EMHSousModele sm2 = createSousModele("1", "2");
     EqualsTesterIsIncludeCollection include = new EqualsTesterIsIncludeCollection("nom", true);
     TesterContext contexte = new TesterContextImpl(null);
     try {
@@ -140,7 +145,7 @@
     return merge;
   }
 
-  private static EMHSousModele createModele(final String n1, final String n2) {
+  private static EMHSousModele createSousModele(final String n1, final String n2) {
     final EMHSousModele sm1 = new EMHSousModele();
     addBranche(n1, n2, sm1);
     return sm1;

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:[8551] trunk/soft/fudaa-crue/crue-emh/src/main/java/org/ fudaa/dodico/crue/metier/result

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

Revision: 8551
          http://sourceforge.net/p/fudaa/svn/8551
Author:   deniger
Date:     2013-12-15 13:04:32 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
ajout annotations

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/OrdResDynamicPropertyFilter.java
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ResCalcul.java

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/OrdResDynamicPropertyFilter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/OrdResDynamicPropertyFilter.java	2013-12-15 10:07:03 UTC (rev 8550)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/OrdResDynamicPropertyFilter.java	2013-12-15 13:04:32 UTC (rev 8551)
@@ -15,7 +15,9 @@
 import org.fudaa.dodico.crue.metier.emh.OrdResScenario;
 
 /**
- * @author deniger
+ * Permet de trouver les propriétés ordres communes entre 2 OrdResScenario
+ *
+ *  @author deniger
  */
 public class OrdResDynamicPropertyFilter implements DynamicPropertyFilter {
 
@@ -26,7 +28,7 @@
   private final OrdResScenario ordResB;
   private static final Logger LOGGER = Logger.getLogger(OrdResDynamicPropertyFilter.class.getName());
 
-  public static String normalizeEMHType(String in) {
+  private static String normalizeEMHType(String in) {
     if (in == null) {
       return null;
     }

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ResCalcul.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ResCalcul.java	2013-12-15 10:07:03 UTC (rev 8550)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/ResCalcul.java	2013-12-15 13:04:32 UTC (rev 8551)
@@ -5,6 +5,8 @@
 import java.util.Map;
 
 /**
+ * Pour crue9 uniquement.
+ *
  * @author deniger
  */
 public abstract class ResCalcul {

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:[8550] trunk/soft/fudaa-crue/crue-emh/src/main/java/org/ fudaa/dodico/crue/metier/emh/CatEMHConteneur.java

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

Revision: 8550
          http://sourceforge.net/p/fudaa/svn/8550
Author:   deniger
Date:     2013-12-15 10:07:03 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
ajout annotations

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java

Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java	2013-12-12 10:49:46 UTC (rev 8549)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/CatEMHConteneur.java	2013-12-15 10:07:03 UTC (rev 8550)
@@ -6,6 +6,7 @@
 package org.fudaa.dodico.crue.metier.emh;
 
 import java.util.List;
+import org.fudaa.dodico.crue.metier.annotation.UsedByComparison;
 
 
 /**
@@ -52,5 +53,6 @@
   /**
    * @return tous les emh contenu par ce conteneur. L'ordre n'est pas assurer
    */
+  @UsedByComparison
   public abstract List<EMH> getAllSimpleEMHinUserOrder();
 }
\ 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:[8549] trunk/soft/fudaa-mascaret/ui/src/main/java/org/ fudaa/fudaa/hydraulique1d/util/

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

Revision: 8549
          http://sourceforge.net/p/fudaa/svn/8549
Author:   bmarchan
Date:     2013-12-12 10:49:46 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Mascaret : Suppress repertoire inutile

Removed Paths:
-------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/

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:[8548] trunk/soft/fudaa-mascaret

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

Revision: 8548
          http://sourceforge.net/p/fudaa/svn/8548
Author:   bmarchan
Date:     2013-12-12 10:23:26 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Mascaret : chgt version => 3.1.10

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/distrib/pom.xml
    trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt
    trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt
    trunk/soft/fudaa-mascaret/pom.xml
    trunk/soft/fudaa-mascaret/server/pom.xml
    trunk/soft/fudaa-mascaret/ui/pom.xml
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java

Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml	2013-12-12 10:22:45 UTC (rev 8547)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml	2013-12-12 10:23:26 UTC (rev 8548)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.10-beta2</version>
+    <version>3.1.10</version>
   </parent>
   <artifactId>mascaret-distrib</artifactId>
   <properties>

Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt	2013-12-12 10:22:45 UTC (rev 8547)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/Lisezmoi.txt	2013-12-12 10:23:26 UTC (rev 8548)
@@ -1,6 +1,6 @@
-====================
-Fudaa-Mascaret 3.1.9
-====================
+=====================
+Fudaa-Mascaret 3.1.10
+=====================
 
 Fudaa Mascaret : Installation
 -----------------------------

Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt	2013-12-12 10:22:45 UTC (rev 8547)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/Readme.txt	2013-12-12 10:23:26 UTC (rev 8548)
@@ -1,6 +1,6 @@
-====================
-Fudaa-Mascaret 3.1.9
-====================
+=====================
+Fudaa-Mascaret 3.1.10
+=====================
 
 Fudaa Mascaret : Installation
 -----------------------------

Modified: trunk/soft/fudaa-mascaret/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/pom.xml	2013-12-12 10:22:45 UTC (rev 8547)
+++ trunk/soft/fudaa-mascaret/pom.xml	2013-12-12 10:23:26 UTC (rev 8548)
@@ -15,7 +15,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
   <artifactId>fudaa-mascaret</artifactId>
-  <version>3.1.10-beta2</version>
+  <version>3.1.10</version>
   <name>Fudaa-Mascaret</name>
   <packaging>pom</packaging>
   <modules>

Modified: trunk/soft/fudaa-mascaret/server/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/server/pom.xml	2013-12-12 10:22:45 UTC (rev 8547)
+++ trunk/soft/fudaa-mascaret/server/pom.xml	2013-12-12 10:23:26 UTC (rev 8548)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.10-beta2</version>
+    <version>3.1.10</version>
   </parent>
   <artifactId>mascaret-server</artifactId>
   <build>

Modified: trunk/soft/fudaa-mascaret/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/ui/pom.xml	2013-12-12 10:22:45 UTC (rev 8547)
+++ trunk/soft/fudaa-mascaret/ui/pom.xml	2013-12-12 10:23:26 UTC (rev 8548)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.10-beta2</version>
+    <version>3.1.10</version>
   </parent>
   <artifactId>mascaret-ui</artifactId>
   <build>

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-12-12 10:22:45 UTC (rev 8547)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-12-12 10:23:26 UTC (rev 8548)
@@ -149,8 +149,8 @@
 
   static {
     isApp_.name = "Fudaa-Mascaret";
-    isApp_.version = "3.1.10-beta2";
-    isApp_.date = "14-11-2013";
+    isApp_.version = "3.1.10";
+    isApp_.date = "12-12-2013";
     isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
 //    isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
     isApp_.contact = "ot-...@op...";
@@ -170,7 +170,7 @@
     isApp_.libraries = null;
     isApp_.thanks = new String[]{"Fudaa team"};
     idApp_.name = "Fudaa-Mascaret";
-    idApp_.version = "3.1.10-beta2";
+    idApp_.version = "3.1.10";
     idApp_.organization = "EDF-CETMEF";
     idApp_.author = author;
     idApp_.contact = "http://www.openmascaret.org/";

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:[8547] trunk/soft/fudaa-mascaret/server/src/main/java/org /fudaa/dodico/hydraulique1d/metier

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

Revision: 8547
          http://sourceforge.net/p/fudaa/svn/8547
Author:   bmarchan
Date:     2013-12-12 10:22:45 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Mascaret : Fix plantage sur calcul des resultats sedmientaires moyenn?\195?\169s si manque des variables hydrau

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java	2013-12-12 09:51:37 UTC (rev 8546)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java	2013-12-12 10:22:45 UTC (rev 8547)
@@ -478,12 +478,13 @@
     
     return true;
   }
-  
+
   /**
    * 
    * @param _var Variable dont on veut r\xE9cuperer les r\xE9sultats.
    * @return Un tableau \xE0 3 dimensions [nbbief][nbtps][nbsect], repr\xE9sentant les
-   *         r\xE9sultats pour la variable en entr\xE9e
+   *         r\xE9sultats pour la variable en entr\xE9e, ou null s'ils n'y a pas de
+   *         r\xE9sultats pour la variable.
    */
   public double[][][] getResultsVariable(MetierDescriptionVariable _var) {
     int ind=getIndiceVariable(_var.nom());

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java	2013-12-12 09:51:37 UTC (rev 8546)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java	2013-12-12 10:22:45 UTC (rev 8547)
@@ -107,6 +107,7 @@
       int nbTps=res_.valPas().length;
       
       double[][][] vals=res_.getResultsVariable(_var);
+      if (vals==null) return;
 
       double[][][] moyVals = new double[nbBief][nbTps][];
       for (int ibief = 0; ibief < nbBief; ibief++) {

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:[8545] trunk/soft/fudaa-mascaret/server/src

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

Revision: 8545
          http://sourceforge.net/p/fudaa/svn/8545
Author:   bmarchan
Date:     2013-12-12 09:48:17 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Mascaret : correction formulation

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleEngelundHansen.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleMeyerPeter.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSmartJaggi.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleEngelundHansen.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleEngelundHansen.java	2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleEngelundHansen.java	2013-12-12 09:48:17 UTC (rev 8545)
@@ -17,16 +17,15 @@
 
     double pente = _adapter.getValue(MetierDescriptionVariable.PENE, _ibief, _itps, _isect);
     double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
-    double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
-    double h1 = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
+    double rh1 = _adapter.getValue(MetierDescriptionVariable.RH1, _ibief, _itps, _isect);
+    double vmin = _adapter.getValue(MetierDescriptionVariable.VMIN, _ibief, _itps, _isect);
     
     double dens = _params.getDensiteMateriau();
     double d50 = _params.getD50();
     RetTauMoy taumoy = calculerTaumoy(_params, _adapter, _ibief, _isect, _itps);
     double teta = taumoy.tetaD50;
 
-    double rh1 = (h1 * larg) / (larg + 2 * h1);
-    double f = 2 * 9.81 * rh1 * pente / Math.pow((qmin / (h1 * larg)), 2);
+    double f = 2 * 9.81 * rh1 * pente / Math.pow(vmin, 2);
     double qs = larg * 0.1 / f * Math.pow((9.81 * (dens - 1) * Math.pow(d50, 3)), 0.5) * Math.pow(teta, (5. / 2));
 
     return qs;
@@ -35,11 +34,11 @@
   @Override
   public MetierDescriptionVariable[] getRequiredVariable() {
     return new MetierDescriptionVariable[] { 
-        MetierDescriptionVariable.B1, 
-        MetierDescriptionVariable.CHAR, 
-        MetierDescriptionVariable.QMIN, 
-        MetierDescriptionVariable.KMIN, 
-        MetierDescriptionVariable.Y 
+        MetierDescriptionVariable.B1,
+        MetierDescriptionVariable.CHAR,
+        MetierDescriptionVariable.KMIN,
+        MetierDescriptionVariable.RH1,
+        MetierDescriptionVariable.VMIN
     };
   }
 

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java	2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleLefort2007.java	2013-12-12 09:48:17 UTC (rev 8545)
@@ -31,7 +31,6 @@
     double dens = _params.getDensiteMateriau();
     double d90 = _params.getD90();
     double d30 = _params.getD30();
-    double d50 = _params.getD50();
 
     // ' initialisation des colonnes et des lignes
     // Col_Lefort07 = Range("Lefort07").Column
@@ -107,8 +106,11 @@
   @Override
   public MetierDescriptionVariable[] getRequiredVariable() {
     return new MetierDescriptionVariable[] { 
-        MetierDescriptionVariable.CHAR, MetierDescriptionVariable.QMIN, MetierDescriptionVariable.B1, 
-        MetierDescriptionVariable.KMIN, MetierDescriptionVariable.Y 
+        MetierDescriptionVariable.CHAR, 
+        MetierDescriptionVariable.QMIN,
+        MetierDescriptionVariable.B1, 
+        MetierDescriptionVariable.KMIN,
+        MetierDescriptionVariable.Y 
     };
   }
 

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleMeyerPeter.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleMeyerPeter.java	2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleMeyerPeter.java	2013-12-12 09:48:17 UTC (rev 8545)
@@ -51,9 +51,8 @@
     return new MetierDescriptionVariable[] {
         MetierDescriptionVariable.B1,
         MetierDescriptionVariable.CHAR,
-        MetierDescriptionVariable.QMIN,
         MetierDescriptionVariable.KMIN,
-        MetierDescriptionVariable.Y
+        MetierDescriptionVariable.RH1
     };
   }
 

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java	2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java	2013-12-12 09:48:17 UTC (rev 8545)
@@ -3,8 +3,6 @@
 import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
 import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpacialI;
 
-import com.memoire.fu.FuLog;
-
 /**
  * Calcul s\xE9dimentaire avec la formule de Recking 2010.
  * 
@@ -20,7 +18,6 @@
     double pente = _adapter.getValue(MetierDescriptionVariable.PENE, _ibief, _itps, _isect);
     double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
     double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
-//    double h = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
 
     double dens = _params.getDensiteMateriau();
     double d84 = _params.getD84();

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java	2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java	2013-12-12 09:48:17 UTC (rev 8545)
@@ -117,15 +117,14 @@
     double kr = _params.getRugosite();
     double ks = _adapter.getValue(MetierDescriptionVariable.KMIN, _ibief, _itps, _isect);
     double pente = _adapter.getValue(MetierDescriptionVariable.PENE, _ibief, _itps, _isect);
-    double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
-    double h1 = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
+    double rh1 = _adapter.getValue(MetierDescriptionVariable.RH1, _ibief, _itps, _isect);
     
     double d50 = _params.getD50();
     double diam = _params.getDmoyen();
     double dens = _params.getDensiteMateriau();
 
     // Calcul de tau
-    double rh1 = (h1 * larg) / (larg + 2. * h1);
+//    double rh1 = (h1 * larg) / (larg + 2. * h1);
 
     double tau = 9.81 * 1000. * rh1 * pente;
     double kpeau;

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSmartJaggi.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSmartJaggi.java	2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSmartJaggi.java	2013-12-12 09:48:17 UTC (rev 8545)
@@ -36,8 +36,7 @@
         MetierDescriptionVariable.CHAR,
         MetierDescriptionVariable.QMIN,
         MetierDescriptionVariable.KMIN,
-        MetierDescriptionVariable.B1,
-        MetierDescriptionVariable.Y
+        MetierDescriptionVariable.RH1
     };
   }
 

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java	2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java	2013-12-12 09:48:17 UTC (rev 8545)
@@ -16,8 +16,8 @@
   public double calculer(MetierParametresSediment _params, MetierResultatsTemporelSpacialI _adapter, int _ibief, int _isect, int _itps) {
 
     double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
-    double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
-    double h1 = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
+    double rh1 = _adapter.getValue(MetierDescriptionVariable.RH1, _ibief, _itps, _isect);
+    double vmin = _adapter.getValue(MetierDescriptionVariable.VMIN, _ibief, _itps, _isect);
 
     double dens = _params.getDensiteMateriau();
     double d50 = _params.getD50();
@@ -37,8 +37,8 @@
     // Qmin = Cells(ligne, Col_deb_cible)
     // H1 = Cells(ligne, Col_H)
 
-    double rh1 = (h1 * larg) / (larg + 2 * h1);
-    double u = qmin / (larg * h1);
+//    double rh1 = (h1 * larg) / (larg + 2 * h1);
+//    double u = qmin / (larg * h1);
     double det = d50 * Math.pow(((9.81 * (dens - 1)) / Math.pow(nu, 2)), (1. / 3));
 
     // 'calcul de uc*^2 via la courbe de schield
@@ -66,7 +66,7 @@
     }
 
     double ucetCarre = 9.81 * (dens - 1) * d50 * (alfa * Math.pow(det, beta));
-    double uet = Math.pow(9.81, 0.5) * u / (18 * Math.log10(4 * rh1 / d90));
+    double uet = Math.pow(9.81, 0.5) * vmin / (18 * Math.log10(4 * rh1 / d90));
     double t;
 
     if (Math.pow(uet, 2) > ucetCarre) {
@@ -83,9 +83,9 @@
   @Override
   public MetierDescriptionVariable[] getRequiredVariable() {
     return new MetierDescriptionVariable[] { 
-        MetierDescriptionVariable.QMIN, 
         MetierDescriptionVariable.B1, 
-        MetierDescriptionVariable.Y 
+        MetierDescriptionVariable.RH1,
+        MetierDescriptionVariable.VMIN
     };
   }
 

Modified: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java	2013-12-12 09:42:18 UTC (rev 8544)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java	2013-12-12 09:48:17 UTC (rev 8545)
@@ -97,6 +97,19 @@
       else if (_var.nom().equals(MetierDescriptionVariable.Y.nom())) {
         return hauteurs[_itps];
       }
+      else if (_var.nom().equals(MetierDescriptionVariable.RH1.nom())) {
+        double larg=50;
+        double h1=hauteurs[_itps];
+        return (h1 * larg) / (larg + 2 * h1);
+      }
+      else if (_var.nom().equals(MetierDescriptionVariable.VMIN.nom())) {
+        double larg=50;
+        double h1=hauteurs[_itps];
+        double qmin=debits[_itps];
+        return qmin / (h1 * larg);
+      }
+      
+      // Rayon hydraulique
       throw new AssertionFailedError();
     }
 

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:[8544] trunk/soft/fudaa-mascaret/server/src/main/ resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt

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

Revision: 8544
          http://sourceforge.net/p/fudaa/svn/8544
Author:   bmarchan
Date:     2013-12-12 09:42:18 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Mascaret : Correction traduction

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt

Modified: trunk/soft/fudaa-mascaret/server/src/main/resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt	2013-12-10 10:56:36 UTC (rev 8543)
+++ trunk/soft/fudaa-mascaret/server/src/main/resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt	2013-12-12 09:42:18 UTC (rev 8544)
@@ -132,7 +132,7 @@
 D\xE9bit solide moyenn\xE9=Averaged solid discharge
 Pente d'\xE9nergie=Energy slope
 Hauteur d'eau maximale=Maximal water depth
-Largeur au miroir mineure=Main channel width
+Largeur au miroir mineur=Main channel width
 Coefficient de frottement mineur=Main channel friction coefficient
 D\xE9bit mineur=Main channel discharge
 Vitesse mineur=Main channel velocity

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:[8543] trunk/soft/fudaa-mascaret

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

Revision: 8543
          http://sourceforge.net/p/fudaa/svn/8543
Author:   bmarchan
Date:     2013-12-10 10:56:36 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Mascaret : Traduction

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java
    trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1d_en.fr_txt
    trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/mascaret/mascaret_en.fr_txt

Modified: trunk/soft/fudaa-mascaret/server/src/main/resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt	2013-12-10 10:54:14 UTC (rev 8542)
+++ trunk/soft/fudaa-mascaret/server/src/main/resources/org/fudaa/dodico/hydraulique1d/hydraulique1d_en.fr_txt	2013-12-10 10:56:36 UTC (rev 8543)
@@ -128,3 +128,13 @@
 Calcul=Compute
 Temps \xE9coul\xE9=Elapsed time
 Dur\xE9e estim\xE9e=Estimated duration
+D\xE9bit solide=Solid discharge
+D\xE9bit solide moyenn\xE9=Averaged solid discharge
+Pente d'\xE9nergie=Energy slope
+Hauteur d'eau maximale=Maximal water depth
+Largeur au miroir mineure=Main channel width
+Coefficient de frottement mineur=Main channel friction coefficient
+D\xE9bit mineur=Main channel discharge
+Vitesse mineur=Main channel velocity
+Charge=Hydraulic head
+Rayon hydraulique mineur=Main channel hydraulic radius
\ No newline at end of file

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java	2013-12-10 10:54:14 UTC (rev 8542)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java	2013-12-10 10:56:36 UTC (rev 8543)
@@ -221,15 +221,15 @@
     if (tfD30_.getValue()==null || ((Double)tfD30_.getValue())<=0) 
       return getS("Diam\xE8tre fractile 30")+" : "+getS("La valeur doit \xEAtre strictement positive");
     if (tfD50_.getValue()==null || ((Double)tfD50_.getValue())<=0) 
-      return getS("Diam\xE8tre fractile 30")+" : "+getS("La valeur doit \xEAtre strictement positive");
+      return getS("Diam\xE8tre fractile 50")+" : "+getS("La valeur doit \xEAtre strictement positive");
     if (tfD84_.getValue()==null || ((Double)tfD84_.getValue())<=0) 
-      return getS("Diam\xE8tre fractile 30")+" : "+getS("La valeur doit \xEAtre strictement positive");
+      return getS("Diam\xE8tre fractile 84")+" : "+getS("La valeur doit \xEAtre strictement positive");
     if (tfD90_.getValue()==null || ((Double)tfD90_.getValue())<=0) 
-      return getS("Diam\xE8tre fractile 30")+" : "+getS("La valeur doit \xEAtre strictement positive");
+      return getS("Diam\xE8tre fractile 90")+" : "+getS("La valeur doit \xEAtre strictement positive");
     if (tfRugo_.getValue()==null || ((Double)tfRugo_.getValue())<=0) 
-      return getS("Rugosit\xE9")+" : "+getS("La valeur doit \xEAtre strictement positive");
+      return getS("Rugosit\xE9 de grain")+" : "+getS("La valeur doit \xEAtre strictement positive");
     if (tfDensMat_.getValue()==null || ((Double)tfDensMat_.getValue())<=0) 
-      return getS("Densit\xE9 mat\xE9riau")+" : "+getS("La valeur doit \xEAtre strictement positive");
+      return getS("Densit\xE9 de mat\xE9riau")+" : "+getS("La valeur doit \xEAtre strictement positive");
     if (tfDensApparente_.getValue()==null || ((Double)tfDensApparente_.getValue())<=0) 
       return getS("Densit\xE9 apparente")+" : "+getS("La valeur doit \xEAtre strictement positive");
     if (tfTauc_.getValue()==null) 
@@ -239,7 +239,7 @@
     if (lsFormule_.getSelectedIndex()==-1) 
       return getS("Aucun r\xE9sultat n'est s\xE9lectionn\xE9");
     if (cbResMoyennes_.isSelected() && (tfLargeur_.getValue()==null || ((Double)tfLargeur_.getValue())<0)) 
-      return getS("Largeur de fen\xEAtre de moyennation")+" : "+getS("La valeur doit \xEAtre positive");
+      return getS("Largeur de la fen\xEAtre de moyennation")+" : "+getS("La valeur doit \xEAtre positive");
 
     return null;
   }
@@ -351,21 +351,20 @@
 
   private void updateResults() {
     if (etude_.resultatsGeneraux().hasResultatsTemporelSpatial()) {
+      MetierCalculSediment calSed=new MetierCalculSediment(etude_.resultatsGeneraux().resultatsTemporelSpatial(), etude_.sediment().parametres());      
       // On supprime les resultats de s\xE9dimentologie pr\xE9c\xE9dents.
-      for (MetierDescriptionVariable var : MetierSediment.VARIABLES) {
-        etude_.resultatsGeneraux().resultatsTemporelSpatial().removeResultsVariable(var);
-      }
+      calSed.clearResultatsSediment();
 
       // On ajoute le nouveau r\xE9sultat
       if (etude_.sediment().parametres().isActif()) {
-        MetierCalculSediment calSed=new MetierCalculSediment(etude_.resultatsGeneraux().resultatsTemporelSpatial(), etude_.sediment().parametres());
+        
         MetierDescriptionVariable[] vars=calSed.computeResultsForVariables();
         if (vars.length!=0) {
           StringBuilder sb=new StringBuilder();
           for (MetierDescriptionVariable var : vars) {
             sb.append("\n- ").append(var.description());
           }
-          JOptionPane.showMessageDialog(this, getS("Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour\nle calcul s\xE9dimentologique par les formules choisies:{0}\n\nCertains r\xE9sultats s\xE9dimentologiques ne seront pas calcul\xE9s.", sb.toString()),
+          JOptionPane.showMessageDialog(this, getS("Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour\nle calcul des r\xE9sultats s\xE9dimentologiques choisis:{0}\n\nCertains r\xE9sultats s\xE9dimentologiques ne seront pas calcul\xE9s.", sb.toString()),
               getS("Attention"), JOptionPane.WARNING_MESSAGE);
         
         }

Modified: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1d_en.fr_txt
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1d_en.fr_txt	2013-12-10 10:54:14 UTC (rev 8542)
+++ trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/hydraulique1d/hydraulique1d_en.fr_txt	2013-12-10 10:56:36 UTC (rev 8543)
@@ -848,7 +848,7 @@
 Volume du lit actif=Volume of the active channel
 Volume cumul\xE9 des zones de stockage=Cumulated volume of ineffectif flow areas
 Volume de stockage=Volume of ineffectif flow areas
-Hauteur d'eau moyenne=Average water level
+Hauteur d'eau moyenne=Average water depth
 Cote rive gauche=Left bank water level
 Cote de la rive gauche=Left bank water level
 Cote rive droite=Right bank water level
@@ -1230,4 +1230,25 @@
 Biefs=Reaches
 Avancer vite=Quick forward
 Reculer vite=Quick backward
-j=d
\ No newline at end of file
+j=d
+Edition des param\xE8tres de s\xE9dimentologie=Editing sedimentology parameters
+S\xE9dimentologie active=Sedimentology active
+Diam\xE8tre moyen=Medium diameter
+Diam\xE8tre fractile 30=Fractile diameter 30
+Diam\xE8tre fractile 50=Fractile diameter 50
+Diam\xE8tre fractile 84=Fractile diameter 84
+Diam\xE8tre fractile 90=Fractile diameter 90
+Rugosit\xE9 de grain=Particule roughness
+Densit\xE9 de mat\xE9riau=Material density
+Densit\xE9 apparente=Bulk density
+Contrainte critique adimensionnelle=Dimensionless critical stress
+R\xE9sultats calcul\xE9s=Calculated results
+Largeur de la fen\xEAtre de moyennation=Width of the averaging window
+Inclure les r\xE9sultats moyenn\xE9s=Include the averaged results
+Erreur de mise en donn\xE9es=Error formatting data
+La valeur doit \xEAtre strictement positive=The value must be strictly positive
+La valeur doit \xEAtre donn\xE9e=The value must be set
+Aucun r\xE9sultat n'est s\xE9lectionn\xE9=No result is selected
+La valeur doit \xEAtre positive=The value must be positive
+Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour\nle calcul des r\xE9sultats s\xE9dimentologiques choisis\:{0}\n\nCertains r\xE9sultats s\xE9dimentologiques ne seront pas calcul\xE9s=The following hydraulic results are needed for\nthe calculation of selected sedimentological results\:{0}\n\nSome sedimentological results will not be calculated
+Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour\nle calcul des r\xE9sultats s\xE9dimentologiques choisis\:{0}\n\nCertains r\xE9sultats s\xE9dimentologiques ne seront pas calcul\xE9s.\nVoulez-vous poursuivre ?=The following hydraulic results are needed for\nthe calculation of selected sedimentological results\:{0}\n\nSome sedimentological results will not be calculated.\nDo you want to continue ?
\ No newline at end of file

Modified: trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/mascaret/mascaret_en.fr_txt
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/mascaret/mascaret_en.fr_txt	2013-12-10 10:54:14 UTC (rev 8542)
+++ trunk/soft/fudaa-mascaret/ui/src/main/resources/org/fudaa/fudaa/mascaret/mascaret_en.fr_txt	2013-12-10 10:56:36 UTC (rev 8543)
@@ -113,3 +113,5 @@
 seuil=weir
 tarage=rating
 tracer=Tracer
+S\xE9diment=Sediment
+Param\xE8tres de s\xE9dimentologie=Sedimentology parameters

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:[8542] trunk/soft/fudaa-mascaret

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

Revision: 8542
          http://sourceforge.net/p/fudaa/svn/8542
Author:   bmarchan
Date:     2013-12-10 10:54:14 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Chgt version => 3.1.10-beta2

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/distrib/pom.xml
    trunk/soft/fudaa-mascaret/pom.xml
    trunk/soft/fudaa-mascaret/server/pom.xml
    trunk/soft/fudaa-mascaret/ui/pom.xml

Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml	2013-12-09 15:33:58 UTC (rev 8541)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml	2013-12-10 10:54:14 UTC (rev 8542)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.10-beta1</version>
+    <version>3.1.10-beta2</version>
   </parent>
   <artifactId>mascaret-distrib</artifactId>
   <properties>

Modified: trunk/soft/fudaa-mascaret/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/pom.xml	2013-12-09 15:33:58 UTC (rev 8541)
+++ trunk/soft/fudaa-mascaret/pom.xml	2013-12-10 10:54:14 UTC (rev 8542)
@@ -15,7 +15,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
   <artifactId>fudaa-mascaret</artifactId>
-  <version>3.1.10-beta1</version>
+  <version>3.1.10-beta2</version>
   <name>Fudaa-Mascaret</name>
   <packaging>pom</packaging>
   <modules>

Modified: trunk/soft/fudaa-mascaret/server/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/server/pom.xml	2013-12-09 15:33:58 UTC (rev 8541)
+++ trunk/soft/fudaa-mascaret/server/pom.xml	2013-12-10 10:54:14 UTC (rev 8542)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.10-beta1</version>
+    <version>3.1.10-beta2</version>
   </parent>
   <artifactId>mascaret-server</artifactId>
   <build>

Modified: trunk/soft/fudaa-mascaret/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/ui/pom.xml	2013-12-09 15:33:58 UTC (rev 8541)
+++ trunk/soft/fudaa-mascaret/ui/pom.xml	2013-12-10 10:54:14 UTC (rev 8542)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.10-beta1</version>
+    <version>3.1.10-beta2</version>
   </parent>
   <artifactId>mascaret-ui</artifactId>
   <build>

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:[8541] trunk/soft/fudaa-mascaret

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

Revision: 8541
          http://sourceforge.net/p/fudaa/svn/8541
Author:   bmarchan
Date:     2013-12-09 15:33:58 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Mascaret : Revision fenetre parametres s?\195?\169diment

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierParametresSediment.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierParametresSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierParametresSediment.java	2013-12-09 15:33:17 UTC (rev 8540)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierParametresSediment.java	2013-12-09 15:33:58 UTC (rev 8541)
@@ -37,8 +37,12 @@
   private double densApparente_=2;
   /** Contrainte critique adimensionnelle */
   private double tauc_=0.047;
-  /** Formules de calcul */
+  /** R\xE9sultats calcul\xE9s */
   private MetierFormuleSediment[] formules_;
+  /** Les r\xE9sultats moyenn\xE9s sont-ils calcul\xE9s */
+  private boolean isResMoyCalcules_;
+  /** La fenetre pour le calcul de moyennation */
+  private double lgFenetre_=0.0;
 
   // Constructeur.
   public MetierParametresSediment() {
@@ -64,6 +68,8 @@
       setTauc(q.getTauc());
       setFormules(q.getFormules());
       setActif(q.isActif());
+      setLargeurFenetre(q.getLargeurFenetre());
+      setResMoyCalcules(q.isResMoyCalcules());
     }
   }
 
@@ -203,7 +209,29 @@
     Notifieur.getNotifieur().fireObjetModifie(toString(), this, "Formules");
     this.formules_ = _formules;
   }
+  
+  public boolean isResMoyCalcules() {
+    return isResMoyCalcules_;
+  }
 
+  public void setResMoyCalcules(boolean isResMoyCalcules) {
+    if (isResMoyCalcules_==isResMoyCalcules) return;
+    Notifieur.getNotifieur().fireObjetModifie(toString(), this, "ResultatsMoyennes");
+    this.isResMoyCalcules_ = isResMoyCalcules;
+  }
+
+  public double getLargeurFenetre() {
+    return lgFenetre_;
+  }
+
+  public void setLargeurFenetre(double largeurFenetre) {
+    if (lgFenetre_==largeurFenetre) return;
+    Notifieur.getNotifieur().fireObjetModifie(toString(), this, "LargeurFenetre");
+    this.lgFenetre_ = largeurFenetre;
+  }
+
+
+
   /**
    * Controle que les variables pass\xE9es en param\xE8tres suffisent a calculer les formules s\xE9dimentaires.
    * 
@@ -244,7 +272,9 @@
         + " Densite apparente=" + densApparente_
         + " Densite materiau=" + densMat_
         + " Tauc=" + tauc_
-        + " Nb formules=" + formules_ ==null ? "0":""+formules_.length;
+        + " Nb formules=" + formules_ ==null ? "0":""+formules_.length
+        + "Resultats moyennes=" + isResMoyCalcules_
+        + "Fenetre moyennation=" + lgFenetre_;
 
     return res;
   }

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java	2013-12-09 15:33:17 UTC (rev 8540)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java	2013-12-09 15:33:58 UTC (rev 8541)
@@ -13,7 +13,7 @@
 import javax.swing.JCheckBox;
 import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
-import javax.swing.border.Border;
+import javax.swing.SwingConstants;
 import javax.swing.border.EtchedBorder;
 
 import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
@@ -29,6 +29,7 @@
 
 import com.memoire.bu.BuGridLayout;
 import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuLib;
 import com.memoire.bu.BuList;
 import com.memoire.bu.BuPanel;
 import com.memoire.bu.BuTextField;
@@ -48,7 +49,6 @@
   private MetierEtude1d etude_;
 
   private JCheckBox cbActif_;
-  private BuGridLayout lyCenter_;
   private BuLabel lbDmoy_;
   private BuTextField tfDmoy_;
   private BuLabel lbD30_;
@@ -72,9 +72,12 @@
   private BuLabel lbFormule_;
   private BuList lsFormule_;
   private DefaultListModel mdFormule_;
-  private BuPanel pnCenter_;
   private BuPanel pnPrincipal_;
   private BorderLayout lyPrincipal_;
+  private JCheckBox cbResMoyennes_;
+  private BuLabel lbLargeur_;
+  private BuTextField tfLargeur_;
+  private BuLabel lbResMoyennes_;
 
   public Hydraulique1dParametresSedimentEditor() {
     this(null);
@@ -111,7 +114,33 @@
     tfTauc_=BuTextField.createDoubleField();
     lbTEau_=new BuLabel(getS("Temp\xE9rature de l'eau"));
     tfTEau_=BuTextField.createDoubleField();
-    lbFormule_=new BuLabel(getS("Formules de calcul"));
+
+    BuPanel pnParams=new BuPanel();
+    pnParams.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED),getS("Param\xE8tres")));
+    pnParams.setLayout(new BuGridLayout(2,5,2));
+    pnParams.add(lbDmoy_);
+    pnParams.add(tfDmoy_);
+    pnParams.add(lbD30_);
+    pnParams.add(tfD30_);
+    pnParams.add(lbD50_);
+    pnParams.add(tfD50_);
+    pnParams.add(lbD84_);
+    pnParams.add(tfD84_);
+    pnParams.add(lbD90_);
+    pnParams.add(tfD90_);
+    pnParams.add(lbRugo_);
+    pnParams.add(tfRugo_);
+    pnParams.add(lbDensMat_);
+    pnParams.add(tfDensMat_);
+    pnParams.add(lbDensApparente_);
+    pnParams.add(tfDensApparente_);
+    pnParams.add(lbTauc_);
+    pnParams.add(tfTauc_);
+    pnParams.add(lbTEau_);
+    pnParams.add(tfTEau_);
+    
+    lbFormule_=new BuLabel(getS("R\xE9sultats calcul\xE9s"));
+    lbFormule_.setVerticalAlignment(SwingConstants.TOP);
     mdFormule_=new DefaultListModel();
     for (MetierFormuleSediment item : MetierFormuleSediment.values()) {
       mdFormule_.addElement(item);
@@ -120,42 +149,38 @@
     JScrollPane spFormule=new JScrollPane(lsFormule_);
     spFormule.setPreferredSize(new Dimension(150,100));
     
+    cbResMoyennes_=new JCheckBox();
+    cbResMoyennes_.setHorizontalTextPosition(SwingConstants.LEFT);
+    cbResMoyennes_.addItemListener(new ItemListener() {
+      @Override
+      public void itemStateChanged(ItemEvent e) {
+        lbLargeur_.setEnabled(cbResMoyennes_.isSelected());
+        tfLargeur_.setEnabled(cbResMoyennes_.isSelected());
+      }
+    });
+    lbLargeur_=new BuLabel(getS("Largeur de la fen\xEAtre de moyennation"));
+    tfLargeur_=BuTextField.createDoubleField();
+    lbResMoyennes_ = new BuLabel(getS("Inclure les r\xE9sultats moyenn\xE9s"));
+    
+    BuPanel pnResults=new BuPanel();
+    pnResults.setLayout(new BuGridLayout(2, 5, 2));
+    pnResults.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED),getS("R\xE9sultats")));
+    pnResults.add(lbFormule_);
+    pnResults.add(spFormule);
+    pnResults.add(lbResMoyennes_);
+    pnResults.add(cbResMoyennes_);
+    pnResults.add(lbLargeur_);
+    pnResults.add(tfLargeur_);
 
-    lyCenter_=new BuGridLayout(2,5,2);
-    pnCenter_=new BuPanel();
-    pnCenter_.setBorder(BorderFactory.createEmptyBorder(0,0,5,0)); // Pour des pb d'affichage.
-    pnCenter_.setLayout(lyCenter_);
-    pnCenter_.add(lbDmoy_);
-    pnCenter_.add(tfDmoy_);
-    pnCenter_.add(lbD30_);
-    pnCenter_.add(tfD30_);
-    pnCenter_.add(lbD50_);
-    pnCenter_.add(tfD50_);
-    pnCenter_.add(lbD84_);
-    pnCenter_.add(tfD84_);
-    pnCenter_.add(lbD90_);
-    pnCenter_.add(tfD90_);
-    pnCenter_.add(lbRugo_);
-    pnCenter_.add(tfRugo_);
-    pnCenter_.add(lbDensMat_);
-    pnCenter_.add(tfDensMat_);
-    pnCenter_.add(lbDensApparente_);
-    pnCenter_.add(tfDensApparente_);
-    pnCenter_.add(lbTauc_);
-    pnCenter_.add(tfTauc_);
-    pnCenter_.add(lbTEau_);
-    pnCenter_.add(tfTEau_);
-    pnCenter_.add(lbFormule_);
-    pnCenter_.add(spFormule);
-
-    Border bd=BorderFactory.createEtchedBorder(EtchedBorder.LOWERED);
     pnPrincipal_=new BuPanel();
-    pnPrincipal_.setBorder(BorderFactory.createTitledBorder(bd,getS("Param\xE8tres")));
     lyPrincipal_=new BorderLayout(5,0);
     pnPrincipal_.setLayout(lyPrincipal_);
-    pnPrincipal_.add(pnCenter_,BorderLayout.CENTER);
+    pnPrincipal_.add(pnParams,BorderLayout.CENTER);
+    pnPrincipal_.add(pnResults,BorderLayout.SOUTH);
     getContentPane().add(cbActif_,BorderLayout.NORTH);
     getContentPane().add(pnPrincipal_,BorderLayout.CENTER);
+    
+    BuLib.giveSameWidth(lbResMoyennes_,lbLargeur_,lbFormule_,lbTauc_);
 
     param_= null;
     setNavPanel(EbliPreferences.DIALOG.VALIDER|EbliPreferences.DIALOG.ANNULER);
@@ -212,7 +237,9 @@
     if (tfTEau_.getValue()==null) 
       return getS("Temp\xE9rature de l'eau")+" : "+getS("La valeur doit \xEAtre donn\xE9e");
     if (lsFormule_.getSelectedIndex()==-1) 
-      return getS("Aucune formule n'est s\xE9lectionn\xE9e");
+      return getS("Aucun r\xE9sultat n'est s\xE9lectionn\xE9");
+    if (cbResMoyennes_.isSelected() && (tfLargeur_.getValue()==null || ((Double)tfLargeur_.getValue())<0)) 
+      return getS("Largeur de fen\xEAtre de moyennation")+" : "+getS("La valeur doit \xEAtre positive");
 
     return null;
   }
@@ -287,6 +314,19 @@
       param_.setFormules(formules);
       changed=true;
     }
+    
+    boolean isResMoyennes=cbResMoyennes_.isSelected();
+    if (isResMoyennes!=param_.isResMoyCalcules()) {
+      param_.setResMoyCalcules(isResMoyennes);
+      changed=true;
+    }
+    if (!isResMoyennes) return changed;
+    
+    double lgFenetre=((Double)tfLargeur_.getValue());
+    if (lgFenetre!=param_.getLargeurFenetre()) {
+      param_.setLargeurFenetre(lgFenetre);
+      changed=true;
+    }
 
     return changed;
   }
@@ -357,6 +397,10 @@
     tfTauc_.setEnabled(b);
     tfTEau_.setEnabled(b);
     lsFormule_.setEnabled(b);
+    lbResMoyennes_.setEnabled(b);
+    cbResMoyennes_.setEnabled(b);
+    lbLargeur_.setEnabled(b & cbResMoyennes_.isSelected());
+    tfLargeur_.setEnabled(b & cbResMoyennes_.isSelected());
   }
   
   @Override
@@ -366,7 +410,6 @@
     }
 
     cbActif_.setSelected(param_.isActif());
-    changeCbActif();
     tfDmoy_.setValue(param_.getDmoyen());
     tfD30_.setValue(param_.getD30());
     tfD50_.setValue(param_.getD50());
@@ -386,5 +429,10 @@
           lsFormule_.addSelectionInterval(idx,idx);
       }
     }
+    
+    cbResMoyennes_.setSelected(param_.isResMoyCalcules());
+    tfLargeur_.setValue(param_.getLargeurFenetre());
+    
+    changeCbActif();
   }
 }

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:[8540] trunk/soft/fudaa-mascaret/ui/src/main/java/org/ fudaa/fudaa/hydraulique1d

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

Revision: 8540
          http://sourceforge.net/p/fudaa/svn/8540
Author:   bmarchan
Date:     2013-12-09 15:33:17 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Mascaret : Algo lissage g?\195?\169n?\195?\169rique

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLissageProfilEditor.java

Added Paths:
-----------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/CourbeLissable.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/Hydraulique1DUtils.java

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java	2013-12-09 15:30:51 UTC (rev 8539)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java	2013-12-09 15:33:17 UTC (rev 8540)
@@ -32,6 +32,8 @@
 
 import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
 import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.fudaa.hydraulique1d.util.CourbeLissable;
+import org.fudaa.fudaa.hydraulique1d.util.Hydraulique1DUtils;
 
 /**
  * Mod\xE8le de donn\xE9e utilis\xE9 pour repr\xE9senter un profil.
@@ -41,7 +43,7 @@
  * @version      $Revision: 1.15 $ $Date: 2007-11-20 11:43:05 $ by $Author: bmarchan $
  * @author       Jean-Marc Lacombe, Bertrand Marchand
  */
-public final class Hydraulique1dProfilModel implements Cloneable, Hydraulique1dProfilI {
+public final class Hydraulique1dProfilModel implements Cloneable, Hydraulique1dProfilI, CourbeLissable {
   /** Insertion : Mask zone vide */
   public static final int MASK_ZONE_VIDE=0;
   /** Insertion : Mask zone stockage gauche */
@@ -1494,6 +1496,31 @@
     fireDataChanged(Hydraulique1dProfilDataEvent.GLOBAL_MODIFICATION,null);
   }
 
+  @Override
+  public int getNbPoints() {
+    return this.getPoints().length;
+  }
+
+  @Override
+  public double getX(int _ipt) {
+    return this.getCurv(_ipt);
+  }
+
+  @Override
+  public double getY(int _ipt) {
+    return this.getZ(_ipt);
+  }
+
+  @Override
+  public boolean canModifyY(int _ipt) {
+    return (_ipt != this.getIndiceLitMajGa() && _ipt != this.getIndiceLitMinGa() && _ipt != this.getIndiceLitMinDr() && _ipt != this.getIndiceLitMajDr());
+  }
+
+  @Override
+  public void setY(int _ipt, double _y) {
+    this.getPoint(_ipt).y(_y);
+  }
+
   /**
    * Lisse le profil suivant une m\xE9thode m\xE9diane/moyenne glissante.
    * @param _meth La m\xE9thode de lissage (0: Mediane, 1: Moyenne)
@@ -1507,56 +1534,8 @@
     indicesNonNuls_=null;
     supprimePointsNuls(); // On enleve les points nuls, problematique des les m\xE9thodes globales.
 
-    // Pour les y modifi\xE9s on travaille sur un tableau temporaire.
-    double[] ypts=new double[nb];
-    // Les y des points dans la fenetre
-    Vector<Double> vyptsFen=new Vector<Double>();
+    Hydraulique1DUtils.lisser(this, _l, _meth, true);
 
-    for (int i=0; i<nb; i++) {
-      vyptsFen.clear();
-
-      double xpt=((Hydraulique1dPoint)listePoints_.get(i)).x();
-      vyptsFen.add(listePoints_.get(i).Y());
-
-      // Les points supportant des limites ne doivent pas \xEAtre modifi\xE9s.
-      if (i!=getIndiceLitMajGa() && i!=getIndiceLitMinGa() && i!=getIndiceLitMinDr() && i!=getIndiceLitMajDr()) {
-        Hydraulique1dPoint pt;
-
-        int ind=i-1;
-        // Les points pr\xE9c\xE9dents (on passe les points nuls)
-        while (ind>=0&&Math.abs((pt=listePoints_.get(ind)).x()-xpt)<_l) {
-          vyptsFen.add(pt.Y());
-          ind--;
-        }
-        // Les points suivants (on passe les points nuls)
-        ind=i+1;
-        while (ind<nb&&Math.abs((pt=listePoints_.get(ind)).x()-xpt)<_l) {
-          vyptsFen.add(pt.Y());
-          ind++;
-        }
-      }
-
-      Double[] yptsFen=vyptsFen.toArray(new Double[vyptsFen.size()]);
-
-      // M\xE9diane glissante : La moyenne des 2 valeurs centrales apr\xE8s tri des valeurs.
-      if (_meth==0) {
-        Arrays.sort(yptsFen);
-        if (yptsFen.length%2==1)
-          ypts[i]=yptsFen[yptsFen.length/2].doubleValue();
-        else
-          ypts[i]=(yptsFen[yptsFen.length/2].doubleValue()+yptsFen[yptsFen.length/2-1].doubleValue())/2.;
-      }
-
-      // Moyenne glissante : La moyenne de toutes les valeurs.
-      else {
-        for (int j=0; j<yptsFen.length; j++) ypts[i]+=yptsFen[j].doubleValue();
-        ypts[i]/=yptsFen.length;
-      }
-    }
-
-    // Mise a jour du profil
-    for (int i=0; i<nb; i++) ((Hydraulique1dPoint)listePoints_.get(i)).y(ypts[i]);
-
     fireDataChanged(Hydraulique1dProfilDataEvent.GLOBAL_MODIFICATION,null);
   }
 

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLissageProfilEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLissageProfilEditor.java	2013-12-09 15:30:51 UTC (rev 8539)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLissageProfilEditor.java	2013-12-09 15:33:17 UTC (rev 8540)
@@ -23,11 +23,13 @@
 import javax.swing.JPanel;
 import javax.swing.border.Border;
 
+import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
+import org.fudaa.fudaa.hydraulique1d.util.Hydraulique1DUtils;
+
 import com.memoire.bu.BuButton;
 import com.memoire.bu.BuGridLayout;
 import com.memoire.bu.BuResource;
 import com.memoire.bu.BuTextField;
-import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
 
 /**
  * Editeur pour le choix de la m\xE9thode de lissage.
@@ -35,8 +37,6 @@
  * @version 1.0
  */
 public class Hydraulique1dLissageProfilEditor extends JDialog {
-  public static final int LISSAGE_MOYENNE=1;
-  public static final int LISSAGE_MEDIANE=0;
 
   private JPanel pnPrinc_=new JPanel();
   private Border bdpnPrinc_;
@@ -51,6 +51,7 @@
   private JLabel lbLargeur_=new JLabel();
   private BuTextField tfLargeur_=BuTextField.createDoubleField();
   private JLabel lbLargeurUnite_=new JLabel();
+  private int[] methods_=new int[]{Hydraulique1DUtils.LISSAGE_MEDIANE,Hydraulique1DUtils.LISSAGE_MOYENNE};
   public int reponse=0;
 
   public Hydraulique1dLissageProfilEditor(Frame parent) {
@@ -66,6 +67,20 @@
     pack();
     setLocationRelativeTo(parent);
   }
+  
+  public void setChoosableMethods(int... _methods) {
+    methods_=_methods;
+    
+    coMethode_.removeAllItems();
+    for (int i=0; i<_methods.length; i++) {
+      if (_methods[i]==Hydraulique1DUtils.LISSAGE_MEDIANE) {
+        coMethode_.addItem(Hydraulique1dResource.HYDRAULIQUE1D.getString("Par m\xE9diane glissante"));
+      }
+      else {
+        coMethode_.addItem(Hydraulique1dResource.HYDRAULIQUE1D.getString("Par moyenne glissante"));
+      }
+    }
+  }
 
   private void jbInit() throws Exception {
     bdpnPrinc_=BorderFactory.createCompoundBorder(BorderFactory.createEtchedBorder(Color.white, new Color(165, 163, 151)),
@@ -136,7 +151,7 @@
    * @return La m\xE9thode utilis\xE9e.
    */
   public int getMethode() {
-    return coMethode_.getSelectedIndex();
+    return methods_[coMethode_.getSelectedIndex()];
   }
 
   /**

Added: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/CourbeLissable.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/CourbeLissable.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/CourbeLissable.java	2013-12-09 15:33:17 UTC (rev 8540)
@@ -0,0 +1,39 @@
+package org.fudaa.fudaa.hydraulique1d.util;
+
+/**
+ * A implementer pour l'algorithme de lissage.
+ * @author Bertrand Marchand (mar...@de...)
+ *
+ */
+public interface CourbeLissable {
+  
+  /**
+   * @return Le nombre de points de la courbe
+   */
+  public int getNbPoints();
+  
+  /**
+   * @param _ipt L'indice du point
+   * @return La coordonn\xE9e X du point
+   */
+  public double getX(int _ipt);
+  
+  /**
+   * @param _ipt L'indice du point
+   * @return La coordonn\xE9e Y du point
+   */
+  public double getY(int _ipt);
+  
+  /**
+   * @param _ipt L'indice du point
+   * @return True si le point peut \xEAtre liss\xE9.
+   */
+  public boolean canModifyY(int _ipt);
+  
+  /**
+   * Modification du point donn\xE9 avec la valeur donn\xE9e.
+   * @param _ipt L'indice du point
+   * @param _y La valeur y.
+   */
+  public void setY(int _ipt, double _y);
+}


Property changes on: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/CourbeLissable.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/Hydraulique1DUtils.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/Hydraulique1DUtils.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/Hydraulique1DUtils.java	2013-12-09 15:33:17 UTC (rev 8540)
@@ -0,0 +1,81 @@
+package org.fudaa.fudaa.hydraulique1d.util;
+
+import java.util.Arrays;
+import java.util.Vector;
+
+/**
+ * Des algorithmes de calcul g\xE9n\xE9raux.
+ * 
+ * @author Bertrand Marchand (mar...@de...)
+ */
+public class Hydraulique1DUtils {
+  /** Types de lissage */
+  public static final int LISSAGE_MOYENNE=1;
+  public static final int LISSAGE_MEDIANE=0;
+  
+  /**
+   * @param _crb La courbe a lisser
+   * @param _lissPtExtr True : Les points extremit\xE9s sont liss\xE9s.
+   * @param _meth La m\xE9thode de lissage.
+   * @param _larg La largeur de fenetre de lissage.
+   */
+  public static void lisser(CourbeLissable _crb, double _larg, int _meth, boolean _lissPtExtr) {
+    
+    int nb=_crb.getNbPoints();
+    if (nb==0) return;
+
+    // Pour les y modifi\xE9s on travaille sur un tableau temporaire.
+    double[] ypts=new double[nb];
+    // Les y des points dans la fenetre
+    Vector<Double> vyptsFen=new Vector<Double>();
+
+    double xmax=_crb.getX(nb-1);
+    
+    for (int i=0; i<nb; i++) {
+      vyptsFen.clear();
+
+      double xpt=_crb.getX(i);
+      vyptsFen.add(_crb.getY(i));
+      
+      boolean isPtExtr = xpt<_larg/2 | xpt>xmax-_larg/2;
+
+      // Les points supportant des limites ne doivent pas \xEAtre modifi\xE9s.
+      if (_crb.canModifyY(i) && (_lissPtExtr | !isPtExtr)) {
+
+        int ind=i-1;
+        // Les points pr\xE9c\xE9dents (on passe les points nuls)
+        while (ind>=0&&Math.abs(_crb.getX(ind)-xpt)<_larg/2) {
+          vyptsFen.add(_crb.getY(ind));
+          ind--;
+        }
+        // Les points suivants (on passe les points nuls)
+        ind=i+1;
+        while (ind<nb&&Math.abs(_crb.getX(ind)-xpt)<_larg/2) {
+          vyptsFen.add(_crb.getY(ind));
+          ind++;
+        }
+      }
+
+      Double[] yptsFen=vyptsFen.toArray(new Double[vyptsFen.size()]);
+
+      // M\xE9diane glissante : La moyenne des 2 valeurs centrales apr\xE8s tri des valeurs.
+      if (_meth==LISSAGE_MEDIANE) {
+        Arrays.sort(yptsFen);
+        if (yptsFen.length%2==1)
+          ypts[i]=yptsFen[yptsFen.length/2].doubleValue();
+        else
+          ypts[i]=(yptsFen[yptsFen.length/2].doubleValue()+yptsFen[yptsFen.length/2-1].doubleValue())/2.;
+      }
+
+      // Moyenne glissante : La moyenne de toutes les valeurs.
+      else {
+        for (int j=0; j<yptsFen.length; j++) ypts[i]+=yptsFen[j].doubleValue();
+        ypts[i]/=yptsFen.length;
+      }
+    }
+
+    // Mise a jour du profil
+    for (int i=0; i<nb; i++) _crb.setY(i,ypts[i]);
+  }
+
+}


Property changes on: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/util/Hydraulique1DUtils.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fudaa-svn-commit] SF.net SVN: fudaa:[8539] trunk/framework/ctulu-bu/src/main/java/com/memoire /bu/BuLib.java

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

Revision: 8539
          http://sourceforge.net/p/fudaa/svn/8539
Author:   bmarchan
Date:     2013-12-09 15:30:51 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Chgt signature de m?\195?\169thode pour + de souplesse

Modified Paths:
--------------
    trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuLib.java

Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuLib.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuLib.java	2013-12-06 15:40:18 UTC (rev 8538)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/bu/BuLib.java	2013-12-09 15:30:51 UTC (rev 8539)
@@ -1740,7 +1740,7 @@
    *
    * @param _components Les composant.
    */
-  public static void giveSameWidth(JComponent[] _components) {
+  public static void giveSameWidth(JComponent... _components) {
     int max = 0;
 
     for (int i = 0; i < _components.length; i++) {
@@ -1759,7 +1759,7 @@
    *
    * @param _components Les composant.
    */
-  public static void giveSameHeight(JComponent[] _components) {
+  public static void giveSameHeight(JComponent... _components) {
     int max = 0;
 
     for (int i = 0; i < _components.length; i++) {

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:[8538] trunk/framework/ebli-graphe/src/main/java/org/ fudaa/ebli/graphe

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

Revision: 8538
          http://sourceforge.net/p/fudaa/svn/8538
Author:   bmarchan
Date:     2013-12-06 15:40:18 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
Constructeur courbe a partir de points

Modified Paths:
--------------
    trunk/framework/ebli-graphe/src/main/java/org/fudaa/ebli/graphe/CourbeDefault.java
    trunk/framework/ebli-graphe/src/main/java/org/fudaa/ebli/graphe/Valeur.java

Modified: trunk/framework/ebli-graphe/src/main/java/org/fudaa/ebli/graphe/CourbeDefault.java
===================================================================
--- trunk/framework/ebli-graphe/src/main/java/org/fudaa/ebli/graphe/CourbeDefault.java	2013-12-05 11:51:42 UTC (rev 8537)
+++ trunk/framework/ebli-graphe/src/main/java/org/fudaa/ebli/graphe/CourbeDefault.java	2013-12-06 15:40:18 UTC (rev 8538)
@@ -22,10 +22,25 @@
  */
 public class CourbeDefault extends Courbe {
 
-  public List valeurs_;
+  public List<Valeur> valeurs_;
 
+  /**
+   * Constructeur avec x et y donn\xE9s. Les tableaux doivent avoir m\xEAme taille.
+   * @param _x Les coordonn\xE9es x
+   * @param _y Les coordonn\xE9es y
+   */
+  public CourbeDefault(double[] _x, double[] _y) {
+    if (_x==null || _y==null || _x.length!=_y.length)
+      throw new IllegalArgumentException("_x et _y doivent avoir la m\xEAme taille");
+    
+    valeurs_=new ArrayList<Valeur>(_x.length);
+    for (int i=0; i<_x.length; i++) {
+      valeurs_.add(new Valeur(_x[i],_y[i]));
+    }
+  }
+  
   public CourbeDefault() {
-    valeurs_ = new ArrayList(1);
+    valeurs_ = new ArrayList<Valeur>(1);
   }
 
   public static CourbeDefault parse(final Lecteur _lin) {

Modified: trunk/framework/ebli-graphe/src/main/java/org/fudaa/ebli/graphe/Valeur.java
===================================================================
--- trunk/framework/ebli-graphe/src/main/java/org/fudaa/ebli/graphe/Valeur.java	2013-12-05 11:51:42 UTC (rev 8537)
+++ trunk/framework/ebli-graphe/src/main/java/org/fudaa/ebli/graphe/Valeur.java	2013-12-06 15:40:18 UTC (rev 8538)
@@ -26,11 +26,19 @@
   public double vinf_;
   public double vsup_;
   public Aspect aspect_;
+  
   public Valeur() {
     titre_= CtuluLibString.EMPTY_STRING;
   }
-  public static Vector parse(final Lecteur _lin) {
-    final Vector r= new Vector(0, 1);
+  
+  public Valeur(double _s, double _v) {
+    s_=_s;
+    v_=_v;
+    titre_= CtuluLibString.EMPTY_STRING;
+  }
+  
+  public static Vector<Valeur> parse(final Lecteur _lin) {
+    final Vector<Valeur> r= new Vector<Valeur>(0, 1);
     String t= _lin.get();
     if ("valeurs".equals(t)) {
       t= _lin.get();
@@ -62,8 +70,8 @@
     }
     return r;
   }
-  public static List parseXY(final Lecteur _lin) {
-    final List r= new ArrayList(20);
+  public static List<Valeur> parseXY(final Lecteur _lin) {
+    final List<Valeur> r= new ArrayList<Valeur>(20);
     String t= _lin.get();
     while (!t.equals("")) {
       final Valeur e= new Valeur();

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:[8537] trunk/soft/fudaa-mascaret/ui/src/main/java/org/ fudaa/fudaa/mascaret/MascaretImplementation.java

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

Revision: 8537
          http://sourceforge.net/p/fudaa/svn/8537
Author:   bmarchan
Date:     2013-12-05 11:51:42 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Mascaret : Controle des variables manquantes avant calcul.

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-12-05 11:50:56 UTC (rev 8536)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-12-05 11:51:42 UTC (rev 8537)
@@ -149,7 +149,7 @@
 
   static {
     isApp_.name = "Fudaa-Mascaret";
-    isApp_.version = "3.1.10-beta1";
+    isApp_.version = "3.1.10-beta2";
     isApp_.date = "14-11-2013";
     isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
 //    isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
@@ -170,7 +170,7 @@
     isApp_.libraries = null;
     isApp_.thanks = new String[]{"Fudaa team"};
     idApp_.name = "Fudaa-Mascaret";
-    idApp_.version = "3.1.10-beta1";
+    idApp_.version = "3.1.10-beta2";
     idApp_.organization = "EDF-CETMEF";
     idApp_.author = author;
     idApp_.contact = "http://www.openmascaret.org/";
@@ -529,7 +529,7 @@
 
       bcalcul_ = true;
       setEnableMenu();
-
+      
       //BuMainPanel mp= getMainPanel();
       System.err.println(_("Transmission des parametres") + "...");
       HYDRO_KONVERT.convertirParametres(false);
@@ -543,19 +543,10 @@
       HYDRO_KONVERT.convertirResultats(avertissement);
 
       if (ietude1d_.resultatsGeneraux()!=null && ietude1d_.resultatsGeneraux().hasResultatsTemporelSpatial()) {
-        // On ajoute le nouveau r\xE9sultat s\xE9dimentaire
+        // On ajoute les nouveaux r\xE9sultats s\xE9dimentaires
         if (ietude1d_.sediment().parametres().isActif()) {
           MetierCalculSediment calSed=new MetierCalculSediment(ietude1d_.resultatsGeneraux().resultatsTemporelSpatial(), ietude1d_.sediment().parametres());
-          MetierDescriptionVariable[] vars=calSed.computeResultsForVariable();
-          if (vars!=null) {
-            StringBuilder sb=new StringBuilder();
-            for (MetierDescriptionVariable var : vars) {
-              sb.append("\n- ").append(var.description());
-            }
-            JOptionPane.showMessageDialog(getApp().getFrame(), Hydraulique1dResource.getS("Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour le calcul s\xE9dimentologique:{0}\n\nAucun r\xE9sultat s\xE9dimentologique calcul\xE9.", sb.toString()),
-                Hydraulique1dResource.getS("Attention"), JOptionPane.WARNING_MESSAGE);
-          
-          }
+          calSed.computeResultsForVariables();
         }
       }
       
@@ -912,6 +903,24 @@
       return;
     }
 
+    // Controle que toutes les variables hydrauliques sont bien pr\xE9sentes pour le calcul s\xE9dimentaire.
+    if (ietude1d_.sediment().parametres().isActif()) {
+      MetierDescriptionVariable[] missVars=ietude1d_.sediment().parametres().isVariablesManquantes(ietude1d_.paramResultats().variables());
+      if (missVars.length!=0) {
+        StringBuilder sb=new StringBuilder();
+        for (MetierDescriptionVariable var : missVars) {
+          sb.append("\n- ").append(var.description());
+        }
+        if (JOptionPane.showConfirmDialog(getApp().getFrame(), Hydraulique1dResource.getS(
+            "Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour\nle calcul s\xE9dimentologique par les formules choisies:{0}\n\n"+
+            "Certains r\xE9sultats s\xE9dimentologiques ne seront pas calcul\xE9s.\nVoulez-vous poursuivre ?", sb.toString()),
+            Hydraulique1dResource.getS("Attention"), JOptionPane.OK_CANCEL_OPTION)==JOptionPane.CANCEL_OPTION) {
+          return;
+        }
+      }
+    }
+
+
     JInternalFrame[] internFrames = getAllInternalFrames();
     for (int i = 0; i < internFrames.length; i++) {
       if (internFrames[i] instanceof Hydraulique1dReseauFrame) {

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:[8536] trunk/soft/fudaa-mascaret

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

Revision: 8536
          http://sourceforge.net/p/fudaa/svn/8536
Author:   bmarchan
Date:     2013-12-05 11:50:56 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Mascaret : Calcul pour plusieurs formules s?\195?\169dimentaires

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierParametresSediment.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java	2013-11-14 17:20:53 UTC (rev 8535)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java	2013-12-05 11:50:56 UTC (rev 8536)
@@ -1,11 +1,11 @@
 package org.fudaa.dodico.hydraulique1d.metier.sediment;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
-import javax.swing.JOptionPane;
-
-import org.fudaa.dodico.hydraulique1d.Hydraulique1dResource;
 import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
 import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
 
@@ -37,14 +37,21 @@
   /**
    * Calcule et ajoute les r\xE9sultats pour la variable s\xE9dimentaire des param\xE8tres.
    */
-  public MetierDescriptionVariable[] computeResultsForVariable() {
-    return computeResultsForVariable(params_.getFormule().getVariable());
+  public MetierDescriptionVariable[] computeResultsForVariables() {
+    Set<MetierDescriptionVariable> neededVars=new HashSet<MetierDescriptionVariable>();
+    
+    for (MetierFormuleSediment form : params_.getFormules()) {
+      MetierDescriptionVariable[] vars = computeResultsForVariable(form.getVariable());
+      neededVars.addAll(Arrays.asList(vars));
+    }
+    
+    return neededVars.toArray(new MetierDescriptionVariable[0]);
   }
 
   /**
    * Calcule et ajoute les r\xE9sultats pour une variable s\xE9dimentaire.
    * @param _var La variable s\xE9dimentaire.
-   * @return null si le calcul a pu \xEAtre effectu\xE9, sinon les variables manquantes pour le calcul.
+   * @return Les variables manquantes pour le calcul, de longueur=0 si le calcul a pu \xEAtre effectu\xE9
    */
   public MetierDescriptionVariable[] computeResultsForVariable(MetierDescriptionVariable _var) {
     MetierFormuleSediment formule=MetierFormuleSediment.getFormule(_var);
@@ -101,6 +108,6 @@
 //      }
 //    }
 //    res_.addResultsVariable(MetierDescriptionVariable.PENE, vals);
-    return null;
+    return ls.toArray(new MetierDescriptionVariable[0]);
   }
 }

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierParametresSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierParametresSediment.java	2013-11-14 17:20:53 UTC (rev 8535)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierParametresSediment.java	2013-12-05 11:50:56 UTC (rev 8536)
@@ -1,7 +1,12 @@
 package org.fudaa.dodico.hydraulique1d.metier.sediment;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
-import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 
 /**
  * Classe de stockage des parametres de granulometrie pour le calcul de s\xE9diments.
@@ -32,8 +37,8 @@
   private double densApparente_=2;
   /** Contrainte critique adimensionnelle */
   private double tauc_=0.047;
-  /** Formule de calcul */
-  private MetierFormuleSediment formule_;
+  /** Formules de calcul */
+  private MetierFormuleSediment[] formules_;
 
   // Constructeur.
   public MetierParametresSediment() {
@@ -57,7 +62,7 @@
       setDensiteApparente(q.getDensiteApparente());
       setDensiteMateriau(q.getDensiteMateriau());
       setTauc(q.getTauc());
-      setFormule(q.getFormule());
+      setFormules(q.getFormules());
       setActif(q.isActif());
     }
   }
@@ -189,16 +194,40 @@
     this.tauc_ = tauc;
   }
 
-  public MetierFormuleSediment getFormule() {
-    return formule_;
+  public MetierFormuleSediment[] getFormules() {
+    return formules_;
   }
 
-  public void setFormule(MetierFormuleSediment _formule) {
-    if (formule_==_formule) return;
-    Notifieur.getNotifieur().fireObjetModifie(toString(), this, "Formule");
-    this.formule_ = _formule;
+  public void setFormules(MetierFormuleSediment[] _formules) {
+    if (Arrays.equals(formules_, _formules)) return;
+    Notifieur.getNotifieur().fireObjetModifie(toString(), this, "Formules");
+    this.formules_ = _formules;
   }
 
+  /**
+   * Controle que les variables pass\xE9es en param\xE8tres suffisent a calculer les formules s\xE9dimentaires.
+   * 
+   * @param _vars Les variables existantes.
+   * @return Les variables manquantes, ou vide si aucune variable ne manque.
+   */
+  public MetierDescriptionVariable[] isVariablesManquantes(MetierDescriptionVariable[] _vars) {
+    Map<String,MetierDescriptionVariable> reqVariables=new HashMap<String,MetierDescriptionVariable>();
+    
+    for (MetierFormuleSediment form : formules_) {
+      MetierDescriptionVariable[] vars=form.getRequiredVariable();
+      for (MetierDescriptionVariable var : vars) {
+        reqVariables.put(var.nom(),var);
+      }
+    }
+    
+    for (MetierDescriptionVariable var : _vars) {
+      reqVariables.remove(var.nom());
+    }
+    
+    return reqVariables.values().toArray(new MetierDescriptionVariable[0]);
+  }
+
+  
   @Override
   public String[] getInfos() {
     String[] res= new String[2];
@@ -215,7 +244,7 @@
         + " Densite apparente=" + densApparente_
         + " Densite materiau=" + densMat_
         + " Tauc=" + tauc_
-        + " Formule=" + formule_ ==null ? "None":formule_.toString();
+        + " Nb formules=" + formules_ ==null ? "0":""+formules_.length;
 
     return res;
   }

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java	2013-11-14 17:20:53 UTC (rev 8535)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java	2013-12-05 11:50:56 UTC (rev 8536)
@@ -1,14 +1,18 @@
 package org.fudaa.fudaa.hydraulique1d.editor;
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.Arrays;
 
 import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
 import javax.swing.JCheckBox;
 import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
 import javax.swing.border.Border;
 import javax.swing.border.EtchedBorder;
 
@@ -23,9 +27,9 @@
 import org.fudaa.ebli.dialog.BDialogContent;
 import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
 
-import com.memoire.bu.BuComboBox;
 import com.memoire.bu.BuGridLayout;
 import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuList;
 import com.memoire.bu.BuPanel;
 import com.memoire.bu.BuTextField;
 import com.memoire.fu.FuLog;
@@ -66,7 +70,8 @@
   private BuLabel lbTEau_;
   private BuTextField tfTEau_;
   private BuLabel lbFormule_;
-  private BuComboBox coFormule_;
+  private BuList lsFormule_;
+  private DefaultListModel mdFormule_;
   private BuPanel pnCenter_;
   private BuPanel pnPrincipal_;
   private BorderLayout lyPrincipal_;
@@ -106,12 +111,14 @@
     tfTauc_=BuTextField.createDoubleField();
     lbTEau_=new BuLabel(getS("Temp\xE9rature de l'eau"));
     tfTEau_=BuTextField.createDoubleField();
-    lbFormule_=new BuLabel(getS("Formule"));
-    coFormule_=new BuComboBox();
-    coFormule_.addItem("");
+    lbFormule_=new BuLabel(getS("Formules de calcul"));
+    mdFormule_=new DefaultListModel();
     for (MetierFormuleSediment item : MetierFormuleSediment.values()) {
-      coFormule_.addItem(item);
+      mdFormule_.addElement(item);
     }
+    lsFormule_=new BuList(mdFormule_);
+    JScrollPane spFormule=new JScrollPane(lsFormule_);
+    spFormule.setPreferredSize(new Dimension(150,100));
     
 
     lyCenter_=new BuGridLayout(2,5,2);
@@ -139,7 +146,7 @@
     pnCenter_.add(lbTEau_);
     pnCenter_.add(tfTEau_);
     pnCenter_.add(lbFormule_);
-    pnCenter_.add(coFormule_);
+    pnCenter_.add(spFormule);
 
     Border bd=BorderFactory.createEtchedBorder(EtchedBorder.LOWERED);
     pnPrincipal_=new BuPanel();
@@ -204,8 +211,8 @@
       return getS("Contrainte critique adimensionnelle")+" : "+getS("La valeur doit \xEAtre donn\xE9e");
     if (tfTEau_.getValue()==null) 
       return getS("Temp\xE9rature de l'eau")+" : "+getS("La valeur doit \xEAtre donn\xE9e");
-    if (coFormule_.getSelectedIndex()==0) 
-      return getS("La formule n'est pas donn\xE9e");
+    if (lsFormule_.getSelectedIndex()==-1) 
+      return getS("Aucune formule n'est s\xE9lectionn\xE9e");
 
     return null;
   }
@@ -271,10 +278,13 @@
       param_.setTEau(tEau);
       changed=true;
     }
-    MetierFormuleSediment formule;
-    formule=(MetierFormuleSediment)coFormule_.getSelectedItem();
-    if (!formule.equals(param_.getFormule())) {
-      param_.setFormule(formule);
+    int[] selIdx=lsFormule_.getSelectedIndices();
+    MetierFormuleSediment[] formules=new MetierFormuleSediment[selIdx.length];
+    for (int i=0; i<selIdx.length; i++) {
+      formules[i]=(MetierFormuleSediment)mdFormule_.get(selIdx[i]);
+    }
+    if (!Arrays.equals(formules, param_.getFormules())) {
+      param_.setFormules(formules);
       changed=true;
     }
 
@@ -309,13 +319,13 @@
       // On ajoute le nouveau r\xE9sultat
       if (etude_.sediment().parametres().isActif()) {
         MetierCalculSediment calSed=new MetierCalculSediment(etude_.resultatsGeneraux().resultatsTemporelSpatial(), etude_.sediment().parametres());
-        MetierDescriptionVariable[] vars=calSed.computeResultsForVariable();
-        if (vars!=null) {
+        MetierDescriptionVariable[] vars=calSed.computeResultsForVariables();
+        if (vars.length!=0) {
           StringBuilder sb=new StringBuilder();
           for (MetierDescriptionVariable var : vars) {
             sb.append("\n- ").append(var.description());
           }
-          JOptionPane.showMessageDialog(this, getS("Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour le calcul s\xE9dimentologique:{0}\n\nAucun r\xE9sultat s\xE9dimentologique calcul\xE9.", sb.toString()),
+          JOptionPane.showMessageDialog(this, getS("Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour\nle calcul s\xE9dimentologique par les formules choisies:{0}\n\nCertains r\xE9sultats s\xE9dimentologiques ne seront pas calcul\xE9s.", sb.toString()),
               getS("Attention"), JOptionPane.WARNING_MESSAGE);
         
         }
@@ -346,7 +356,7 @@
     tfDensApparente_.setEnabled(b);
     tfTauc_.setEnabled(b);
     tfTEau_.setEnabled(b);
-    coFormule_.setEnabled(b);
+    lsFormule_.setEnabled(b);
   }
   
   @Override
@@ -368,11 +378,13 @@
     tfTauc_.setValue(param_.getTauc());
     tfTEau_.setValue(param_.getTEau());
     
-    if (param_.getFormule()==null) {
-      coFormule_.setSelectedIndex(0);
+    if (param_.getFormules()!=null) {
+      lsFormule_.clearSelection();
+      for (MetierFormuleSediment form : param_.getFormules()) {
+        int idx=mdFormule_.indexOf(form);
+        if (idx!=-1)
+          lsFormule_.addSelectionInterval(idx,idx);
+      }
     }
-    else {
-      coFormule_.setSelectedItem(param_.getFormule());
-    }
   }
 }

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:[8535] trunk/soft/fudaa-mascaret

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

Revision: 8535
          http://sourceforge.net/p/fudaa/svn/8535
Author:   bmarchan
Date:     2013-11-14 17:20:53 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Mascaret : Chgt version => 3.1.10-beta1

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/distrib/pom.xml
    trunk/soft/fudaa-mascaret/pom.xml
    trunk/soft/fudaa-mascaret/server/pom.xml
    trunk/soft/fudaa-mascaret/ui/pom.xml

Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml	2013-11-14 17:20:21 UTC (rev 8534)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml	2013-11-14 17:20:53 UTC (rev 8535)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.9</version>
+    <version>3.1.10-beta1</version>
   </parent>
   <artifactId>mascaret-distrib</artifactId>
   <properties>

Modified: trunk/soft/fudaa-mascaret/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/pom.xml	2013-11-14 17:20:21 UTC (rev 8534)
+++ trunk/soft/fudaa-mascaret/pom.xml	2013-11-14 17:20:53 UTC (rev 8535)
@@ -15,7 +15,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
   <artifactId>fudaa-mascaret</artifactId>
-  <version>3.1.9</version>
+  <version>3.1.10-beta1</version>
   <name>Fudaa-Mascaret</name>
   <packaging>pom</packaging>
   <modules>

Modified: trunk/soft/fudaa-mascaret/server/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/server/pom.xml	2013-11-14 17:20:21 UTC (rev 8534)
+++ trunk/soft/fudaa-mascaret/server/pom.xml	2013-11-14 17:20:53 UTC (rev 8535)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.9</version>
+    <version>3.1.10-beta1</version>
   </parent>
   <artifactId>mascaret-server</artifactId>
   <build>

Modified: trunk/soft/fudaa-mascaret/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/ui/pom.xml	2013-11-14 17:20:21 UTC (rev 8534)
+++ trunk/soft/fudaa-mascaret/ui/pom.xml	2013-11-14 17:20:53 UTC (rev 8535)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-mascaret</groupId>
     <artifactId>fudaa-mascaret</artifactId>
-    <version>3.1.9</version>
+    <version>3.1.10-beta1</version>
   </parent>
   <artifactId>mascaret-ui</artifactId>
   <build>

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:[8534] trunk/soft/fudaa-mascaret

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

Revision: 8534
          http://sourceforge.net/p/fudaa/svn/8534
Author:   bmarchan
Date:     2013-11-14 17:20:21 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Mascaret : recalcul resultats sediment lors du calcul hydro

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java

Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java	2013-11-14 17:19:14 UTC (rev 8533)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierCalculSediment.java	2013-11-14 17:20:21 UTC (rev 8534)
@@ -1,5 +1,11 @@
 package org.fudaa.dodico.hydraulique1d.metier.sediment;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+
+import org.fudaa.dodico.hydraulique1d.Hydraulique1dResource;
 import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
 import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
 
@@ -29,10 +35,31 @@
   }
 
   /**
-   * Calcule et ajoute les r\xE9sultats pour une varaible s\xE9dimentaire.
+   * Calcule et ajoute les r\xE9sultats pour la variable s\xE9dimentaire des param\xE8tres.
+   */
+  public MetierDescriptionVariable[] computeResultsForVariable() {
+    return computeResultsForVariable(params_.getFormule().getVariable());
+  }
+
+  /**
+   * Calcule et ajoute les r\xE9sultats pour une variable s\xE9dimentaire.
    * @param _var La variable s\xE9dimentaire.
+   * @return null si le calcul a pu \xEAtre effectu\xE9, sinon les variables manquantes pour le calcul.
    */
-  public void computeResultsForVariable(MetierDescriptionVariable _var) {
+  public MetierDescriptionVariable[] computeResultsForVariable(MetierDescriptionVariable _var) {
+    MetierFormuleSediment formule=MetierFormuleSediment.getFormule(_var);
+    List<MetierDescriptionVariable> ls=new ArrayList<MetierDescriptionVariable>();
+    
+    for (MetierDescriptionVariable var : formule.getRequiredVariable()) {
+      if (res_.getIndiceVariable(var) == -1) {
+        ls.add(var);
+//        sb.append("\n- ").append(var.description());
+      }
+    }
+    if (ls.size() != 0) {
+      return ls.toArray(new MetierDescriptionVariable[0]);
+    }
+
     boolean found=false;
     for (MetierDescriptionVariable var : MetierSediment.VARIABLES) {
       if (var.equals(_var)) {
@@ -43,7 +70,6 @@
     if (!found)
       throw new IllegalArgumentException("Variable non s\xE9dimentaire");
     
-    MetierFormuleSediment formule=MetierFormuleSediment.getFormule(_var);
     MetierResultatTemporelSpatialAdapter resAdapter=new MetierResultatTemporelSpatialAdapter(res_);
     
     // Suppression eventuelle de l'ancienne variable de m\xEAme nom
@@ -63,18 +89,18 @@
     }
     res_.addResultsVariable(_var, vals);
 
-    // FIXME : Pour tests, ne pas conserver
-    res_.removeResultsVariable(MetierDescriptionVariable.PENE);
-    vals=new double[nbBief][nbTps][];
-    for (int ibief=0; ibief<nbBief; ibief++) {
-      int nbSect=res_.resultatsBiefs()[ibief].abscissesSections().length;
-      for (int itps=0; itps<nbTps; itps++) {
-        vals[ibief][itps]=new double[nbSect];
-        for (int isect=0; isect<nbSect; isect++) {
-          vals[ibief][itps][isect]=resAdapter.getValue(MetierDescriptionVariable.PENE, ibief, itps, isect);
-        }
-      }
-    }
-    res_.addResultsVariable(MetierDescriptionVariable.PENE, vals);
+//    res_.removeResultsVariable(MetierDescriptionVariable.PENE);
+//    vals=new double[nbBief][nbTps][];
+//    for (int ibief=0; ibief<nbBief; ibief++) {
+//      int nbSect=res_.resultatsBiefs()[ibief].abscissesSections().length;
+//      for (int itps=0; itps<nbTps; itps++) {
+//        vals[ibief][itps]=new double[nbSect];
+//        for (int isect=0; isect<nbSect; isect++) {
+//          vals[ibief][itps][isect]=resAdapter.getValue(MetierDescriptionVariable.PENE, ibief, itps, isect);
+//        }
+//      }
+//    }
+//    res_.addResultsVariable(MetierDescriptionVariable.PENE, vals);
+    return null;
   }
 }

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java	2013-11-14 17:19:14 UTC (rev 8533)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresSedimentEditor.java	2013-11-14 17:20:21 UTC (rev 8534)
@@ -301,34 +301,25 @@
 
   private void updateResults() {
     if (etude_.resultatsGeneraux().hasResultatsTemporelSpatial()) {
+      // On supprime les resultats de s\xE9dimentologie pr\xE9c\xE9dents.
+      for (MetierDescriptionVariable var : MetierSediment.VARIABLES) {
+        etude_.resultatsGeneraux().resultatsTemporelSpatial().removeResultsVariable(var);
+      }
+
       // On ajoute le nouveau r\xE9sultat
       if (etude_.sediment().parametres().isActif()) {
-        MetierFormuleSediment formule=etude_.sediment().parametres().getFormule();
-        StringBuilder sb=new StringBuilder();
-        for (MetierDescriptionVariable var : formule.getRequiredVariable()) {
-          if (etude_.resultatsGeneraux().resultatsTemporelSpatial().getIndiceVariable(var)==-1) {
+        MetierCalculSediment calSed=new MetierCalculSediment(etude_.resultatsGeneraux().resultatsTemporelSpatial(), etude_.sediment().parametres());
+        MetierDescriptionVariable[] vars=calSed.computeResultsForVariable();
+        if (vars!=null) {
+          StringBuilder sb=new StringBuilder();
+          for (MetierDescriptionVariable var : vars) {
             sb.append("\n- ").append(var.description());
           }
-        }
-        if (sb.length() != 0) {
-//          sb.setLength(sb.length()-2);
-          JOptionPane.showMessageDialog(this,
-              getS("Les variables hydrauliques suivantes sont n\xE9cessaires pour le calcul s\xE9dimentologique:{0}\n\nAucun calcul ne sera effectu\xE9.", sb.toString()),
-              getS("Attention"),
-               JOptionPane.WARNING_MESSAGE);
-          return;
-        }
+          JOptionPane.showMessageDialog(this, getS("Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour le calcul s\xE9dimentologique:{0}\n\nAucun r\xE9sultat s\xE9dimentologique calcul\xE9.", sb.toString()),
+              getS("Attention"), JOptionPane.WARNING_MESSAGE);
         
-        MetierCalculSediment calSed=new MetierCalculSediment(etude_.resultatsGeneraux().resultatsTemporelSpatial(), etude_.sediment().parametres());
-        calSed.computeResultsForVariable(formule.getVariable());
-      }
-      // On supprime les resultats de s\xE9dimentologie.
-      else {
-        for (MetierDescriptionVariable var : MetierSediment.VARIABLES) {
-          etude_.resultatsGeneraux().resultatsTemporelSpatial().removeResultsVariable(var);
         }
       }
-//      if (etude_.sediment().parametres().getFormule());
     }
   }
   

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-11-14 17:19:14 UTC (rev 8533)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java	2013-11-14 17:20:21 UTC (rev 8534)
@@ -35,6 +35,7 @@
 import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
 import org.fudaa.dodico.hydraulique1d.metier.MetierCalculHydraulique1d;
 import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
 import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
 import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
 import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsGeneraux;
@@ -42,12 +43,12 @@
 import org.fudaa.dodico.hydraulique1d.metier.casier.MetierGeometrieCasier;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.H1dObjetEvent;
 import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierCalculSediment;
 import org.fudaa.dodico.mascaret.DCalculMascaret;
 import org.fudaa.dodico.mascaret.DResultatsMascaret;
 import org.fudaa.dodico.mascaret.FichierMascaretException;
 import org.fudaa.dodico.objet.DodicoBoonyLibImpl;
 import org.fudaa.ebli.impression.EbliFillePrevisualisation;
-
 import org.fudaa.fudaa.commun.FudaaAstucesAbstract;
 import org.fudaa.fudaa.commun.FudaaLib;
 import org.fudaa.fudaa.commun.FudaaTee;
@@ -107,6 +108,7 @@
 import com.memoire.fu.FuLib;
 import com.memoire.bu.BuLib;
 import com.memoire.fu.FuLog;
+
 import org.fudaa.ctulu.CtuluLibFile;
 import org.fudaa.fudaa.hydraulique1d.Hydraulique1dImportXCasPanneau;
 
@@ -147,8 +149,8 @@
 
   static {
     isApp_.name = "Fudaa-Mascaret";
-    isApp_.version = "3.1.10";
-    isApp_.date = "06-09-2013";
+    isApp_.version = "3.1.10-beta1";
+    isApp_.date = "14-11-2013";
     isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CETMEF (c) 2001-2013";
 //    isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
     isApp_.contact = "ot-...@op...";
@@ -168,7 +170,7 @@
     isApp_.libraries = null;
     isApp_.thanks = new String[]{"Fudaa team"};
     idApp_.name = "Fudaa-Mascaret";
-    idApp_.version = "3.1.10";
+    idApp_.version = "3.1.10-beta1";
     idApp_.organization = "EDF-CETMEF";
     idApp_.author = author;
     idApp_.contact = "http://www.openmascaret.org/";
@@ -540,6 +542,23 @@
       //System.err.println("AVERTISSEMENT "+avertissement);
       HYDRO_KONVERT.convertirResultats(avertissement);
 
+      if (ietude1d_.resultatsGeneraux()!=null && ietude1d_.resultatsGeneraux().hasResultatsTemporelSpatial()) {
+        // On ajoute le nouveau r\xE9sultat s\xE9dimentaire
+        if (ietude1d_.sediment().parametres().isActif()) {
+          MetierCalculSediment calSed=new MetierCalculSediment(ietude1d_.resultatsGeneraux().resultatsTemporelSpatial(), ietude1d_.sediment().parametres());
+          MetierDescriptionVariable[] vars=calSed.computeResultsForVariable();
+          if (vars!=null) {
+            StringBuilder sb=new StringBuilder();
+            for (MetierDescriptionVariable var : vars) {
+              sb.append("\n- ").append(var.description());
+            }
+            JOptionPane.showMessageDialog(getApp().getFrame(), Hydraulique1dResource.getS("Les r\xE9sultats hydrauliques suivants sont n\xE9cessaires pour le calcul s\xE9dimentologique:{0}\n\nAucun r\xE9sultat s\xE9dimentologique calcul\xE9.", sb.toString()),
+                Hydraulique1dResource.getS("Attention"), JOptionPane.WARNING_MESSAGE);
+          
+          }
+        }
+      }
+      
       if (ietude1d_.resultatsGeneraux() != null) {
         MetierResultatsGeneraux resGen = ietude1d_.resultatsGeneraux();
         if ((resGen.messagesEcran() != null)
@@ -552,7 +571,7 @@
           setEnableMenu(AUTORISE_RESULTATS_GENERAUX);
         }
       }
-      if ((ietude1d_.resultatsGeneraux().resultatsTemporelSpatial() != null)
+      if ((ietude1d_.resultatsGeneraux().hasResultatsTemporelSpatial())
               && (ietude1d_
               .resultatsGeneraux()
               .resultatsTemporelSpatial()

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:[8533] trunk/soft/fudaa-mascaret/server/src

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

Revision: 8533
          http://sourceforge.net/p/fudaa/svn/8533
Author:   bmarchan
Date:     2013-11-14 17:19:14 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Mascaret : Formule Recking 2010

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java

Added Paths:
-----------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java

Added: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java	2013-11-14 17:19:14 UTC (rev 8533)
@@ -0,0 +1,136 @@
+package org.fudaa.dodico.hydraulique1d.metier.sediment;
+
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpacialI;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * Calcul s\xE9dimentaire avec la formule de Recking 2010.
+ * 
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id: MetierFormuleLefort1991.java 8524 2013-10-18 08:01:47Z
+ *          bmarchan$
+ */
+public class MetierFormuleRecking2010 extends MetierFormuleSediment {
+
+  @Override
+  public double calculer(MetierParametresSediment _params, MetierResultatsTemporelSpacialI _adapter, int _ibief, int _isect, int _itps) {
+
+    double pente = _adapter.getValue(MetierDescriptionVariable.PENE, _ibief, _itps, _isect);
+    double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
+    double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
+//    double h = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
+
+    double dens = _params.getDensiteMateriau();
+    double d84 = _params.getD84();
+    double d50 = _params.getD50();
+
+    // Diametre cible
+    double dcible;
+    if (d50 > 0.002) {
+      dcible = 3.5 * d84;
+    }
+    else {
+      dcible = d50;
+    }
+
+    // Calcul de RH
+//    double rh = calculerRH(h, d84, qmin, pente, larg);
+    // Calcul de RH cible
+    double rhcible = calculerRHCible(qmin, larg, pente, dcible);
+
+    double tetac84;
+    if (d50 < 0.002) {
+      tetac84 = 0.045;
+    }
+    else {
+      tetac84 = (1.32 * pente + 0.037) * Math.pow(d84 / d50, -0.93);
+    }
+
+    // 'valeur de tetac prise pour la validation des valeurs labo
+    // 'tetac84 = 0.15 * pente ^ 0.275
+
+    double l = 12.53 * Math.pow((d84 / d50), (4.445 * Math.pow(pente, 0.5))) * Math.pow(tetac84, 1.605);
+
+    // calcul du d\xE9bit solide
+    double teta84 = rhcible * pente / (d84 * (dens - 1));
+    double cpl;
+    if (teta84 < l) {
+      cpl = 0.0005 * (dens * 1000) * Math.pow((9.81 * (dens - 1) * Math.pow(d84, 3)), 0.5) * Math.pow((d84 / d50), (-18 * Math.pow(pente, 0.5))) * Math.pow((teta84 / tetac84), 6.5);
+    }
+    else {
+      cpl = 14 * (dens * 1000) * Math.pow((9.81 * (dens - 1) * Math.pow(d84, 3)), 0.5) * Math.pow(teta84, 2.45);
+    }
+    double qs = cpl / (dens * 1000) * larg;
+
+    return qs;
+  }
+
+  protected double calculerRH(double _h, double _d84, double _qmin, double _pente, double _larg) {
+    double rh;
+    if (_h / _d84 < 5) {
+      rh = Math.pow((_qmin / _larg * Math.pow(_d84, 0.52)) / (3.2 * Math.pow((9.81 * _pente), 0.5)), 0.5);
+    }
+    else {
+      rh = Math.pow(((_qmin / _larg * Math.pow(_d84, 0.27)) / (4.7 * Math.pow((9.81 * _pente), 0.5))), 0.57);
+    }
+    return rh;
+  }
+
+  /**
+   * Calcul du RH cible par dicothomie.
+   * 
+   * @param _qmin Le d\xE9bit en lit mineur
+   * @param _larg La largeur du profil
+   * @param _pente La pente
+   * @param _dcible Le diametre de grain cible
+   * @param _rescible Le r\xE9sultat cible \xE0 trouver
+   * @return La RH correspondant au r\xE9sultat cible demand\xE9.
+   */
+  private double calculerRHCible(double _qmin, double _larg, double _pente, double _dcible) {
+    double rhSup = 1.e20;
+    double rhInf = 1.e-20;
+    double rhCible = 0;
+    double rescible = 0;
+    double val = rescible + 1;
+
+    // It\xE9rations par dicothomie jusqu'\xE0 obtention du r\xE9sultat.
+    while (true) {
+      rhCible = (rhSup + rhInf) / 2;
+      val = _qmin * (_larg - 2 * rhCible) / (rhCible * _larg * _larg * Math.pow((9.81 * rhCible * (_pente)), 0.5)) - 6.25 - 5.75 * Math.log10(rhCible / (_dcible));
+
+      if (val - rescible > 0) {
+        rhInf = rhCible;
+      }
+      else if (val < rescible - 1.e-8) {
+        rhSup = rhCible;
+      }
+      // Sortie si convergence
+      else {
+        break;
+      }
+    }
+//    FuLog.debug("rhCible=" + rhCible);
+    return rhCible;
+  }
+
+  @Override
+  public MetierDescriptionVariable[] getRequiredVariable() {
+    return new MetierDescriptionVariable[] { 
+        MetierDescriptionVariable.B1, 
+        MetierDescriptionVariable.CHAR, 
+        MetierDescriptionVariable.QMIN 
+    };
+  }
+
+  @Override
+  public MetierDescriptionVariable getVariable() {
+    return MetierDescriptionVariable.QS_RECKING10;
+  }
+
+  @Override
+  public String getName() {
+    return "Recking 2010";
+  }
+}


Property changes on: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2010.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java	2013-11-08 16:27:15 UTC (rev 8532)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java	2013-11-14 17:19:14 UTC (rev 8533)
@@ -35,7 +35,7 @@
     formules_.add(new MetierFormuleLefort1991());
     formules_.add(new MetierFormuleLefort2007());
     formules_.add(new MetierFormuleMeyerPeter());
-    // formules_.add(MetierDescriptionVariable.QS_RECKING10);
+    formules_.add(new MetierFormuleRecking2010());
     formules_.add(new MetierFormuleRecking2011());
     formules_.add(new MetierFormuleRickenmann());
     formules_.add(new MetierFormuleSmartJaggi());
@@ -124,16 +124,6 @@
     double diam = _params.getDmoyen();
     double dens = _params.getDensiteMateriau();
 
-    // ' initialisation des colonnes et des lignes
-    // Col_Tau = Range("Tau").Column
-    // Col_deb_cible = Range("Qcible").Column
-    // Col_H = Range("Hauteur").Column
-    //
-    // lgn_calcul = Range("ligne_debut").Row
-    // ligne = lgn_calcul
-
-    // 'boucle sur les lignes'
-    // Do While Cells(ligne, Col_deb_cible) <> ""
     // Calcul de tau
     double rh1 = (h1 * larg) / (larg + 2. * h1);
 
@@ -151,21 +141,9 @@
     // ecriture de Tau
     ret.tau = tau;
     ret.taueff = taueff;
-
-    // teta = tau*
-    // if (Diam <> "" Then
     ret.teta = tau / (9.81 * 1000. * (dens - 1) * diam);
-    // Else
-    // teta = "-"
-    // End If
-    // If D50 <> "" Then
     ret.tetaD50 = tau / (9.81 * 1000. * (dens - 1) * d50);
-    // Else
-    // teta_d50 = "-"
-    // End If
 
-    // Cells(ligne, Col_Tau + 2) = teta '=tau* f(dm)
-    // Cells(ligne, Col_Tau + 3) = teta_d50 '=tau* f(D50)
     return ret;
   }
 

Modified: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java	2013-11-08 16:27:15 UTC (rev 8532)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java	2013-11-14 17:19:14 UTC (rev 8533)
@@ -8,6 +8,7 @@
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleLefort1991;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleLefort2007;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleMeyerPeter;
+import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleRecking2010;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleRecking2011;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleRickenmann;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleSediment;
@@ -197,6 +198,40 @@
     }
   }
 
+  public void testFormuleRecking2010() throws IOException {
+    FuLog.debug("Formule Recking 2010");
+    MetierFormuleSediment form=new MetierFormuleRecking2010();
+    for (int itps=0; itps<hydrauRes_.getNbTemps(); itps++) {
+      double val=form.calculer(params_, hydrauRes_, 0, 0, itps);
+      assertEquals(val, sedRes[9][itps],epsilon);
+    }
+//    double G7=1000;
+//    double lb=30;
+//    double itrap=0.01;
+//    double ABsup=1.e20;
+//    double ABinf=1.e-20;
+//    double AB=0;
+//    double dopti=0.35;
+//    double valcible=6.01;
+//    double val=valcible+1;
+//    
+//    while (Math.abs(val) > 10.e-8) {
+//      AB=(ABsup+ABinf)/2;
+//        val = G7 * (lb - 2 * AB) / (AB * lb * lb * Math.pow((9.81 * AB * (itrap)), 0.5)) - 6.25 - 5.75 * Math.log10(AB / (dopti));
+//        FuLog.debug("val=" + val);
+//        if (val-valcible>0) {
+//          ABinf=AB;
+//        }
+//        else if (val<valcible-1.e-8) {
+//          ABsup=AB;
+//        }
+//        else {
+//          break;
+//        }
+//    }
+//    FuLog.debug("AB=" + AB);
+  }
+
   public void testFormuleRecking2011() throws IOException {
     FuLog.debug("Formule Recking 2011");
     MetierFormuleSediment form=new MetierFormuleRecking2011();

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:[8532] trunk/soft/fudaa-mascaret/server/src

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

Revision: 8532
          http://sourceforge.net/p/fudaa/svn/8532
Author:   bmarchan
Date:     2013-11-08 16:27:15 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
Mascaret : Formules Recking 2011 + Van Rijn

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java
    trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java

Added Paths:
-----------
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2011.java
    trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java

Added: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2011.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2011.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2011.java	2013-11-08 16:27:15 UTC (rev 8532)
@@ -0,0 +1,83 @@
+package org.fudaa.dodico.hydraulique1d.metier.sediment;
+
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpacialI;
+
+/**
+ * Calcul s\xE9dimentaire avec la formule de Recking 2011.
+ * 
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id: MetierFormuleLefort1991.java 8524 2013-10-18 08:01:47Z
+ *          bmarchan$
+ */
+public class MetierFormuleRecking2011 extends MetierFormuleSediment {
+
+  @Override
+  public double calculer(MetierParametresSediment _params, MetierResultatsTemporelSpacialI _adapter, int _ibief, int _isect, int _itps) {
+
+    double pente = _adapter.getValue(MetierDescriptionVariable.PENE, _ibief, _itps, _isect);
+    double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
+    double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
+
+    double dens = _params.getDensiteMateriau();
+    double d50 = _params.getD50();
+    double d84 = _params.getD84();
+
+    double tetaMEt;
+    
+    // calcul des coef
+    if (d50 < 0.002) {
+      tetaMEt = 0.045;
+    }
+    else {
+      tetaMEt = (5 * pente + 0.06) * Math.pow((d84 / d50), (4.4 * Math.pow(pente, 0.5) - 1.5));
+      // teta_m_et = (5 * pente + 0.06) * (D84 / D50) ^ (-1.5)
+    }
+
+    double test = qmin / larg / Math.pow((9.81 * pente * Math.pow(d84, 3)), 0.5);
+
+    double alfa;
+    double beta;
+    double ceta;
+    double delta;
+    if (test > 100) {
+      alfa = 3.2;
+      beta = 0.3;
+      ceta = -0.61;
+      delta = -0.09;
+    }
+    else {
+      alfa = 1.6;
+      beta = 0.23;
+      ceta = -0.46;
+      delta = -0.32;
+    }
+
+    double tetaEt = pente / ((dens - 1) * d84 * (2 / larg + alfa * Math.pow((9.81 * pente), beta) * Math.pow((qmin / larg), ceta) * Math.pow(d84, delta)));
+
+    double phi = 14 * Math.pow(tetaEt, 2.5) / (1 + Math.pow((tetaMEt / tetaEt), 4));
+//    double qs_unit = dens * 1000 * Phi * Math.pow((9.81 * (dens - 1) * Math.pow(D84, 3)), 0.5);
+    double qs = larg * phi * Math.pow((9.81 * (dens - 1) * Math.pow(d84, 3)), 0.5);
+
+    return qs;
+  }
+
+  @Override
+  public MetierDescriptionVariable[] getRequiredVariable() {
+    return new MetierDescriptionVariable[] { 
+        MetierDescriptionVariable.QMIN, 
+        MetierDescriptionVariable.B1, 
+        MetierDescriptionVariable.CHAR
+    };
+  }
+
+ @Override
+  public MetierDescriptionVariable getVariable() {
+    return MetierDescriptionVariable.QS_RECKING11;
+  }
+
+  @Override
+  public String getName() {
+    return "Recking 2011";
+  }
+}


Property changes on: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleRecking2011.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java	2013-10-23 14:02:26 UTC (rev 8531)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleSediment.java	2013-11-08 16:27:15 UTC (rev 8532)
@@ -36,10 +36,10 @@
     formules_.add(new MetierFormuleLefort2007());
     formules_.add(new MetierFormuleMeyerPeter());
     // formules_.add(MetierDescriptionVariable.QS_RECKING10);
-    // formules_.add(MetierDescriptionVariable.QS_RECKING11);
+    formules_.add(new MetierFormuleRecking2011());
     formules_.add(new MetierFormuleRickenmann());
     formules_.add(new MetierFormuleSmartJaggi());
-    // formules_.add(MetierDescriptionVariable.QS_VANRIJN);
+    formules_.add(new MetierFormuleVanRijn());
   }
 
   public MetierFormuleSediment() {

Added: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java	2013-11-08 16:27:15 UTC (rev 8532)
@@ -0,0 +1,101 @@
+package org.fudaa.dodico.hydraulique1d.metier.sediment;
+
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpacialI;
+
+/**
+ * Calcul s\xE9dimentaire avec la formule de Van Rijn.
+ * 
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id: MetierFormuleLefort1991.java 8524 2013-10-18 08:01:47Z
+ *          bmarchan$
+ */
+public class MetierFormuleVanRijn extends MetierFormuleSediment {
+
+  @Override
+  public double calculer(MetierParametresSediment _params, MetierResultatsTemporelSpacialI _adapter, int _ibief, int _isect, int _itps) {
+
+    double larg = _adapter.getValue(MetierDescriptionVariable.B1, _ibief, _itps, _isect);
+    double qmin = _adapter.getValue(MetierDescriptionVariable.QMIN, _ibief, _itps, _isect);
+    double h1 = _adapter.getValue(MetierDescriptionVariable.Y, _ibief, _itps, _isect);
+
+    double dens = _params.getDensiteMateriau();
+    double d50 = _params.getD50();
+    double d90 = _params.getD90();
+    double nu = _params.getViscosite();
+
+    // ' initialisation des colonnes et des lignes
+    // Col_Rijn = Range("Rijn").Column
+    // Col_deb_cible = Range("Qcible").Column
+    // Col_H = Range("hauteur").Column
+    //
+    // lgn_calcul = Range("ligne_debut").Row
+    // ligne = lgn_calcul
+    //
+    // Do While Cells(ligne, Col_deb_cible) <> ""
+    //
+    // Qmin = Cells(ligne, Col_deb_cible)
+    // H1 = Cells(ligne, Col_H)
+
+    double rh1 = (h1 * larg) / (larg + 2 * h1);
+    double u = qmin / (larg * h1);
+    double det = d50 * Math.pow(((9.81 * (dens - 1)) / Math.pow(nu, 2)), (1. / 3));
+
+    // 'calcul de uc*^2 via la courbe de schield
+    double alfa;
+    double beta;
+    if (det < 4) {
+      alfa = 0.24;
+      beta = -1;
+    }
+    else if (det < 10) {
+      alfa = 0.14;
+      beta = -0.64;
+    }
+    else if (det < 20) {
+      alfa = 0.04;
+      beta = -0.1;
+    }
+    else if (det < 150) {
+      alfa = 0.013;
+      beta = 0.29;
+    }
+    else {
+      alfa = 0.055;
+      beta = 0;
+    }
+
+    double ucetCarre = 9.81 * (dens - 1) * d50 * (alfa * Math.pow(det, beta));
+    double uet = Math.pow(9.81, 0.5) * u / (18 * Math.log10(4 * rh1 / d90));
+    double t;
+
+    if (Math.pow(uet, 2) > ucetCarre) {
+      t = (Math.pow(uet, 2) - ucetCarre) / ucetCarre;
+    }
+    else {
+      t = 0;
+    }
+
+    double qs = larg * 0.053 * Math.pow((9.81 * (dens - 1) * Math.pow(d50, 3)), 0.5) * Math.pow(t, 2.1) / Math.pow(det, 0.3);
+    return qs;
+  }
+
+  @Override
+  public MetierDescriptionVariable[] getRequiredVariable() {
+    return new MetierDescriptionVariable[] { 
+        MetierDescriptionVariable.QMIN, 
+        MetierDescriptionVariable.B1, 
+        MetierDescriptionVariable.Y 
+    };
+  }
+
+  @Override
+  public MetierDescriptionVariable getVariable() {
+    return MetierDescriptionVariable.QS_VANRIJN;
+  }
+
+  @Override
+  public String getName() {
+    return "Van Rijn";
+  }
+}


Property changes on: trunk/soft/fudaa-mascaret/server/src/main/java/org/fudaa/dodico/hydraulique1d/metier/sediment/MetierFormuleVanRijn.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java
===================================================================
--- trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java	2013-10-23 14:02:26 UTC (rev 8531)
+++ trunk/soft/fudaa-mascaret/server/src/test/java/org/fudaa/dodico/hydraulique1d/metier/SedimentologieTest.java	2013-11-08 16:27:15 UTC (rev 8532)
@@ -8,9 +8,11 @@
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleLefort1991;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleLefort2007;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleMeyerPeter;
+import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleRecking2011;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleRickenmann;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleSediment;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleSmartJaggi;
+import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierFormuleVanRijn;
 import org.fudaa.dodico.hydraulique1d.metier.sediment.MetierParametresSediment;
 import org.fudaa.dodico.mascaret.AbstractMascaretTestCase;
 
@@ -194,4 +196,22 @@
       assertEquals(val, sedRes[7][itps],epsilon);
     }
   }
+
+  public void testFormuleRecking2011() throws IOException {
+    FuLog.debug("Formule Recking 2011");
+    MetierFormuleSediment form=new MetierFormuleRecking2011();
+    for (int itps=0; itps<hydrauRes_.getNbTemps(); itps++) {
+      double val=form.calculer(params_, hydrauRes_, 0, 0, itps);
+      assertEquals(val, sedRes[10][itps],epsilon);
+    }
+  }
+
+  public void testFormuleVanRijn() throws IOException {
+    FuLog.debug("Formule Van Rijn");
+    MetierFormuleSediment form=new MetierFormuleVanRijn();
+    for (int itps=0; itps<hydrauRes_.getNbTemps(); itps++) {
+      double val=form.calculer(params_, hydrauRes_, 0, 0, itps);
+      assertEquals(val, sedRes[11][itps],epsilon);
+    }
+  }
 }

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

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

Revision: 8531
          http://sourceforge.net/p/fudaa/svn/8531
Author:   deniger
Date:     2013-10-23 14:02:26 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
corrections mineurs export tableau csv

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
    trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
    trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiPopupMenuReceiver.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java

Modified: trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml	2013-10-23 14:02:26 UTC (rev 8531)
@@ -10,15 +10,15 @@
     <Nom>Quelle EMH, présente (et active) dans A, est absente (ou inactive) dans B</Nom>
     <Selection>
       <!--
-                                  allSimpleEMH donne la liste des tous les EMH simple (non conteneur)
+                                  allSimpleEMHinUserOrder donne la liste des tous les EMH simple (non conteneur)
                                   contenu par les sous-modeles du scenario
       -->
       <!--
-                                  allSimpleEMH[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
+                                  allSimpleEMHinUserOrder[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
                                   actives
       -->
       <Requete Description="EMH active">
-        allSimpleEMH[actuallyActive='true']
+        allSimpleEMHinUserOrder[actuallyActive='true']
       </Requete>
     </Selection>
     <!--
@@ -33,7 +33,7 @@
     <Nom>Quelle EMH, présente et inactive dans A, est absente ou active dans B</Nom>
     <Selection>
       <Requete Description="EMH active">
-        allSimpleEMH[actuallyActive='false']
+        allSimpleEMHinUserOrder[actuallyActive='false']
       </Requete>
     </Selection>
     <Compare-Liste Bidirect="true" Attribut="id" />
@@ -47,7 +47,7 @@
                                   EMH qui ont même id
       -->
       <Merge Attribut="id" Description="EMH présente dans A et B de même Id">
-        <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+        <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder[actuallyActive='true']
         </Requete>
       </Merge>
     </Selection>
@@ -207,7 +207,7 @@
     <Nom>Quelle EMH, présente dans A et B, possède des listes de DonPrtGeo* différentes</Nom>
     <Selection>
       <Merge Attribut="id" Description="EMH présente dans A et B de même Id">
-        <Requete Description="Toutes les EMH">allSimpleEMH
+        <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder
         </Requete>
       </Merge>
       <!--
@@ -224,7 +224,7 @@
     <Nom>Quelle EMH, présente dans A et B, a des différences sur ses DonPrtGeo* de même nom (attributs premier niveau)</Nom>
     <Selection>
       <Merge Attribut="id" Description="EMH présente dans A et B de même Id">
-        <Requete Description="Toutes les EMH">allSimpleEMH
+        <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder
         </Requete>
       </Merge>
       <Merge Attribut="id" Description="dptg de même nom">
@@ -276,7 +276,7 @@
     <Selection>
       <Merge Attribut="id">
         <Requete Description="Les DonPrtGeoProfilSection de même id">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
         </Requete>
       </Merge>
       <Requete Description="les litNommes">
@@ -294,7 +294,7 @@
     <Selection>
       <Merge Attribut="id">
         <Requete Description="Les DonPrtGeoProfilSection de même id">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
         </Requete>
       </Merge>
     </Selection>
@@ -309,7 +309,7 @@
     <Selection>
       <Merge Attribut="id,litNumerote.size">
         <Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
         </Requete>
       </Merge>
       <Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -325,7 +325,7 @@
     <Selection>
       <Merge Attribut="id,litNumerote.size">
         <Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
         </Requete>
       </Merge>
       <Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -341,7 +341,7 @@
     <Selection>
       <Merge Attribut="id,litNumerote.size">
         <Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
         </Requete>
       </Merge>
       <Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -366,7 +366,7 @@
     <Selection>
       <Merge Attribut="id">
         <Requete Description="Les DonPrtGeoProfilSection de même id">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
         </Requete>
       </Merge>
     </Selection>
@@ -380,7 +380,7 @@
     <Selection>
       <Merge Attribut="id">
         <Requete Description="Les DonPrtGeoProfilSection de même id">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]
         </Requete>
       </Merge>
     </Selection>
@@ -394,7 +394,7 @@
     <Selection>
       <Merge Attribut="id">
         <Requete Description="Les DonPrtGeoProfilCasier de même id">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilCasier"]
         </Requete>
       </Merge>
     </Selection>
@@ -408,7 +408,7 @@
     <Selection>
       <Merge Attribut="id">
         <Requete Description="Les DonPrtGeoProfilCasier de même id">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilCasier"]
         </Requete>
       </Merge>
     </Selection>
@@ -422,7 +422,7 @@
     <Selection>
       <Merge Attribut="id">
         <Requete Description="Les DonPrtGeoProfilCasier de même id">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilCasier"]
         </Requete>
       </Merge>
     </Selection>
@@ -436,7 +436,7 @@
     <Selection>
       <Merge Attribut="id">
         <Requete Description="Les DonPrtGeoProfilCasier de même id">
-          allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
+          allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilCasier"]
         </Requete>
       </Merge>
     </Selection>
@@ -449,7 +449,7 @@
     <Nom>Quel LitNomme, présent dans A, est absent dans B</Nom>
     <Selection>
       <Requete Description="Les lit nommmes">
-        allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/nomLit
+        allSimpleEMHinUserOrder/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/nomLit
       </Requete>
     </Selection>
     <Compare-Liste Attribut="id" Bidirect="true" />
@@ -459,7 +459,7 @@
     <Nom>Quel DonFrt, présent (et utilisé) dans A, est absent (ou inutilisé) dans B</Nom>
     <Selection>
       <Requete Description="Les frottements utilisés">
-        allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/frot
+        allSimpleEMHinUserOrder[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/frot
       </Requete>
     </Selection>
     <Compare-Liste Attribut="id" Bidirect="true" />
@@ -515,7 +515,7 @@
     <Nom>Quelle EMH, présente dans A et B, possédant des DonPrtCIni, a des attributs différents</Nom>
     <Selection>
       <Merge Attribut="id" Description="EMH présente dans A et B de même Id">
-        <Requete Description="Toutes les EMH">allSimpleEMH
+        <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder
         </Requete>
       </Merge>
       <Requete Description="Les DPTI de l'EMH">DPTI</Requete>
@@ -529,7 +529,7 @@
     <Selection>
       <Merge Attribut="id" Description="EMH présente dans A et B de même Id">
         <Requete Description="Toutes les branches">
-          allSimpleEMH
+          allSimpleEMHinUserOrder
         </Requete>
       </Merge>
       <Merge Attribut="type" Description="DCSP de même type">
@@ -1374,7 +1374,7 @@
     <Nom>Quelle EMH, présente dans A et dans B, comporte des résultat différents (Epsilon absolu)</Nom>
     <Selection>
       <Merge Attribut="id" Description="EMH présente dans A et B de même Id">
-        <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+        <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder[actuallyActive='true']
         </Requete>
       </Merge>
       <Requete Description="Les résultats">resultatCalcul</Requete>
@@ -1386,7 +1386,7 @@
     <Nom>Quelle EMH, présente dans A et dans B, comporte des résultat différents (Epsilon absolu + relatif)</Nom>
     <Selection>
       <Merge Attribut="id" Description="EMH présente dans A et B de même Id">
-        <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+        <Requete Description="Toutes les EMH">allSimpleEMHinUserOrder[actuallyActive='true']
         </Requete>
       </Merge>
       <Requete Description="Les résultats">resultatCalcul</Requete>

Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2013-10-23 14:02:26 UTC (rev 8531)
@@ -1,6 +1,8 @@
 #Par convention, les fichiers de traduction sont en ISO-8859-1
 
 otfa.validator.cibleEtuFileNotFound=Le fichier etu cible {0} n''existe pas
+otfa.scenarionNotFound.detail=Le sc\u00e9nario {0} n''a pas \u00e9t\u00e9 trouv\u00e9
+otfa.scenarioNotFound=Sc\u00e9nario introuvable
 migrate.isChildrenFilesTester.isNotChild=Le fichier {0} n''est pas contenu dans le r\u00e9pertoire de l''\u00e9tude initiale
 
 io.emptyEMH.error=Pas d'EMH lue.
@@ -636,7 +638,7 @@
 option.crue10.rcal.exeOption.name=Option pour demande de calcul
 option.crue10.rcal.exeOption.comment=Option pour demande de calcul
 
-validation.name.pattern.error=Le nom respecte pas le format (uniquement des lettres)
+validation.name.pattern.error=Le nom ne respecte pas le format (commencer par une lettre, pas d'accent...)
 validation.name.isBlank.error=Le nom est vide
 validation.name.prefix.error=Le nom ne commence pas par le pr\u00e9fixe {0}
 validation.contentInvalid.error=Le nom ne doit pas contenir de caract\u00e8res interdits (:, #,...)

Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -268,9 +268,10 @@
       logs.addGroup(conversionResult.getLogs().createCleanGroup());
       EMHProjetController.writeProjet(etuFile, projet, logs, user);
       projetResult = this.loadProjet(etuFile, getCoeurForItem(campagne, item));
+      final CtuluLogGroup cleanLogGroup = projetResult.getLogs().createCleanGroup();
 
-      logs.addGroup(projetResult.getLogs().createCleanGroup());
-      if (projetResult.getResult() == null) {
+      logs.addGroup(cleanLogGroup);
+      if (projetResult.getResult() == null || cleanLogGroup.containsFatalError()) {
         return new CrueOperationResult<EMHScenario>(null, (CtuluLog) null);
       }
       //on reprend les données:
@@ -278,6 +279,10 @@
       managerScenario = projet.getScenario(item.getScenarioNom());
       controller = new EMHProjetController(projet, user);//important de faire cela pour la reference a projet.
     }
+    if (managerScenario == null) {
+      logs.createNewLog("otfa.scenarioNotFound").addError("otfa.scenarionNotFound.detail", item.getScenarioNom());
+      return new CrueOperationResult<EMHScenario>(null, logs.createCleanGroup());
+    }
 
     if (item.isLaunchCompute()) {
       // Création du run et sauvegarde dans l'étude

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiPopupMenuReceiver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiPopupMenuReceiver.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiPopupMenuReceiver.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -5,6 +5,7 @@
 import javax.swing.JSeparator;
 import org.fudaa.ctulu.CtuluUI;
 import org.fudaa.ctulu.gui.PopupMenuReceiver;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.ebli.courbe.EGFillePanel;
 
 /**
@@ -27,7 +28,6 @@
     return panel;
   }
 
-
   @Override
   public void install(JComponent component, CtuluUI ui) {
     super.install(component, ui);
@@ -71,5 +71,9 @@
     refinedMenuItem.setEnabled(panel.isSelectionRefinable());
     alignPointMenuItem.setEnabled(panel.isSelectionAlignable());
     removeMenuItem.setEnabled(panel.isSelectionRemovable());
+    ExportTableCommentSupplier exportTableCommentSupplier = panel.getGraphe().getExportTableCommentSupplier();
+    if (exportTableCommentSupplier != null && ctuluTableExportAction != null) {
+      super.ctuluTableExportAction.setExportTableCommentSupplier(exportTableCommentSupplier);
+    }
   }
 }

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -7,7 +7,6 @@
 import org.fudaa.ctulu.table.CtuluTableModelExportDecorator;
 import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
 import org.fudaa.dodico.crue.config.ccm.ItemVariable;
-import org.fudaa.ebli.courbe.EGModel;
 import org.fudaa.fudaa.crue.loi.common.AbstractLoiCourbeModel;
 import org.fudaa.fudaa.crue.loi.common.DefaultLoiTableModel;
 
@@ -26,7 +25,7 @@
 
   @Override
   public boolean hasSpecificExportValue(int col) {
-    if (col == 1) {
+    if (col == 1 && table.getModel() instanceof DefaultLoiTableModel) {
       DefaultLoiTableModel model = (DefaultLoiTableModel) table.getModel();
       AbstractLoiCourbeModel loiCourbeModel = (AbstractLoiCourbeModel) model.getCourbe().getModel();
       ItemVariable varAbscisse = loiCourbeModel.getConfigLoi().getVarAbscisse();
@@ -40,7 +39,7 @@
 
   @Override
   public Object getValue(int row, int col) {
-    if (col == 1) {
+    if (col == 1 && table.getModel() instanceof DefaultLoiTableModel) {
       DefaultLoiTableModel model = (DefaultLoiTableModel) table.getModel();
       AbstractLoiCourbeModel loiCourbeModel = (AbstractLoiCourbeModel) model.getCourbe().getModel();
       ItemVariable varAbscisse = loiCourbeModel.getConfigLoi().getVarAbscisse();

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DFRTTopComponent.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -30,7 +30,7 @@
 import org.fudaa.dodico.crue.validation.ValidationHelperLoi;
 import org.fudaa.dodico.crue.validation.ValidationPatternHelper;
 import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.fudaa.crue.common.helper.DialogHelper;
 import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
 import org.fudaa.fudaa.crue.common.helper.ObjetWithIdCellRenderer;

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -30,7 +30,7 @@
 import org.fudaa.dodico.crue.validation.ValidationHelperLoi;
 import org.fudaa.dodico.crue.validation.ValidationPatternHelper;
 import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.fudaa.crue.common.PerspectiveEnum;
 import org.fudaa.fudaa.crue.common.editor.LocalDateTimePanel;
 import org.fudaa.fudaa.crue.common.helper.DialogHelper;

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -15,7 +15,7 @@
 import org.fudaa.dodico.crue.config.loi.EnumTypeLoi;
 import org.fudaa.dodico.crue.metier.emh.*;
 import org.fudaa.dodico.crue.validation.ValidationHelperLoi;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
 import org.fudaa.fudaa.crue.loi.loiff.LoiUiController;
 import org.fudaa.fudaa.crue.modelling.services.EnumModification;

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -30,7 +30,7 @@
 import org.fudaa.dodico.crue.validation.ValidateAndRebuildProfilSection;
 import org.fudaa.dodico.crue.validation.ValidatorNomProfilCasierContent;
 import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.fudaa.crue.common.helper.DialogHelper;
 import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
 import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -36,7 +36,7 @@
 import org.fudaa.dodico.crue.validation.ValidationPatternHelper;
 import org.fudaa.ebli.commun.EbliActionSimple;
 import org.fudaa.ebli.commun.EbliComponentFactory;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.fudaa.crue.common.action.ExportImageAction;
 import org.fudaa.fudaa.crue.common.action.ExportImageToClipboardAction;
 import org.fudaa.fudaa.crue.common.helper.ComboBoxHelper;

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -21,7 +21,7 @@
 import org.fudaa.ebli.commun.EbliActionInterface;
 import org.fudaa.ebli.commun.EbliActionSimple;
 import org.fudaa.ebli.commun.EbliComponentFactory;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.ebli.courbe.EGAxe;
 import org.fudaa.ebli.courbe.EGAxeHorizontal;
 import org.fudaa.ebli.courbe.EGAxeHorizontalPersist;

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDFRTTopComponent.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -11,7 +11,7 @@
 import org.fudaa.dodico.crue.metier.comparator.ObjetNommeByNameComparator;
 import org.fudaa.dodico.crue.metier.emh.*;
 import org.fudaa.dodico.crue.metier.helper.EMHHelper;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.fudaa.crue.common.AbstractTopComponent;
 import org.fudaa.fudaa.crue.common.PerspectiveEnum;
 import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java	2013-10-23 12:53:17 UTC (rev 8530)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportDLHYTopComponent.java	2013-10-23 14:02:26 UTC (rev 8531)
@@ -11,7 +11,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.fudaa.dodico.crue.metier.comparator.ObjetNommeByNameComparator;
 import org.fudaa.dodico.crue.metier.emh.*;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.fudaa.crue.common.editor.LocalDateTimePanel;
 import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
 import org.fudaa.fudaa.crue.loi.loiff.LoiUiController;

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

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

Revision: 8530
          http://sourceforge.net/p/fudaa/svn/8530
Author:   deniger
Date:     2013-10-23 12:53:17 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
corrections mineurs export tableau csv

Modified Paths:
--------------
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
    trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java

Added Paths:
-----------
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/ExportTableCommentSupplier.java

Removed Paths:
-------------
    trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java

Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java	2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportAction.java	2013-10-23 12:53:17 UTC (rev 8530)
@@ -7,6 +7,7 @@
 import javax.swing.JTable;
 import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.table.CtuluTableModelInterface;
 
 /**
  * @author deniger
@@ -14,28 +15,32 @@
  */
 @SuppressWarnings("serial")
 public class CtuluTableExportAction extends AbstractAction {
-  
+
   private final CtuluUI ui;
   private final JTable table;
-  private char separator='\t';
+  private char separator = '\t';
 
   /**
    * @param ui
    * @param table
    */
   public CtuluTableExportAction(CtuluUI ui, JTable table) {
-    super(CtuluLib.getS("Exporter le tableau"),BuResource.BU.getMenuIcon("exporter"));
-    putValue(Action.ACTION_COMMAND_KEY,"EXPORT_CSV_EXCEL");
-    putValue(Action.SHORT_DESCRIPTION,CtuluLib.getS("Exporter le tableau au format csv ou excel"));
+    super(CtuluLib.getS("Exporter le tableau"), BuResource.BU.getMenuIcon("exporter"));
+    putValue(Action.ACTION_COMMAND_KEY, "EXPORT_CSV_EXCEL");
+    putValue(Action.SHORT_DESCRIPTION, CtuluLib.getS("Exporter le tableau au format csv ou excel"));
     this.ui = ui;
     this.table = table;
-    
+
   }
 
   @Override
   public void actionPerformed(ActionEvent e) {
-    CtuluTableExportPanel.doExport(separator,table, ui,CtuluLibSwing.getActiveWindow());
-    
+    table.putClientProperty(CtuluTableModelInterface.EXPORT_COMMENT_PROPERTY, null);
+    if (exportTableCommentSupplier != null) {
+      table.putClientProperty(CtuluTableModelInterface.EXPORT_COMMENT_PROPERTY, exportTableCommentSupplier.getComments());
+    }
+    CtuluTableExportPanel.doExport(separator, table, ui, CtuluLibSwing.getActiveWindow());
+
   }
 
   /**
@@ -51,5 +56,9 @@
   public void setSeparator(char separator) {
     this.separator = separator;
   }
+  ExportTableCommentSupplier exportTableCommentSupplier;
 
+  public void setExportTableCommentSupplier(ExportTableCommentSupplier exportTableCommentSupplier) {
+    this.exportTableCommentSupplier = exportTableCommentSupplier;
+  }
 }

Copied: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/ExportTableCommentSupplier.java (from rev 8421, trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java)
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/ExportTableCommentSupplier.java	                        (rev 0)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/ExportTableCommentSupplier.java	2013-10-23 12:53:17 UTC (rev 8530)
@@ -0,0 +1,15 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.gui;
+
+import java.util.List;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public interface ExportTableCommentSupplier {
+
+  List<String> getComments();
+}

Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java	2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/PopupMenuReceiver.java	2013-10-23 12:53:17 UTC (rev 8530)
@@ -17,7 +17,7 @@
  * @author deniger
  */
 public class PopupMenuReceiver implements CtuluPopupListener.PopupReceiver {
-  
+
   private JMenuItem copyItem;
   private JMenuItem copyAllItem;
   private JMenuItem cutItem;
@@ -26,7 +26,7 @@
   private JMenuItem pasteItem;
   protected CtuluPopupMenu popupMenu;
   private boolean isBuild;
-  
+
   @SuppressWarnings("serial")
   public static Action createCopyAllAction(final JTable table) {
     Action res = new AbstractAction(CtuluResource.CTULU.getString("Copier tout"), CtuluResource.CTULU
@@ -34,15 +34,15 @@
       @Override
       public void actionPerformed(ActionEvent e) {
         new CopyAllTableToClipboardRunnable(table).run();
-        
+
       }
     };
     res.putValue(Action.SHORT_DESCRIPTION, CtuluLib.getS("Tout copier dans le presse-papier"));
     res.putValue(Action.ACTION_COMMAND_KEY, "copyAll");
     return res;
-    
+
   }
-  
+
   public final void build() {
     if (isBuild) {
       return;
@@ -57,25 +57,26 @@
     }
     addItems();
   }
-  
+
   private boolean isTable() {
     return component instanceof JTable;
   }
-  
+  protected CtuluTableExportAction ctuluTableExportAction;
+
   protected void addExportItems() {
     if (isTable()) {
       popupMenu.addSeparator();
-      final CtuluTableExportAction ctuluTableExportAction = new CtuluTableExportAction(ui, (JTable) component);
+      ctuluTableExportAction = new CtuluTableExportAction(ui, (JTable) component);
       ctuluTableExportAction.setSeparator(';');
       popupMenu.add(ctuluTableExportAction);
     }
   }
-  
+
   protected void addItems() {
     addCopyPasteItems();
     addExportItems();
   }
-  
+
   private void addCopyPasteItems() {
     popupMenu.add(cutItem);
     popupMenu.add(copyItem);
@@ -84,31 +85,31 @@
     }
     popupMenu.add(pasteItem);
   }
-  
+
   public void install(JComponent component, CtuluUI ui) {
     install(component, component, ui);
   }
-  
+
   public void install(JComponent component, JComponent source, CtuluUI ui) {
     this.ui = ui;
     this.component = source;
     assert this.component != null;
     new CtuluPopupListener(this, component);
   }
-  
+
   public static void installDefault(JComponent jc, CtuluUI ui) {
     new PopupMenuReceiver().install(jc, ui);
-    
+
   }
-  
+
   @Override
   public void popup(MouseEvent evt) {
     build();
     updateItemStateBeforeShow();
     popupMenu.show(evt.getComponent(), evt.getX(), evt.getY());
-    
+
   }
-  
+
   protected void updateItemStateBeforeShow() {
     ((ActionTransferSource) copyItem.getAction()).updateState();
     ((ActionTransferSource) cutItem.getAction()).updateState();

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java	2013-10-23 12:53:17 UTC (rev 8530)
@@ -51,7 +51,7 @@
 import org.fudaa.ctulu.image.CtuluImageProducer;
 import org.fudaa.ebli.commun.EbliLib;
 import org.fudaa.ebli.commun.EbliPreferences;
-import org.fudaa.ebli.commun.ExportTableCommentSupplier;
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import org.fudaa.ebli.palette.BPaletteInfo;
 import org.fudaa.ebli.repere.RepereMouseKeyController;
 import org.fudaa.ebli.repere.RepereMouseKeyTarget;

Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java	2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliTableInfoPanel.java	2013-10-23 12:53:17 UTC (rev 8530)
@@ -7,6 +7,7 @@
  */
 package org.fudaa.ebli.commun;
 
+import org.fudaa.ctulu.gui.ExportTableCommentSupplier;
 import java.awt.Component;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemListener;

Deleted: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java	2013-10-22 08:58:48 UTC (rev 8529)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/ExportTableCommentSupplier.java	2013-10-23 12:53:17 UTC (rev 8530)
@@ -1,15 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.ebli.commun;
-
-import java.util.List;
-
-/**
- *
- * @author Frederic Deniger
- */
-public interface ExportTableCommentSupplier {
-
-  List<String> getComments();
-}

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