Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[5865] trunk/business/fudaa-sig/src/main

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5865
          http://fudaa.svn.sourceforge.net/fudaa/?rev=5865&view=rev
Author:   deniger
Date:     2010-08-22 21:58:57 +0000 (Sun, 22 Aug 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigGeomSrcData.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVarAttrMapperTableModel.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java
    trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigGeomSrcData.java
===================================================================

--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigGeomSrcData.java	2010-08-22 21:57:54 UTC (rev 5864)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigGeomSrcData.java	2010-08-22 21:58:57 UTC (rev 5865)
@@ -1,9 +1,13 @@
 /*
- *  @creation     31 mai 2005
- *  @modification $Date: 2007-05-04 14:00:26 $
- *  @license      GNU General Public License 2
- *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- *  @mail         fud...@li...
+ * @creation 31 mai 2005
+ * 
+ * @modification $Date: 2007-05-04 14:00:26 $
+ * 
+ * @license GNU General Public License 2
+ * 
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * 
+ * @mail fud...@li...
  */
 package org.fudaa.fudaa.sig;
 
@@ -14,6 +18,12 @@
 
 import javax.swing.SwingUtilities;
 
+import com.memoire.bu.BuBorderLayout;
+import com.vividsolutions.jts.geom.Envelope;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Polygon;
+
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.CtuluUI;
 import org.fudaa.ctulu.ProgressionInterface;
@@ -37,12 +47,6 @@
 import org.fudaa.fudaa.commun.FudaaLib;
 import org.fudaa.fudaa.sig.wizard.FSigWizardImportHelper;
 
-import com.memoire.bu.BuBorderLayout;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Polygon;
-
 /**
  * @author Fred Deniger
  * @version $Id: FSigGeomSrcData.java,v 1.14 2007-05-04 14:00:26 deniger Exp $
@@ -63,6 +67,21 @@
 
   GISDataModel[] polylignes_;
 
+  public boolean containsDataFor(final GISAttributeInterface toFind) {
+    return containsDataFor(toFind, points_) || containsDataFor(toFind, polygones_)
+        || containsDataFor(toFind, polylignes_);
+
+  }
+
+  public static boolean containsDataFor(final GISAttributeInterface toFind, final GISDataModel[] models) {
+    if (models == null) { return false; }
+    for (final GISDataModel gisDataModel : models) {
+      if (gisDataModel.getIndiceOf(toFind) >= 0) { return true; }
+    }
+    return false;
+
+  }
+
   private void preload(final GISAttributeInterface[] _att, final GISDataModel[] _models,
       final ProgressionInterface _prog) {
 
@@ -111,20 +130,20 @@
       envConvex.expandToInclude(dest.getEnvelopeInternal());
       // convex.add(dest);
     }
-//    final Envelope ptRing = new Envelope();
-//    if (points_ != null) {
-//      // List geoms = new ArrayList();
-//      for (int i = points_.length - 1; i >= 0; i--) {
-//        for (int k = points_[i].getNumGeometries() - 1; k >= 0; k--) {
-//          ptRing.expandToInclude(points_[i].getGeometry(k).getEnvelopeInternal());
-//        }
-//      }
-//      if (!ptRing.isNull()) {
-//        envConvex.expandToInclude(ptRing);
-//        final ZCalqueLigneBrisee cq = FSigGeomSrcDataUtils.buildPrevisuDomaines(ptRing);
-//        gc.add(cq);
-//      }
-//    }
+    // final Envelope ptRing = new Envelope();
+    // if (points_ != null) {
+    // // List geoms = new ArrayList();
+    // for (int i = points_.length - 1; i >= 0; i--) {
+    // for (int k = points_[i].getNumGeometries() - 1; k >= 0; k--) {
+    // ptRing.expandToInclude(points_[i].getGeometry(k).getEnvelopeInternal());
+    // }
+    // }
+    // if (!ptRing.isNull()) {
+    // envConvex.expandToInclude(ptRing);
+    // final ZCalqueLigneBrisee cq = FSigGeomSrcDataUtils.buildPrevisuDomaines(ptRing);
+    // gc.add(cq);
+    // }
+    // }
     if (!envConvex.isNull()) {
       final ZCalqueLigneBrisee cq = FSigGeomSrcDataUtils.buildPrevisuDomaineTotal(envConvex);
       gc.add(cq);
@@ -271,7 +290,7 @@
       final CtuluUI _parent) {
     final CtuluDialogPanel pn = new CtuluDialogPanel();
     pn.setLayout(new BuBorderLayout(0, 10, true, true));
-    FSigWizardImportHelper.InfoPanel pnInfo=new FSigWizardImportHelper.InfoPanel();
+    final FSigWizardImportHelper.InfoPanel pnInfo = new FSigWizardImportHelper.InfoPanel();
     pnInfo.setSrc(this);
     pn.add(pnInfo, BuBorderLayout.NORTH);
     previsu(_d, _parent, pn, _zoneCible);

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVarAttrMapperTableModel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVarAttrMapperTableModel.java	2010-08-22 21:57:54 UTC (rev 5864)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVarAttrMapperTableModel.java	2010-08-22 21:58:57 UTC (rev 5865)
@@ -178,8 +178,8 @@
    * @return les resultats dans l'ordre d'entree.
    */
   public MapperResult getResult() {
-    final ArrayList listVar = new ArrayList(target_.length);
-    final ArrayList listAtt = new ArrayList(target_.length);
+    final ArrayList<H2dVariableType> listVar = new ArrayList<H2dVariableType>(target_.length);
+    final ArrayList<GISAttributeInterface> listAtt = new ArrayList<GISAttributeInterface>(target_.length);
     final int nb = idx_.length;
     for (int i = 0; i < nb; i++) {
       final GISAttributeInterface att = idx_[i];

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java	2010-08-22 21:57:54 UTC (rev 5864)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java	2010-08-22 21:58:57 UTC (rev 5865)
@@ -42,6 +42,7 @@
 import org.fudaa.fudaa.sig.FSigVarPolygoneModifierActivity;
 import org.fudaa.fudaa.sig.FSigVariableModifResult;
 import org.fudaa.fudaa.sig.FSigVariableModifResultSub;
+import org.fudaa.fudaa.sig.FSigVarAttrMapperTableModel.MapperResult;
 
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
@@ -157,15 +158,18 @@
   public final H2dVariableProviderInterface getTarget() {
     return target_;
   }
+  
+  MapperResult userMappingDefined;
 
   public void process(final CtuluAnalyze _analyse, final BitSet _set, final ProgressionInterface _prog) {
     stop_ = false;
-    final FSigVarAttrMapperTableModel.MapperResult res = getAttModel().getResult();
+    final FSigVarAttrMapperTableModel.MapperResult res = getMapperResult();
     final boolean isElt = target_.isElementVar();
     final int nbObj = isElt ? target_.getGrid().getEltNb() : target_.getGrid().getPtsNb();
     final BitSet objectSet = _set == null ? new BitSet(nbObj) : _set;
     int nbPtZoneMod = 0;
     if (res.att_.length == 0) {
+      _analyse.addWarn(FSigLib.getS("Les fichiers en entr\xE9e ne comporte pas de donn\xE9es, l'interpolation n'a pas \xE9t\xE9 effectu\xE9e"));
       return;
     }
     final FSigVariableModifResult resultat = new FSigVariableModifResult(res.att_.length, objectSet, target_);
@@ -290,6 +294,10 @@
 
   }
 
+  private MapperResult getMapperResult() {
+    return userMappingDefined==null?getAttModel().getResult():userMappingDefined;
+  }
+
   public final void setData(final FSigGeomSrcData _data) {
     data_ = _data;
   }
@@ -357,4 +365,18 @@
     useZone_ = _useZone;
   }
 
+  /**
+   * @return the userMappingDefined
+   */
+  public MapperResult getUserMappingDefined() {
+    return userMappingDefined;
+  }
+
+  /**
+   * @param userMappingDefined the userMappingDefined to set
+   */
+  public void setUserMappingDefined(MapperResult userMappingDefined) {
+    this.userMappingDefined = userMappingDefined;
+  }
+
 }

Modified: trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt
===================================================================
--- trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt	2010-08-22 21:57:54 UTC (rev 5864)
+++ trunk/business/fudaa-sig/src/main/resources/org/fudaa/fudaa/sig/fsig_en.fr_txt	2010-08-22 21:58:57 UTC (rev 5865)
@@ -1,4 +1,5 @@
 Ajouter un groupe=Add a group
+Les fichiers en entr\xE9e ne comporte pas de donn\xE9es, l'interpolation n'a pas \xE9t\xE9 effectu\xE9e=The input files have no datas, the interpolation can't be done
 Le fichier inp est requis pour la lecture des r\xE9sultats=The inp file is required to read the corresponding results data
 S\xE9lectionner au moins un noeud dans une fronti\xE8re interne=Select at least one node in an intern frontier
 Saisir un point r\xE9el=Input real coordinates


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




Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[5865] trunk/business/fudaa-sig/src/main

https://gitlab.com/fudaa

fudaa-svn-commit