Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2010-06-28 22:48:45
|
Revision: 5778
http://fudaa.svn.sourceforge.net/fudaa/?rev=5778&view=rev
Author: deniger
Date: 2010-06-28 22:48:38 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeEditorPanel.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerAction.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeEditorPanel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeEditorPanel.java 2010-06-28 22:46:49 UTC (rev 5777)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigAttributeEditorPanel.java 2010-06-28 22:48:38 UTC (rev 5778)
@@ -137,7 +137,7 @@
Set initAtt_;
- public boolean valide() {
+ public boolean isDataValid() {
if (t_.isEditing()) {
t_.getCellEditor().stopCellEditing();
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerAction.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerAction.java 2010-06-28 22:46:49 UTC (rev 5777)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerAction.java 2010-06-28 22:48:38 UTC (rev 5778)
@@ -164,7 +164,7 @@
final FSigAttributeEditorPanel pn = new FSigAttributeEditorPanel(null, _gr.visu_.getAttributeMng(), null, FSigLib
.getS("Variables \xE0 utiliser")) {
- public boolean valide() {
+ public boolean isDataValid() {
final String txt = ft.getText();
if (txt.length() == 0) {
setErrorText(CtuluLib.getS("Le champ est vide") + '!');
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java 2010-06-28 22:46:49 UTC (rev 5777)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java 2010-06-28 22:48:38 UTC (rev 5778)
@@ -104,7 +104,7 @@
ft_ = _ft;
}
- public boolean valide() {
+ public boolean isDataValid() {
final String txt = ft_.getText();
if (txt.length() == 0) {
setErrorText(CtuluLib.getS("Le champ est vide") + '!');
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java 2010-06-28 22:46:49 UTC (rev 5777)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSIgImageWizartStepCalageUI.java 2010-06-28 22:48:38 UTC (rev 5778)
@@ -140,7 +140,7 @@
return table_;
}
- public boolean isValid() {
+ public boolean isDataValid() {
return tfXReel_.getValue() != null && tfYReel_.getValue() != null && tfXPixel_.getValue() != null
&& tfYPixel_.getValue() != null;
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java 2010-06-28 22:46:49 UTC (rev 5777)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java 2010-06-28 22:48:38 UTC (rev 5778)
@@ -185,7 +185,7 @@
}
protected void modifySelectionRow() {
- if (!ui_.isValid()) {
+ if (!ui_.isDataValid()) {
return;
}
final Number xReel = ui_.getTfXReel();
@@ -213,7 +213,7 @@
modifySelectionRow();
return;
}
- if (!ui_.isValid()) {
+ if (!ui_.isDataValid()) {
return;
}
// on ajoute un point
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-10-18 00:15:27
|
Revision: 5978
http://fudaa.svn.sourceforge.net/fudaa/?rev=5978&view=rev
Author: deniger
Date: 2010-10-18 00:15:21 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLine.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerMultiPointPersistence.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLine.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLine.java 2010-10-18 00:15:06 UTC (rev 5977)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLine.java 2010-10-18 00:15:21 UTC (rev 5978)
@@ -16,6 +16,7 @@
* @author Fred Deniger
* @version $Id: FSigLayerLine.java,v 1.1 2007-01-19 13:14:29 deniger Exp $
*/
+@SuppressWarnings("serial")
public class FSigLayerLine extends ZCalqueLigneBrisee {
public FSigLayerLine() {
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerMultiPointPersistence.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerMultiPointPersistence.java 2010-10-18 00:15:06 UTC (rev 5977)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerMultiPointPersistence.java 2010-10-18 00:15:21 UTC (rev 5978)
@@ -8,12 +8,9 @@
package org.fudaa.fudaa.sig.persistence;
import org.fudaa.ctulu.gis.GISZoneCollection;
-import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.ctulu.gis.GISZoneCollectionMultiPoint;
-
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BCalqueSaverInterface;
-
import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
/**
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java 2010-10-18 00:15:06 UTC (rev 5977)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java 2010-10-18 00:15:21 UTC (rev 5978)
@@ -11,12 +11,12 @@
*/
package org.fudaa.fudaa.sig.persistence;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Arrays;
-import javax.xml.parsers.ParserConfigurationException;
+import com.memoire.fu.Fu;
+import com.memoire.fu.FuLog;
import org.fudaa.ctulu.CtuluArkLoader;
import org.fudaa.ctulu.CtuluArkSaver;
@@ -43,14 +43,7 @@
import org.fudaa.fudaa.commun.save.FudaaSaveLib;
import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.IllegalAttributeException;
-import org.geotools.feature.SchemaException;
-import org.xml.sax.SAXException;
-import com.memoire.fu.Fu;
-import com.memoire.fu.FuLog;
-import com.vividsolutions.jts.io.ParseException;
-
/**
* @author Fred Deniger
* @version $Id: FSigLayerPointPersistence.java,v 1.9.6.1 2008-01-22 09:58:16 bmarchan Exp $
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-05-24 09:47:56
|
Revision: 6260
http://fudaa.svn.sourceforge.net/fudaa/?rev=6260&view=rev
Author: bmarchan
Date: 2011-05-24 09:47:49 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Outils externes : Gestion des export de calques
Added Paths:
-----------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java
Added: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java (rev 0)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java 2011-05-24 09:47:49 UTC (rev 6260)
@@ -0,0 +1,30 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.sig.exetools;
+
+import java.io.File;
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.fileformat.FileFormat;
+import org.fudaa.ctulu.gis.GISZoneCollection;
+import org.fudaa.dodico.mascaret.io.MascaretGEO2dFileFormat;
+import org.fudaa.fudaa.commun.exetools.FudaaLayersExporterI;
+
+/**
+ * Un exporter des calques pour Mascaret 2D geo.
+ * @author mar...@de...
+ */
+public class FSigFileExporterMascaretGEO2d implements FudaaLayersExporterI {
+
+ public FileFormat getFileFormat() {
+ return MascaretGEO2dFileFormat.getInstance();
+ }
+
+ public CtuluIOOperationSynthese exportTo(GISZoneCollection[] _cols, CtuluUI _impl, File _file, ProgressionInterface _prog) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+}
Property changes on: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java (rev 0)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java 2011-05-24 09:47:49 UTC (rev 6260)
@@ -0,0 +1,30 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.sig.exetools;
+
+import java.io.File;
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.fileformat.FileFormat;
+import org.fudaa.ctulu.gis.GISZoneCollection;
+import org.fudaa.dodico.rubar.io.RubarStCnFileFormat;
+import org.fudaa.fudaa.commun.exetools.FudaaLayersExporterI;
+
+/**
+ * Un exporter des calques pour Rubar.
+ * @author mar...@de...
+ */
+public class FSigFileExporterRubarSt implements FudaaLayersExporterI {
+
+ public FileFormat getFileFormat() {
+ return RubarStCnFileFormat.getInstance();
+ }
+
+ public CtuluIOOperationSynthese exportTo(GISZoneCollection[] _cols, CtuluUI _impl, File _file, ProgressionInterface _prog) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+}
Property changes on: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-05-30 15:52:54
|
Revision: 6265
http://fudaa.svn.sourceforge.net/fudaa/?rev=6265&view=rev
Author: bmarchan
Date: 2011-05-30 15:52:47 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Exporteur 2d vers fichiers : Le filtre FSigLayerFilter est g?\195?\169n?\195?\169ralis?\195?\169 en FSigLAyerFilterAbstract
Outils externes : Am?\195?\169lioration export de calques
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java
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/FSigLayerFilter.java
Added Paths:
-----------
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/FSigLayerFilterAbstract.java
Removed Paths:
-------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporter.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java 2011-05-25 14:42:57 UTC (rev 6264)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java 2011-05-30 15:52:47 UTC (rev 6265)
@@ -4,6 +4,9 @@
*/
package org.fudaa.fudaa.sig.exetools;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.MultiPoint;
+import com.vividsolutions.jts.geom.Point;
import java.awt.BorderLayout;
import java.io.File;
import java.util.ArrayList;
@@ -14,18 +17,19 @@
import javax.swing.table.TableCellEditor;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gis.GISDataModel;
import org.fudaa.ctulu.gis.GISZoneCollectionGeometry;
-import org.fudaa.ctulu.gui.CtuluAnalyzeGUI;
import org.fudaa.ctulu.gui.CtuluCellDialogEditor;
import org.fudaa.ctulu.gui.CtuluDialog;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
import org.fudaa.ebli.calque.BCalque;
-import org.fudaa.ebli.calque.BCalqueVisitor;
import org.fudaa.ebli.calque.BGroupeCalque;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZCalqueGeometry;
import org.fudaa.fudaa.commun.exetools.FudaaExeTool;
import org.fudaa.fudaa.commun.exetools.FudaaExeTool.ParamI;
import org.fudaa.fudaa.sig.FSigLib;
+import org.fudaa.fudaa.sig.layer.FSigLayerFilterAbstract;
/**
* Un param\xE8tre fichier d'entr\xE9e construit a partir de calques s\xE9lectionn\xE9s.
@@ -82,7 +86,7 @@
}
}
- private class CalqueZoneGeometryVisitor implements BCalqueVisitor {
+ private class CalqueZoneGeometryVisitor extends FSigLayerFilterAbstract {
private List<String> layerNames=new ArrayList<String>();
private List<GISZoneCollectionGeometry> zones=new ArrayList<GISZoneCollectionGeometry>();
@@ -92,8 +96,18 @@
public boolean visit(BCalque _cq) {
if (_cq instanceof ZCalqueGeometry) {
- if (layerNames.contains(_cq.getName()))
- zones.add((GISZoneCollectionGeometry)((ZCalqueGeometry)_cq).modeleDonnees().getGeomData());
+ ZCalqueGeometry cq=(ZCalqueGeometry)_cq;
+ if (layerNames.contains(_cq.getName())) {
+ if (cq.modeleDonnees().getGeomData().getDataStoreClass().equals(Point.class)) {
+ pointCq_.add(cq);
+ }
+ else if (LineString.class.isAssignableFrom(cq.modeleDonnees().getGeomData().getDataStoreClass())) {
+ polyCq_.add(cq);
+ }
+ else if (MultiPoint.class.isAssignableFrom(cq.modeleDonnees().getGeomData().getDataStoreClass())) {
+ mlptsCq_.add(cq);
+ }
+ }
}
return true;
}
@@ -101,6 +115,10 @@
public GISZoneCollectionGeometry[] getZones() {
return zones.toArray(new GISZoneCollectionGeometry[0]);
}
+
+ protected GISDataModel getCollect(ZCalqueAffichageDonneesInterface _cq) {
+ return ((ZCalqueGeometry)_cq).modeleDonnees().getGeomData();
+ }
}
public static void setCtuluUI(CtuluUI _ui) {
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 2011-05-25 14:42:57 UTC (rev 6264)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2011-05-30 15:52:47 UTC (rev 6265)
@@ -197,8 +197,8 @@
final BuFileFilter st = RubarStCnFileFormat.createStFilter();
final Map filterExporter = new HashMap(5);// pour l'instant .....
- filterExporter.put(sx, new FSigLayerExporter.ToSinusX());
- filterExporter.put(st, new FSigLayerExporter.ToRubar());
+ filterExporter.put(sx, new FSigLayerExporterI.ToSinusX());
+ filterExporter.put(st, new FSigLayerExporterI.ToRubar());
final Map dataStores = GISExportDataStoreFactory.buildFileFilterMap(false);
if (dataStores.size() == 0) {
if (FuLog.isTrace()) {
@@ -208,7 +208,7 @@
}
for (final Iterator it = dataStores.entrySet().iterator(); it.hasNext();) {
final Map.Entry e = (Map.Entry) it.next();
- filterExporter.put(e.getKey(), new FSigLayerExporter.DataStore((FileDataStoreFactorySpi) e.getValue()));
+ filterExporter.put(e.getKey(), new FSigLayerExporterI.DataStore((FileDataStoreFactorySpi) e.getValue()));
}
final BuFileFilter[] filters = new BuFileFilter[filterExporter.size()];
filterExporter.keySet().toArray(filters);
@@ -226,7 +226,7 @@
public boolean run(ProgressionInterface _proj)
{
- final CtuluIOOperationSynthese op = filter.exportTo((FSigLayerExporter) filterExporter.get(fileChooser.getFileFilter()), getUi(), f, _proj);
+ final CtuluIOOperationSynthese op = filter.exportTo((FSigLayerExporterI) filterExporter.get(fileChooser.getFileFilter()), getUi(), f, _proj);
if (op != null)
{
getUi().manageErrorOperationAndIsFatal(op);
Deleted: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporter.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporter.java 2011-05-25 14:42:57 UTC (rev 6264)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporter.java 2011-05-30 15:52:47 UTC (rev 6265)
@@ -1,276 +0,0 @@
-/*
- * @creation 26 f\xE9vr. 07
- * @modification $Date: 2007-06-14 12:01:22 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.fudaa.sig.layer;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluIOOperationSynthese;
-import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.ProgressionInterface;
-import org.fudaa.ctulu.fileformat.FileFormatUnique;
-import org.fudaa.ctulu.gis.GISAttributeConstants;
-import org.fudaa.ctulu.gis.GISAttributeDouble;
-import org.fudaa.ctulu.gis.GISAttributeInterface;
-import org.fudaa.ctulu.gis.GISDataModel;
-import org.fudaa.ctulu.gis.GISDataModelFilterAdapter;
-import org.fudaa.ctulu.gis.GISDataModelMultiAdapter;
-import org.fudaa.ctulu.gis.GISDataModelPointToMultiPointAdapter;
-import org.fudaa.ctulu.gis.factory.GISExportDataStoreFactory;
-import org.fudaa.ctulu.gis.gml.GISGMLZoneExporter;
-import org.fudaa.ctulu.gis.mif.MIFDataStoreFactory;
-import org.fudaa.dodico.commun.DodicoLib;
-import org.fudaa.dodico.ef.io.dunes.DunesGEOFileFormat;
-import org.fudaa.dodico.rubar.io.RubarSEMFileFormat;
-import org.fudaa.dodico.rubar.io.RubarSEMWriterGISAdapter;
-import org.fudaa.dodico.rubar.io.RubarStCnFileFormat;
-import org.fudaa.dodico.telemac.io.SinusxFileFormat;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
-import org.fudaa.fudaa.commun.FudaaLib;
-import org.geotools.data.FileDataStoreFactorySpi;
-
-import com.memoire.fu.FuLog;
-
-/**
- * @author fred deniger
- * @version $Id$
- */
-public abstract class FSigLayerExporter {
-
- abstract CtuluIOOperationSynthese exportTo(FSigLayerFilter _filter, final CtuluUI _impl, final File _file,
- final ProgressionInterface _prog);
-
- public static class DataStore extends FSigLayerExporter {
-
- final FileDataStoreFactorySpi dataStore_;
-
- public DataStore(final FileDataStoreFactorySpi _dataStore) {
- dataStore_ = _dataStore;
- }
-
- CtuluIOOperationSynthese exportTo(final FSigLayerFilter _filter, final CtuluUI _impl, final File _file,
- final ProgressionInterface _prog) {
- final GISGMLZoneExporter exporter = new GISGMLZoneExporter();
- try {
- final boolean one = _filter.getNbZone() == 1;
-
- final Set nameUsed = new HashSet();
- final File dir = _file.getParentFile();
- final String name = _file.getName();
- int idx = 0;
- final List total = new ArrayList(_filter.pointCq_);
- total.addAll(_filter.polyCq_);
- total.addAll(_filter.mlptsCq_);
- final int nb = total.size();
- for (int i = 0; i < nb; i++) {
- final ZCalqueAffichageDonneesInterface oi = (ZCalqueAffichageDonneesInterface) total.get(i);
- String ni = one ? name : name + '-' + _filter.getName(oi);
- if (nameUsed.contains(ni)) {
- ni += '-' + CtuluLibString.getString(++idx);
- }
- if (nameUsed.contains(ni)) {
- ni = File.createTempFile(new File(dir, name + _filter.getName(oi)).getAbsolutePath(), "").getName();
- }
- nameUsed.add(ni);
- File file = new File(dir, ni);
- if (dataStore_ instanceof MIFDataStoreFactory) {
- if (!file.getName().endsWith(".mif")) {
- file = new File(file.getAbsolutePath() + ".mif");
- }
- if (!file.createNewFile()) {
- return null;
- }
- final File mid = CtuluLibFile.changeExtension(file, "mid");
- if (mid != null && !mid.createNewFile()) {
- return null;
- }
- }
- GISDataModel collect = _filter.getCollect(oi);
- GISAttributeDouble attIsZ=_filter.getAttributeIsZ(oi);
- 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;
- }
- }
-
- public static class ToSinusX extends FSigLayerExporter {
-
- CtuluIOOperationSynthese exportTo(final FSigLayerFilter _filter, final CtuluUI _impl, final File _f,
- final ProgressionInterface _prog) {
- File f = CtuluLibFile.appendExtensionIfNeeded(_f, "sx");
- GISDataModel[][] z = new GISDataModel[3][];
- int nb = _filter.pointCq_.size();
- z[0]=new GISDataModel[_filter.pointCq_.size()];
- for (int i = 0; i < nb; i++) {
- final GISDataModel collec = _filter.getCollect(_filter.pointCq_.get(i));
- z[0][i]=collec;
- }
- nb = _filter.polyCq_.size();
- z[1]=new GISDataModel[_filter.polyCq_.size()];
- for (int i = 0; i < nb; i++) {
- final GISDataModel collec = _filter.getCollect(_filter.polyCq_.get(i));
- z[1][i]=collec;
- }
- nb = _filter.mlptsCq_.size();
- z[2]=new GISDataModel[_filter.mlptsCq_.size()];
- for (int i = 0; i < nb; i++) {
- final GISDataModel collec = _filter.getCollect(_filter.mlptsCq_.get(i));
- z[2][i]=collec;
- }
- return SinusxFileFormat.getInstance().write(f, z, _prog);
-
- }
- }
-
- public static class ToDunes extends FSigLayerExporter {
-
- CtuluIOOperationSynthese exportTo(final FSigLayerFilter _filter, final CtuluUI _impl, final File _f,
- 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)));
- }
- for (int i = 0; i < _filter.mlptsCq_.size(); i++) {
- mdls.add(_filter.getCollect(_filter.mlptsCq_.get(i)));
- }
- for (int i = 0; i < _filter.polyCq_.size(); i++) {
- final GISDataModel collec = _filter.getCollect(_filter.polyCq_.get(i));
- mdls.add(collec);
- }
-
- return DunesGEOFileFormat.getInstance().write(f, mdls.toArray(new GISDataModel[0]), _prog);
- }
- }
-
- /**
- * Export des g\xE9om\xE9tries vers les fichiers Rubar (ST, SEM, CN).
- * @author Bertrand Marchand
- * @version $Id$
- */
- public static class ToRubar extends FSigLayerExporter {
- CtuluIOOperationSynthese exportTo(final FSigLayerFilter _filter, final CtuluUI _impl, final File _f,
- final ProgressionInterface _prog) {
- CtuluIOOperationSynthese synt=new CtuluIOOperationSynthese();
- File f = CtuluLibFile.getSansExtension(_f);
- CtuluAnalyze ana=new CtuluAnalyze();
- synt.setAnalyze(ana);
-
- // Regroupement des mod\xE8les suivant leur nature.
- List<GISDataModel> mdlprofs=new ArrayList<GISDataModel>();
- List<GISDataModel> mdlniv=new ArrayList<GISDataModel>();
- 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)));
- }
- for (int i = 0; i < _filter.mlptsCq_.size(); i++) {
- mdlsemis.add(GISDataModelFilterAdapter.buildAdapter(_filter.getCollect(_filter.mlptsCq_.get(i)), null));
- }
- for (int i=0; i<_filter.polyCq_.size(); i++) {
- GISDataModel col=_filter.getCollect(_filter.polyCq_.get(i));
- if (col.getNumGeometries()==0)
- continue;
- 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}));
- }
- else {
- GISDataModel mdl=GISDataModelFilterAdapter.buildAdapter(_filter.getCollect(_filter.polyCq_.get(i)),
- new GISAttributeInterface[]{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))) {
- mdlprofs.add(mdl);
- }
- else if (GISAttributeConstants.ATT_NATURE_LD.equals(col.getValue(idxAtt,0))) {
- mdlligdir.add(mdl);
- }
- else {
- mdlautres.add(mdl);
- }
- }
- }
-
- FileFormatUnique ff;
-
- // Les semis
- if (mdlsemis.size()>0) {
- 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.containsFatalError()) return synt;
- }
-
- // Les profils et lignes directrices
- if (mdlprofs.size()>0 || mdlligdir.size()>0) {
- ff=RubarStCnFileFormat.getInstance();
- GISDataModel[] mdl=new GISDataModel[2];
- mdl[0]=mdlprofs.size()==0 ? null:new GISDataModelMultiAdapter(mdlprofs.toArray(new GISDataModel[0]));
- mdl[1]=mdlligdir.size()==0 ? null:new GISDataModelMultiAdapter(mdlligdir.toArray(new GISDataModel[0]));
- ana=ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[0]), mdl, _prog).getAnalyze();
- synt.getAnalyze().merge(ana);
- if (synt.containsFatalError()) return synt;
- }
-
- // Les courbes de niveau
- if (mdlniv.size()>0) {
- ff=RubarStCnFileFormat.getInstance();
- GISDataModel[] mdl=new GISDataModel[2];
- mdl[0]=new GISDataModelMultiAdapter(mdlniv.toArray(new GISDataModel[0]));
- mdl[1]=null;
- ana=ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[1]), mdl, _prog).getAnalyze();
- synt.getAnalyze().merge(ana);
- if (synt.containsFatalError()) return synt;
- }
-
- // Les autres polylignes => dans un fichier _autres.st
- if (mdlautres.size()>0) {
- ff=RubarStCnFileFormat.getInstance();
- GISDataModel[] mdl=new GISDataModel[2];
- mdl[0]=new GISDataModelMultiAdapter(mdlautres.toArray(new GISDataModel[0]));
- mdl[1]=null;
- ana=ff.write(CtuluLibFile.appendExtensionIfNeeded(
- new File(f.getPath()+"_"+CtuluLib.getS("autres")),ff.getExtensions()[0]), mdl, _prog).getAnalyze();
- synt.getAnalyze().merge(ana);
- if (synt.containsFatalError()) return synt;
- }
-
- return synt;
- }
-
- }
-
-}
Copied: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java (from rev 6240, trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporter.java)
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java (rev 0)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java 2011-05-30 15:52:47 UTC (rev 6265)
@@ -0,0 +1,276 @@
+/*
+ * @creation 26 f\xE9vr. 07
+ * @modification $Date: 2007-06-14 12:01:22 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.sig.layer;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.fileformat.FileFormatUnique;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeDouble;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISDataModel;
+import org.fudaa.ctulu.gis.GISDataModelFilterAdapter;
+import org.fudaa.ctulu.gis.GISDataModelMultiAdapter;
+import org.fudaa.ctulu.gis.GISDataModelPointToMultiPointAdapter;
+import org.fudaa.ctulu.gis.factory.GISExportDataStoreFactory;
+import org.fudaa.ctulu.gis.gml.GISGMLZoneExporter;
+import org.fudaa.ctulu.gis.mif.MIFDataStoreFactory;
+import org.fudaa.dodico.commun.DodicoLib;
+import org.fudaa.dodico.ef.io.dunes.DunesGEOFileFormat;
+import org.fudaa.dodico.rubar.io.RubarSEMFileFormat;
+import org.fudaa.dodico.rubar.io.RubarSEMWriterGISAdapter;
+import org.fudaa.dodico.rubar.io.RubarStCnFileFormat;
+import org.fudaa.dodico.telemac.io.SinusxFileFormat;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
+import org.fudaa.fudaa.commun.FudaaLib;
+import org.geotools.data.FileDataStoreFactorySpi;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * @author fred deniger
+ * @version $Id$
+ */
+public interface FSigLayerExporterI {
+
+ CtuluIOOperationSynthese exportTo(FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _file,
+ final ProgressionInterface _prog);
+
+ public class DataStore implements FSigLayerExporterI {
+
+ final FileDataStoreFactorySpi dataStore_;
+
+ public DataStore(final FileDataStoreFactorySpi _dataStore) {
+ dataStore_ = _dataStore;
+ }
+
+ public CtuluIOOperationSynthese exportTo(final FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _file,
+ final ProgressionInterface _prog) {
+ final GISGMLZoneExporter exporter = new GISGMLZoneExporter();
+ try {
+ final boolean one = _filter.getNbZone() == 1;
+
+ final Set nameUsed = new HashSet();
+ final File dir = _file.getParentFile();
+ final String name = _file.getName();
+ int idx = 0;
+ final List total = new ArrayList(_filter.pointCq_);
+ total.addAll(_filter.polyCq_);
+ total.addAll(_filter.mlptsCq_);
+ final int nb = total.size();
+ for (int i = 0; i < nb; i++) {
+ final ZCalqueAffichageDonneesInterface oi = (ZCalqueAffichageDonneesInterface) total.get(i);
+ String ni = one ? name : name + '-' + _filter.getName(oi);
+ if (nameUsed.contains(ni)) {
+ ni += '-' + CtuluLibString.getString(++idx);
+ }
+ if (nameUsed.contains(ni)) {
+ ni = File.createTempFile(new File(dir, name + _filter.getName(oi)).getAbsolutePath(), "").getName();
+ }
+ nameUsed.add(ni);
+ File file = new File(dir, ni);
+ if (dataStore_ instanceof MIFDataStoreFactory) {
+ if (!file.getName().endsWith(".mif")) {
+ file = new File(file.getAbsolutePath() + ".mif");
+ }
+ if (!file.createNewFile()) {
+ return null;
+ }
+ final File mid = CtuluLibFile.changeExtension(file, "mid");
+ if (mid != null && !mid.createNewFile()) {
+ return null;
+ }
+ }
+ GISDataModel collect = _filter.getCollect(oi);
+ GISAttributeDouble attIsZ=_filter.getAttributeIsZ(oi);
+ 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;
+ }
+ }
+
+ public static class ToSinusX implements FSigLayerExporterI {
+
+ public CtuluIOOperationSynthese exportTo(final FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _f,
+ final ProgressionInterface _prog) {
+ File f = CtuluLibFile.appendExtensionIfNeeded(_f, "sx");
+ GISDataModel[][] z = new GISDataModel[3][];
+ int nb = _filter.pointCq_.size();
+ z[0]=new GISDataModel[_filter.pointCq_.size()];
+ for (int i = 0; i < nb; i++) {
+ final GISDataModel collec = _filter.getCollect(_filter.pointCq_.get(i));
+ z[0][i]=collec;
+ }
+ nb = _filter.polyCq_.size();
+ z[1]=new GISDataModel[_filter.polyCq_.size()];
+ for (int i = 0; i < nb; i++) {
+ final GISDataModel collec = _filter.getCollect(_filter.polyCq_.get(i));
+ z[1][i]=collec;
+ }
+ nb = _filter.mlptsCq_.size();
+ z[2]=new GISDataModel[_filter.mlptsCq_.size()];
+ for (int i = 0; i < nb; i++) {
+ final GISDataModel collec = _filter.getCollect(_filter.mlptsCq_.get(i));
+ z[2][i]=collec;
+ }
+ return SinusxFileFormat.getInstance().write(f, z, _prog);
+
+ }
+ }
+
+ public static class ToDunes implements FSigLayerExporterI {
+
+ public CtuluIOOperationSynthese exportTo(final FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _f,
+ 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)));
+ }
+ for (int i = 0; i < _filter.mlptsCq_.size(); i++) {
+ mdls.add(_filter.getCollect(_filter.mlptsCq_.get(i)));
+ }
+ for (int i = 0; i < _filter.polyCq_.size(); i++) {
+ final GISDataModel collec = _filter.getCollect(_filter.polyCq_.get(i));
+ mdls.add(collec);
+ }
+
+ return DunesGEOFileFormat.getInstance().write(f, mdls.toArray(new GISDataModel[0]), _prog);
+ }
+ }
+
+ /**
+ * Export des g\xE9om\xE9tries vers les fichiers Rubar (ST, SEM, CN).
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+ public static class ToRubar implements FSigLayerExporterI {
+ public CtuluIOOperationSynthese exportTo(final FSigLayerFilterAbstract _filter, final CtuluUI _impl, final File _f,
+ final ProgressionInterface _prog) {
+ CtuluIOOperationSynthese synt=new CtuluIOOperationSynthese();
+ File f = CtuluLibFile.getSansExtension(_f);
+ CtuluAnalyze ana=new CtuluAnalyze();
+ synt.setAnalyze(ana);
+
+ // Regroupement des mod\xE8les suivant leur nature.
+ List<GISDataModel> mdlprofs=new ArrayList<GISDataModel>();
+ List<GISDataModel> mdlniv=new ArrayList<GISDataModel>();
+ 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)));
+ }
+ for (int i = 0; i < _filter.mlptsCq_.size(); i++) {
+ mdlsemis.add(GISDataModelFilterAdapter.buildAdapter(_filter.getCollect(_filter.mlptsCq_.get(i)), null));
+ }
+ for (int i=0; i<_filter.polyCq_.size(); i++) {
+ GISDataModel col=_filter.getCollect(_filter.polyCq_.get(i));
+ if (col.getNumGeometries()==0)
+ continue;
+ 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}));
+ }
+ else {
+ GISDataModel mdl=GISDataModelFilterAdapter.buildAdapter(_filter.getCollect(_filter.polyCq_.get(i)),
+ new GISAttributeInterface[]{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))) {
+ mdlprofs.add(mdl);
+ }
+ else if (GISAttributeConstants.ATT_NATURE_LD.equals(col.getValue(idxAtt,0))) {
+ mdlligdir.add(mdl);
+ }
+ else {
+ mdlautres.add(mdl);
+ }
+ }
+ }
+
+ FileFormatUnique ff;
+
+ // Les semis
+ if (mdlsemis.size()>0) {
+ 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.containsFatalError()) return synt;
+ }
+
+ // Les profils et lignes directrices
+ if (mdlprofs.size()>0 || mdlligdir.size()>0) {
+ ff=RubarStCnFileFormat.getInstance();
+ GISDataModel[] mdl=new GISDataModel[2];
+ mdl[0]=mdlprofs.size()==0 ? null:new GISDataModelMultiAdapter(mdlprofs.toArray(new GISDataModel[0]));
+ mdl[1]=mdlligdir.size()==0 ? null:new GISDataModelMultiAdapter(mdlligdir.toArray(new GISDataModel[0]));
+ ana=ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[0]), mdl, _prog).getAnalyze();
+ synt.getAnalyze().merge(ana);
+ if (synt.containsFatalError()) return synt;
+ }
+
+ // Les courbes de niveau
+ if (mdlniv.size()>0) {
+ ff=RubarStCnFileFormat.getInstance();
+ GISDataModel[] mdl=new GISDataModel[2];
+ mdl[0]=new GISDataModelMultiAdapter(mdlniv.toArray(new GISDataModel[0]));
+ mdl[1]=null;
+ ana=ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[1]), mdl, _prog).getAnalyze();
+ synt.getAnalyze().merge(ana);
+ if (synt.containsFatalError()) return synt;
+ }
+
+ // Les autres polylignes => dans un fichier _autres.st
+ if (mdlautres.size()>0) {
+ ff=RubarStCnFileFormat.getInstance();
+ GISDataModel[] mdl=new GISDataModel[2];
+ mdl[0]=new GISDataModelMultiAdapter(mdlautres.toArray(new GISDataModel[0]));
+ mdl[1]=null;
+ ana=ff.write(CtuluLibFile.appendExtensionIfNeeded(
+ new File(f.getPath()+"_"+CtuluLib.getS("autres")),ff.getEx...
[truncated message content] |
|
From: <bma...@us...> - 2011-06-06 16:34:56
|
Revision: 6275
http://fudaa.svn.sourceforge.net/fudaa/?rev=6275&view=rev
Author: bmarchan
Date: 2011-06-06 16:34:49 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Outils externes : Add nouveau importers + gestion undo/redo
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigManageExeTools.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigOutFileParam.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderGIS.java
Removed Paths:
-------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java
Deleted: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java 2011-06-06 16:32:37 UTC (rev 6274)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterMascaretGEO2d.java 2011-06-06 16:34:49 UTC (rev 6275)
@@ -1,30 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.sig.exetools;
-
-import java.io.File;
-import org.fudaa.ctulu.CtuluIOOperationSynthese;
-import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.ProgressionInterface;
-import org.fudaa.ctulu.fileformat.FileFormat;
-import org.fudaa.ctulu.gis.GISZoneCollection;
-import org.fudaa.dodico.mascaret.io.MascaretGEO2dFileFormat;
-
-/**
- * Un exporter des calques pour Mascaret 2D geo.
- * @author mar...@de...
- */
-public class FSigFileExporterMascaretGEO2d implements FSigFileExporterI {
-
- public FileFormat getFileFormat() {
- return MascaretGEO2dFileFormat.getInstance();
- }
-
- public CtuluIOOperationSynthese exportTo(GISZoneCollection[] _cols, CtuluUI _impl, File _file, ProgressionInterface _prog) {
- System.out.println("Fichier d'entr\xE9e "+_file);
- return null;
- }
-
-}
Deleted: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java 2011-06-06 16:32:37 UTC (rev 6274)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigFileExporterRubarSt.java 2011-06-06 16:34:49 UTC (rev 6275)
@@ -1,30 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.sig.exetools;
-
-import java.io.File;
-import org.fudaa.ctulu.CtuluIOOperationSynthese;
-import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.ProgressionInterface;
-import org.fudaa.ctulu.fileformat.FileFormat;
-import org.fudaa.ctulu.gis.GISZoneCollection;
-import org.fudaa.dodico.rubar.io.RubarStCnFileFormat;
-
-/**
- * Un exporter des calques pour Rubar.
- * @author mar...@de...
- */
-public class FSigFileExporterRubarSt implements FSigFileExporterI {
-
- public FileFormat getFileFormat() {
- return RubarStCnFileFormat.getInstance();
- }
-
- public CtuluIOOperationSynthese exportTo(GISZoneCollection[] _cols, CtuluUI _impl, File _file, ProgressionInterface _prog) {
- System.out.println("Fichier d'entr\xE9e "+_file);
- return null;
- }
-
-}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java 2011-06-06 16:32:37 UTC (rev 6274)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java 2011-06-06 16:34:49 UTC (rev 6275)
@@ -189,7 +189,7 @@
@Override
public String getSetCellText() {
- return valSet==null ? "":FSigLib.getS("<D\xE9fini>");
+ return valSet==null ? "":FSigLib.getS("[ {0} calque(s) s\xE9lectionn\xE9(s) ]",""+valSet.split("\\|").length);
}
@Override
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigManageExeTools.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigManageExeTools.java 2011-06-06 16:32:37 UTC (rev 6274)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigManageExeTools.java 2011-06-06 16:34:49 UTC (rev 6275)
@@ -4,6 +4,7 @@
*/
package org.fudaa.fudaa.sig.exetools;
+import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ebli.calque.BGroupeCalque;
import org.fudaa.fudaa.commun.exetools.FudaaManageExeTools;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
@@ -16,6 +17,7 @@
public FSigManageExeTools(FudaaCommonImplementation _impl) {
FSigInpFileParam.setCtuluUI(_impl);
+ FSigOutFileParam.setCtuluUI(_impl);
}
@Override
@@ -29,4 +31,8 @@
FSigInpFileParam.setRoot(_cq);
FSigOutFileParam.setRoot(_cq);
}
+
+ public void setCommandManager(CtuluCommandManager _mng) {
+ FSigOutFileParam.setCommandManager(_mng);
+ }
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigOutFileParam.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigOutFileParam.java 2011-06-06 16:32:37 UTC (rev 6274)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigOutFileParam.java 2011-06-06 16:34:49 UTC (rev 6275)
@@ -12,6 +12,7 @@
import javax.swing.table.TableCellEditor;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluCommandManager;
+import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.ProgressionDetailedInterface;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
@@ -21,9 +22,16 @@
import org.fudaa.fudaa.commun.exetools.FudaaExeTool.ParamI;
import org.fudaa.fudaa.sig.FSigGeomSrcData;
import org.fudaa.fudaa.sig.wizard.FSigFileLoadResult;
+import org.fudaa.fudaa.sig.wizard.FSigFileLoaderGIS;
import org.fudaa.fudaa.sig.wizard.FSigFileLoaderI;
import org.fudaa.fudaa.sig.wizard.FSigFileLoaderMascaret;
+import org.fudaa.fudaa.sig.wizard.FSigFileLoaderRefluxRefondeResult;
+import org.fudaa.fudaa.sig.wizard.FSigFileLoaderRubarCox;
+import org.fudaa.fudaa.sig.wizard.FSigFileLoaderRubarInx;
+import org.fudaa.fudaa.sig.wizard.FSigFileLoaderRubarSem;
import org.fudaa.fudaa.sig.wizard.FSigFileLoaderRubarSt;
+import org.fudaa.fudaa.sig.wizard.FSigFileLoaderSerafin;
+import org.fudaa.fudaa.sig.wizard.FSigFileLoaderSinusX;
/**
* Un param\xE8tre fichier de sortie construit a partir de calques s\xE9lectionn\xE9s.
@@ -32,17 +40,42 @@
public class FSigOutFileParam extends ParamI {
/** Les exporters pour ce type de parametre */
private static FSigFileLoaderI[] loaders_={
+ new FSigFileLoaderRubarSt(),
+ new FSigFileLoaderGIS.GML(),
+ new FSigFileLoaderGIS.Shape(),
+ new FSigFileLoaderGIS.MIF(),
+ new FSigFileLoaderSinusX(),
new FSigFileLoaderMascaret(),
- new FSigFileLoaderRubarSt()
+ new FSigFileLoaderSerafin(),
+ new FSigFileLoaderRubarCox(),
+ new FSigFileLoaderRubarInx(),
+ new FSigFileLoaderRubarSem(),
+ new FSigFileLoaderRefluxRefondeResult()
+
};
/** Les noms associ\xE9es. Ne pas modifier ces noms, ils sont sauv\xE9s dans les pr\xE9f\xE9rences */
private static String[] loadNames_={
+ "RubarSt",
+ "GML",
+ "Shape",
+ "MIF",
+ "SinusX",
"Mascaret2d",
- "RubarSt"
+ "Serafin",
+ "RubarCox",
+ "RubarInx",
+ "RubarSem",
+ "SOV"
};
+
+ static {
+
+ }
/** Le root calque pour les fichiers de sortie. */
private static BGroupeCalque root_;
+ private static CtuluUI ui_;
+ private static CtuluCommandManager mng_;
private String value;
private int numLoader;
@@ -99,8 +132,8 @@
// Chargement par la fenetre de destination
ParamOutFilePostPanel pn=new ParamOutFilePostPanel(res.createData());
- if (pn.afficheModaleOk(null,FudaaLib.getS("Destination des donn\xE9es du fichier {0}",getValParam()))) {
- pn.doAtEnd(_prog, null);
+ if (pn.afficheModaleOk(ui_.getParentComponent(),FudaaLib.getS("Destination des donn\xE9es du fichier {0}",getValParam()))) {
+ pn.doAtEnd(_prog, mng_);
}
@@ -166,6 +199,14 @@
root_=_root;
}
+ public static void setCtuluUI(CtuluUI _ui) {
+ ui_=_ui;
+ }
+
+ public static void setCommandManager(CtuluCommandManager _mng) {
+ mng_=_mng;
+ }
+
@Override
public String getDefinitionCellText() {
return getLabel() + "/" + FudaaLib.getS("Type={0}", value);
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderGIS.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderGIS.java 2011-06-06 16:32:37 UTC (rev 6274)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderGIS.java 2011-06-06 16:34:49 UTC (rev 6275)
@@ -25,9 +25,12 @@
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISDataModelAttributeAdapter;
-import org.fudaa.ctulu.gis.GISDataModelListPtAdapter;
import org.fudaa.ctulu.gis.GISGeometry;
import org.fudaa.ctulu.gis.GISVisitorDefault;
+import org.fudaa.ctulu.gis.factory.GISExportDataStoreFactory;
+import org.fudaa.ctulu.gis.gml.GMLDataStoreFactory;
+import org.fudaa.ctulu.gis.mif.MIFDataStoreFactory;
+import org.fudaa.ctulu.gis.shapefile.ShapefileDataStoreFactory;
import org.fudaa.fudaa.sig.FSigLib;
@@ -37,6 +40,33 @@
*/
public class FSigFileLoaderGIS implements FSigFileLoaderI {
+ /**
+ * Un loader pour un fichier MID/MIF.
+ */
+ public static class MIF extends FSigFileLoaderGIS {
+ public MIF() {
+ super (new MIFDataStoreFactory());
+ }
+ }
+
+ /**
+ * Un loader pour un fichier Shape.
+ */
+ public static class Shape extends FSigFileLoaderGIS {
+ public Shape() {
+ super (new ShapefileDataStoreFactory());
+ }
+ }
+
+ /**
+ * Un loader pour un fichier GML.
+ */
+ public static class GML extends FSigFileLoaderGIS {
+ public GML() {
+ super (new GMLDataStoreFactory());
+ }
+ }
+
final BuFileFilter ft_;
final FileDataStoreFactorySpi factory_;
transient FSigDataModelStoreAdapter src_;
@@ -49,6 +79,15 @@
ft_ = _ft;
factory_ = _factory;
}
+
+ /**
+ * Cr\xE9ation a partir de la seule fabrique
+ * @param _factory La fabrique.
+ */
+ public FSigFileLoaderGIS(final FileDataStoreFactorySpi _factory) {
+ factory_=_factory;
+ ft_=GISExportDataStoreFactory.buildFileFilterFor(_factory);
+ }
public FSigFileLoaderI createNew() {
return new FSigFileLoaderGIS(ft_, factory_);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-04-06 16:46:49
|
Revision: 7050
http://fudaa.svn.sourceforge.net/fudaa/?rev=7050&view=rev
Author: deniger
Date: 2012-04-06 16:46:43 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
maj translation
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigCurveModelProfile.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigCurveModelProfile.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigCurveModelProfile.java 2012-04-06 16:46:21 UTC (rev 7049)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigCurveModelProfile.java 2012-04-06 16:46:43 UTC (rev 7050)
@@ -17,9 +17,8 @@
import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
/**
- * Cette class peut \xEAtre vu comme un adapteur entre les donn\xE9es de la courbe et
- * la vue qui va les traiter.
- *
+ * Cette class peut \xEAtre vu comme un adapteur entre les donn\xE9es de la courbe et la vue qui va les traiter.
+ *
* @author Emmanuel Martin
* @version $Id$
*/
@@ -27,50 +26,52 @@
private String name_; // Nom de la courbe
private FSigGraphEditorPanel pnCurve_; // Le model \xE0 adapter
-
- public FSigCurveModelProfile(FSigGraphEditorPanel _pnCurve, String _name){
+
+ public FSigCurveModelProfile(FSigGraphEditorPanel _pnCurve, String _name) {
name_ = _name;
pnCurve_ = _pnCurve;
}
-
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#addValue(double, double, org.fudaa.ctulu.CtuluCommandContainer)
+
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#addValue(double, double, org.fudaa.ctulu.CtuluCommandContainer)
*/
public boolean addValue(double _x, double _y, CtuluCommandContainer _cmd) {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#addValue(double[], double[], org.fudaa.ctulu.CtuluCommandContainer)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#addValue(double[], double[], org.fudaa.ctulu.CtuluCommandContainer)
*/
public boolean addValue(double[] _x, double[] _y, CtuluCommandContainer _cmd) {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#deplace(int[], double, double, org.fudaa.ctulu.CtuluCommandContainer)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#deplace(int[], double, double, org.fudaa.ctulu.CtuluCommandContainer)
*/
public boolean deplace(int[] _idx, double _deltax, double _deltay, CtuluCommandContainer _cmd) {
- for (int i=0; i<_idx.length; i++)
+ for (int i = 0; i < _idx.length; i++) {
pnCurve_.setY(_idx[i], pnCurve_.getY(_idx[i]) + _deltay, _cmd);
+ }
return true;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#fillWithInfo(org.fudaa.ebli.palette.BPaletteInfo.InfoData, org.fudaa.ctulu.CtuluListSelectionInterface)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#fillWithInfo(org.fudaa.ebli.palette.BPaletteInfo.InfoData,
+ * org.fudaa.ctulu.CtuluListSelectionInterface)
*/
public void fillWithInfo(InfoData _table, CtuluListSelectionInterface pt) {
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#getNbValues()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#getNbValues()
*/
public int getNbValues() {
return pnCurve_.getNbValues();
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#getTitle()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#getTitle()
*/
public String getTitle() {
return name_;
@@ -79,144 +80,150 @@
public String getPointLabel(int _i) {
return null;
}
-
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#getX(int)
+
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#getX(int)
*/
public double getX(int _idx) {
return pnCurve_.getX(_idx);
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#getXMax()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#getXMax()
*/
public double getXMax() {
double xMax = 0;
- for(int i=0; i < pnCurve_.getNbValues() ;i++)
+ for (int i = 0; i < pnCurve_.getNbValues(); i++) {
xMax = xMax < pnCurve_.getX(i) ? pnCurve_.getX(i) : xMax;
+ }
return xMax;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#getXMin()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#getXMin()
*/
public double getXMin() {
- if(pnCurve_.getNbValues()==0)
+ if (pnCurve_.getNbValues() == 0) {
return 0;
+ }
double xMin = pnCurve_.getX(0);
- for(int i=1; i < pnCurve_.getNbValues() ;i++)
+ for (int i = 1; i < pnCurve_.getNbValues(); i++) {
xMin = xMin > pnCurve_.getX(i) ? pnCurve_.getX(i) : xMin;
+ }
return xMin;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#getY(int)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#getY(int)
*/
public double getY(int _idx) {
return pnCurve_.getY(_idx);
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#getYMax()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#getYMax()
*/
public double getYMax() {
double yMax = 0;
- for(int i=0; i < pnCurve_.getNbValues() ;i++)
+ for (int i = 0; i < pnCurve_.getNbValues(); i++) {
yMax = yMax < pnCurve_.getY(i) ? pnCurve_.getY(i) : yMax;
+ }
return yMax;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#getYMin()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#getYMin()
*/
public double getYMin() {
- if(pnCurve_.getNbValues()==0)
+ if (pnCurve_.getNbValues() == 0) {
return 0;
+ }
double yMin = pnCurve_.getY(0);
- for(int i=1; i < pnCurve_.getNbValues() ;i++)
+ for (int i = 1; i < pnCurve_.getNbValues(); i++) {
yMin = yMin > pnCurve_.getY(i) ? pnCurve_.getY(i) : yMin;
+ }
return yMin;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#isDuplicatable()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#isDuplicatable()
*/
public boolean isDuplicatable() {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#isModifiable()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#isModifiable()
*/
public boolean isModifiable() {
return true;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#isPointDrawn(int)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#isPointDrawn(int)
*/
public boolean isPointDrawn(int _i) {
return true;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#isRemovable()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#isRemovable()
*/
public boolean isRemovable() {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#isSegmentDrawn(int)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#isSegmentDrawn(int)
*/
public boolean isSegmentDrawn(int _i) {
return true;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#isTitleModifiable()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#isTitleModifiable()
*/
public boolean isTitleModifiable() {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#isXModifiable()
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#isXModifiable()
*/
public boolean isXModifiable() {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#removeValue(int, org.fudaa.ctulu.CtuluCommandContainer)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#removeValue(int, org.fudaa.ctulu.CtuluCommandContainer)
*/
public boolean removeValue(int _i, CtuluCommandContainer _cmd) {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#removeValue(int[], org.fudaa.ctulu.CtuluCommandContainer)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#removeValue(int[], org.fudaa.ctulu.CtuluCommandContainer)
*/
public boolean removeValue(int[] _i, CtuluCommandContainer _cmd) {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#setTitle(java.lang.String)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#setTitle(java.lang.String)
*/
public boolean setTitle(String name) {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#setValue(int, double, double, org.fudaa.ctulu.CtuluCommandContainer)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#setValue(int, double, double, org.fudaa.ctulu.CtuluCommandContainer)
*/
public boolean setValue(int _i, double _x, double _y, CtuluCommandContainer _cmd) {
return false;
}
- /* (non-Javadoc)
- * @see org.fudaa.ebli.courbe.EGModel#setValues(int[], double[], double[], org.fudaa.ctulu.CtuluCommandContainer)
+ /*
+ * (non-Javadoc) @see org.fudaa.ebli.courbe.EGModel#setValues(int[], double[], double[], org.fudaa.ctulu.CtuluCommandContainer)
*/
public boolean setValues(int[] _idx, double[] _x, double[] _y, CtuluCommandContainer _cmd) {
return false;
@@ -230,10 +237,20 @@
throw new UnsupportedOperationException("Not supported yet.");
}
+ @Override
+ public boolean isGenerationSourceVisible() {
+ return false;
+ }
+
public void replayData(EGGrapheModel model, Map infos, CtuluUI impl) {
throw new UnsupportedOperationException("Not supported yet.");
}
+ @Override
+ public boolean isReplayable() {
+ return false;
+ }
+
public Object savePersistSpecificDatas() {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -241,5 +258,4 @@
public void restoreFromSpecificDatas(Object data, Map infos) {
throw new UnsupportedOperationException("Not supported yet.");
}
-
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java 2012-04-06 16:46:21 UTC (rev 7049)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigLineSingleModel.java 2012-04-06 16:46:43 UTC (rev 7050)
@@ -7,7 +7,6 @@
*/
package org.fudaa.fudaa.sig;
-
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZModeleLigneBrisee;
@@ -21,9 +20,8 @@
import com.vividsolutions.jts.geom.LineString;
/**
- * Un mod\xE8le de donn\xE9es pour un calque de lignes bris\xE9es. Ce mod\xE8le ne peut contenir qu'une seule
- * ligne, de type GIS.
- *
+ * Un mod\xE8le de donn\xE9es pour un calque de lignes bris\xE9es. Ce mod\xE8le ne peut contenir qu'une seule ligne, de type GIS.
+ *
* @see org.fudaa.ebli.calque.ZModeleLigneBrisee
* @author Fred Deniger
* @version $Id$
@@ -31,32 +29,36 @@
public class FSigLineSingleModel extends ZModeleGeometryDefault implements ZModeleLigneBrisee {
LineString r_;
- Envelope env_;
boolean isClosed_;
- final GISZoneCollectionLigneBrisee geom_ = new GISZoneCollectionLigneBrisee();
+// final GISZoneCollectionLigneBrisee geom_ = new GISZoneCollectionLigneBrisee();
- private FSigLineSingleModel() {
+ public FSigLineSingleModel() {
+ super(new GISZoneCollectionLigneBrisee());
r_ = null;
- env_ = null;
}
+ @Override
+ public GISZoneCollectionLigneBrisee getGeomData() {
+ return (GISZoneCollectionLigneBrisee) geometries_;
+ }
+
/**
* @param _r
*/
public FSigLineSingleModel(final LineString _r) {
super();
setLine(_r);
-
}
public final void setLine(final LineString _r) {
- if (geom_.getNumGeometries() > 0) {
- geom_.removeGeometries(new int[] { 0 }, null);
+ if (geometries_.getNumGeometries() > 0) {
+ geometries_.removeGeometries(new int[]{0}, null);
}
r_ = _r;
- geom_.addCoordinateSequence(r_.getCoordinateSequence(), null, null);
- isClosed_ = r_.isClosed();
- env_ = r_.getEnvelopeInternal();
+ if (r_ != null) {
+ geometries_.addCoordinateSequence(r_.getCoordinateSequence(), null, null);
+ isClosed_ = r_.isClosed();
+ }
}
public boolean containsPolygone() {
@@ -71,25 +73,12 @@
return false;
}
- public void getDomaineForGeometry(final int _idxLigne, final GrBoite _target) {
- if (_target.o_ == null) {
- _target.o_ = new GrPoint();
- }
- if (_target.e_ == null) {
- _target.e_ = new GrPoint();
- }
- _target.o_.x_ = env_.getMinX();
- _target.o_.y_ = env_.getMinY();
- _target.e_.x_ = env_.getMaxX();
- _target.e_.y_ = env_.getMaxY();
- }
-
public int getNbPolyligne() {
return isClosed_ ? 0 : 1;
}
public int getNbPointForGeometry(final int _idxLigne) {
- return r_.getNumPoints();
+ return r_ == null ? 0 : r_.getNumPoints();
}
public int getNbPolygone() {
@@ -100,30 +89,12 @@
return isClosed_;
}
- public boolean point(final GrPoint _pt, final int _ligneIdx, final int _pointIdx) {
- _pt.x_ = r_.getCoordinateSequence().getX(_pointIdx);
- _pt.y_ = r_.getCoordinateSequence().getY(_pointIdx);
- _pt.z_=r_.getCoordinateSequence().getOrdinate(_pointIdx, 2);
-
- return true;
+ public void prepareExport() {
}
- public void prepareExport() {}
-
- public GISZoneCollectionLigneBrisee getGeomData() {
- return geom_;
+ public void fillWithInfo(final InfoData _d, final ZCalqueAffichageDonneesInterface _layer) {
}
- public GrBoite getDomaine() {
- return new GrBoite(new GrPoint(env_.getMinX(), env_.getMinY(), 0), new GrPoint(env_.getMaxX(), env_.getMaxY(), 0));
- }
-
- public int getNombre() {
- return 1;
- }
-
- public void fillWithInfo(final InfoData _d, final ZCalqueAffichageDonneesInterface _layer) {}
-
public boolean isGeometryReliee(int geom) {
return true;
}
@@ -131,5 +102,4 @@
public boolean isGeometryVisible(int geom) {
return true;
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-05-10 21:17:02
|
Revision: 7185
http://fudaa.svn.sourceforge.net/fudaa/?rev=7185&view=rev
Author: deniger
Date: 2012-05-10 21:16:56 +0000 (Thu, 10 May 2012)
Log Message:
-----------
maj
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.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/wizard/FSigFileLoaderRefluxRefondeResult.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java 2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/exetools/FSigInpFileParam.java 2012-05-10 21:16:56 UTC (rev 7185)
@@ -239,7 +239,7 @@
}
CtuluIOOperationSynthese ret=exporters_[numExporter].exportTo(v, ui_, outFile, null,null);
- if (ret.containsFatalError() && _prog != null) {
+ if (ret.containsSevereError() && _prog != null) {
_prog.appendDetailln(FSigLib.getS("Erreur d'\xE9criture"));
return false;
}
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 2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerExporterI.java 2012-05-10 21:16:56 UTC (rev 7185)
@@ -301,7 +301,7 @@
ana.addInfo(DodicoLib.getS("{0} semis sur {1} ont \xE9t\xE9 export\xE9s", "" + nbsemis, "" + nbsemis), -1);
synt.getAnalyze().merge(ana);
- if (synt.containsFatalError())
+ if (synt.containsSevereError())
return synt;
}
@@ -314,7 +314,7 @@
mdl[1] = mdlligdir.size() == 0 ? null : new GISDataModelMultiAdapter(mdlligdir.toArray(new GISDataModel[0]));
ana = ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[0]), mdl, _prog).getAnalyze();
synt.getAnalyze().merge(ana);
- if (synt.containsFatalError())
+ if (synt.containsSevereError())
return synt;
}
@@ -326,7 +326,7 @@
mdl[1] = null;
ana = ff.write(CtuluLibFile.appendExtensionIfNeeded(f, ff.getExtensions()[1]), mdl, _prog).getAnalyze();
synt.getAnalyze().merge(ana);
- if (synt.containsFatalError())
+ if (synt.containsSevereError())
return synt;
}
@@ -339,7 +339,7 @@
String pathname = profsOrLigneDirectrice ? f.getPath() + "_" + CtuluLib.getS("autres") : f.getPath();
ana = ff.write(CtuluLibFile.appendExtensionIfNeeded(new File(pathname), ff.getExtensions()[0]), mdl, _prog).getAnalyze();
synt.getAnalyze().merge(ana);
- if (synt.containsFatalError())
+ if (synt.containsSevereError())
return synt;
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRefluxRefondeResult.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRefluxRefondeResult.java 2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderRefluxRefondeResult.java 2012-05-10 21:16:56 UTC (rev 7185)
@@ -71,7 +71,7 @@
if (RefluxRefondeSolutionSequentielResult.isRefonde(_f)) {
CtuluIOOperationSynthese s = new RefondeQuickINPReader().read(inp, _prog);
if (s.containsMessages()) _analyze.merge(s.getAnalyze());
- if (s.containsFatalError()) return;
+ if (s.containsSevereError()) return;
final RefondeINPResult res = (RefondeINPResult) s.getSource();
g = res.getGrid();
isSeiche = res.isModuleSeiche();
@@ -80,7 +80,7 @@
CtuluIOOperationSynthese s = INPFileFormat.getInstance().getLastINPVersionImpl().readGrid(inp, _prog);
if (s.containsMessages()) _analyze.merge(s.getAnalyze());
- if (s.containsFatalError()) return;
+ if (s.containsSevereError()) return;
g = ((EfGridSource) s.getSource()).getGrid();
}
final RefluxRefondeSolutionNewReader r = new RefluxRefondeSolutionNewReader(RefluxRefondeSolutionFileFormat
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java 2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSerafin.java 2012-05-10 21:16:56 UTC (rev 7185)
@@ -56,7 +56,7 @@
final CtuluAnalyze _analyze) {
if (result_ == null) {
final CtuluIOOperationSynthese op = SerafinFileFormat.getInstance().readLast(_f, _prog);
- if (!op.containsFatalError()) {
+ if (!op.containsSevereError()) {
result_ = (SerafinInterface) op.getSource();
result_.getGrid().computeBord(_prog, _analyze);
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java 2012-05-10 21:16:29 UTC (rev 7184)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderSinusX.java 2012-05-10 21:16:56 UTC (rev 7185)
@@ -63,7 +63,7 @@
e.printStackTrace();
}
_analyze.merge(op.getAnalyze());
- if (op.containsFatalError()) {
+ if (op.containsSevereError()) {
return;
}
zones_ = (GISZone) op.getSource();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-04 18:12:49
|
Revision: 8181
http://fudaa.svn.sourceforge.net/fudaa/?rev=8181&view=rev
Author: deniger
Date: 2013-01-04 18:12:41 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVariableModifResult.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
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/FSigWizardVariableModifier.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVariableModifResult.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVariableModifResult.java 2013-01-04 18:12:19 UTC (rev 8180)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigVariableModifResult.java 2013-01-04 18:12:41 UTC (rev 8181)
@@ -10,9 +10,9 @@
import gnu.trove.TDoubleArrayList;
import gnu.trove.TIntArrayList;
-import java.util.BitSet;
import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.FastBitSet;
import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.h2d.H2dVariableProviderInterface;
import org.fudaa.dodico.h2d.type.H2dVariableType;
@@ -24,8 +24,7 @@
public class FSigVariableModifResult {
private final TIntArrayList idx_;
-
- private final BitSet idxSet_;
+ private final FastBitSet idxSet_;
private int maxIdx_;
private int minIdx_;
final int nbVar_;
@@ -49,7 +48,7 @@
* @param _set les indices a true sont consideres comme deja faits
* @param _target la cible
*/
- public FSigVariableModifResult(final int _nbVar, final BitSet _set, final H2dVariableProviderInterface _target) {
+ public FSigVariableModifResult(final int _nbVar, final FastBitSet _set, final H2dVariableProviderInterface _target) {
super();
idxSet_ = _set;
target_ = _target;
@@ -73,13 +72,13 @@
}
public void go(final CtuluCommandContainer _cmd, final H2dVariableType[] _var,
- final H2dVariableProviderInterface _target) {
+ final H2dVariableProviderInterface _target) {
if (_var.length != nbVar_) {
throw new IllegalArgumentException("bad size for var array");
}
final int[] idx = idx_.toNativeArray();
for (int i = 0; i < nbVar_; i++) {
- _target.getModifiableModel(_var[i]).set( idx, this.varRes_[i].toNativeArray(), _cmd);
+ _target.getModifiableModel(_var[i]).set(idx, this.varRes_[i].toNativeArray(), _cmd);
}
}
@@ -139,6 +138,4 @@
varRes_[i].add(_values[i]);
}
}
-
-
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java 2013-01-04 18:12:19 UTC (rev 8180)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java 2013-01-04 18:12:41 UTC (rev 8181)
@@ -47,7 +47,6 @@
public class FSigLayerPointPersistence extends BCalquePersistenceSingle {
public FSigLayerPointPersistence() {
-
}
@Override
@@ -64,9 +63,9 @@
*/
@Override
public BCalqueSaverInterface saveIn(final BCalque _cqToSave, final CtuluArkSaver _saver,
- final String _parentDirEntry, final String _parentDirIndice) {
+ final String _parentDirEntry, final String _parentDirIndice) {
final BCalqueSaverSingle res = (BCalqueSaverSingle) super.saveIn(_cqToSave, _saver, _parentDirEntry,
- _parentDirIndice);
+ _parentDirIndice);
final String entry = getEntryBase(_cqToSave, _parentDirEntry, res.getId()) + ".gml";
try {
_saver.startEntry(entry);
@@ -100,25 +99,28 @@
@Override
public String restoreFrom(final CtuluArkLoader _loader, final BCalqueSaverTargetInterface _parentPanel,
- final BCalque _parentCalque, final String _parentDirEntry, final String _entryName,
- final ProgressionInterface _proj) {
- if (isNoAddSigLayer(_loader)) { return null; }
+ final BCalque _parentCalque, final String _parentDirEntry, final String _entryName,
+ final ProgressionInterface _proj) {
+ if (isNoAddSigLayer(_loader)) {
+ return null;
+ }
return super.restoreFrom(_loader, _parentPanel, _parentCalque, _parentDirEntry, _entryName, _proj);
}
@Override
protected boolean restoreFromSpecific(final BCalqueSaverInterface _saver, final CtuluArkLoader _loader,
- final BCalqueSaverTargetInterface _parentPanel, final BCalque _parentCalque, final String _parentDirEntry,
- final String _entryName, final ProgressionInterface _proj) {
+ final BCalqueSaverTargetInterface _parentPanel, final BCalque _parentCalque, final String _parentDirEntry,
+ final String _entryName, final ProgressionInterface _proj) {
boolean r = false;
try {
final GMLInputTemplate input = new GMLInputTemplate();
final InputStream inputStream = getGMLInputStream(_loader, _parentDirEntry, _entryName);
- if (inputStream == null) { return true; }
+ if (inputStream == null) {
+ return true;
+ }
input.load(new InputStreamReader(inputStream));
final GMLReader gmlReader = new GMLReader();
-
gmlReader.setInputTemplate(input);
final FeatureCollection feature = gmlReader.open(getGMLInputStream(_loader, _parentDirEntry, _entryName));
_saver.getUI().put(getGeomId(), createCollection(GISDataModelFeatureAdapter.load(feature)));
@@ -131,19 +133,21 @@
}
private InputStream getGMLInputStream(final CtuluArkLoader _loader, final String _parentDirEntry,
- final String _entryName) {
+ final String _entryName) {
return _loader.getReader(_parentDirEntry, _entryName + ".gml");
}
protected BCalque addInParent(final FSigLayerGroup _gr, final BCalqueSaverInterface _cqName,
- final GISZoneCollection _collection) {
+ final GISZoneCollection _collection) {
return _gr.addPointLayerAct(_cqName.getUI().getTitle(), (GISZoneCollectionPoint) _collection, null);
}
@Override
protected BCalque findCalque(final BCalqueSaverInterface _cqName, final BCalqueSaverTargetInterface _pn,
- final BCalque _parent) {
- if (!(_parent instanceof ZCalqueEditionGroup)) { return super.findCalque(_cqName, _pn, _parent); }
+ final BCalque _parent) {
+ if (!(_parent instanceof ZCalqueEditionGroup)) {
+ return super.findCalque(_cqName, _pn, _parent);
+ }
final FSigLayerGroup grGis = (FSigLayerGroup) _parent;
final GISZoneCollection zone = (GISZoneCollection) _cqName.getUI().get(FSigLayerPointPersistence.getGeomId());
verifyGISCollection(grGis, zone);
@@ -152,7 +156,9 @@
}
public static boolean isNoAddSigLayer(final CtuluArkLoader _loader) {
- if (BCalquePersistenceGroupe.isNoAddLayer(_loader)) { return true; }
+ if (BCalquePersistenceGroupe.isNoAddLayer(_loader)) {
+ return true;
+ }
return CtuluLibString.toBoolean(_loader.getOption(FudaaSaveLib.getNoGeogLayerOpt()));
}
@@ -174,5 +180,4 @@
public static String getGeomId() {
return "sigLayer.geom";
}
-
}
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 2013-01-04 18:12:19 UTC (rev 8180)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java 2013-01-04 18:12:41 UTC (rev 8181)
@@ -10,7 +10,6 @@
import gnu.trove.TIntArrayList;
import java.util.ArrayList;
-import java.util.BitSet;
import java.util.List;
import javax.swing.DefaultListModel;
@@ -46,6 +45,7 @@
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
+import org.fudaa.ctulu.FastBitSet;
/**
* @author Fred Deniger
@@ -164,12 +164,12 @@
MapperResult userMappingDefined;
- public void process(final CtuluAnalyze _analyse, final BitSet _set, final ProgressionInterface _prog) {
+ public void process(final CtuluAnalyze _analyse, final FastBitSet _set, final ProgressionInterface _prog) {
stop_ = false;
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;
+ final FastBitSet objectSet = _set == null ? new FastBitSet(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"));
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java 2013-01-04 18:12:19 UTC (rev 8180)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java 2013-01-04 18:12:41 UTC (rev 8181)
@@ -18,7 +18,6 @@
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.BitSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -82,73 +81,47 @@
import com.memoire.bu.BuWizardDialog;
import com.memoire.bu.BuWizardTask;
import com.memoire.fu.FuLog;
+import org.fudaa.ctulu.FastBitSet;
/**
* Un wizard pour la modification d'une variable.
+ *
* @author Fred Deniger
* @version $Id$
*/
public class FSigWizardVariableModifier extends BuWizardTask implements TreeSelectionListener {
BuTextField ftInterInRing_;
-
BuTextField ftInterFromProject_;
-
BuCheckBox cbInterp_;
-
BuCheckBox cbInterpLines_;
-
BuCheckBox cbInterInRing_;
-
BuCheckBox cbModifySelected_;
-
BuCheckBox cbUseFiles_;
-
BuCheckBox cbInterIgnorePt_;
-
BuCheckBox cbUseLayer_;
-
BuCheckBox cbZone_;
-
BuWizardDialog dialog_;
-
/**
* Le groupe contenant les calques de polylignes.
*/
final ZCalqueEditionGroup gisLayer_;
-
final CtuluUI impl_;
-
FSigVariableInterpolator interpolator_;
-
BuLabel lbCibleError_;
-
JLabel lbLayersError_;
-
BArbreCalqueModel model_;
-
GISAttributeInterface[] nullAtt_ = new GISAttributeInterface[0];
-
JPanel pnCible_;
-
FSigFileLoaderPanel pnFiles_;
-
JPanel pnInterInfo_;
-
BuPanel pnInterMethode_;
-
JPanel pnInterp_;
-
JPanel pnLayers_;
-
JPanel pnSelectType_;
-
DefaultListModel selectedLayer_;
-
boolean selectedLayerEmpty_;
-
- BitSet selectedPt_;
-
+ FastBitSet selectedPt_;
JTable table_;
/**
@@ -159,7 +132,7 @@
* @param _selectedLay le calque selectionne
*/
public FSigWizardVariableModifier(final ZCalqueEditionGroup _layer, final H2dVariableProviderInterface _target,
- final CtuluUI _impl, final CtuluCommandContainer _cmd, final BCalque _selectedLay) {
+ final CtuluUI _impl, final CtuluCommandContainer _cmd, final BCalque _selectedLay) {
super();
interpolator_ = new FSigVariableInterpolator(_target, _cmd);
gisLayer_ = _layer;
@@ -174,7 +147,7 @@
cbInterIgnorePt_.setToolTipText(FSigLib.getS("Si activ\xE9, les points situ\xE9s \xE0 l'ext\xE9rieur de l'enveloppe du projet seront ignor\xE9s"));
final BuLabel lb = new BuLabel(FSigLib.getS("Distance maximale:"));
lb
- .setToolTipText(createHtmlString("Permet de pr\xE9ciser la distance maximale<br>entre l'enveloppe du projet et les points sources \xE0 utiliser"));
+ .setToolTipText(createHtmlString("Permet de pr\xE9ciser la distance maximale<br>entre l'enveloppe du projet et les points sources \xE0 utiliser"));
ftInterFromProject_ = BuTextField.createDoubleField();
ftInterFromProject_.setColumns(8);
@@ -187,6 +160,7 @@
* @version $Id$
*/
static final class VariableCellTextRenderer extends CtuluCellTextRenderer {
+
@Override
protected void setValue(Object _value) {
if (_value instanceof GISAttributeInterface) {
@@ -200,9 +174,7 @@
protected class InterpolationPanel extends BuPanel {
final BuLabel lb_;
-
final BuCheckBox cb_;
-
final BuTextField tf_;
/**
@@ -223,7 +195,6 @@
pn.setBorder(BuBorders.EMPTY2500);
add(pn);
cb_.addItemListener(new ItemListener() {
-
@Override
public void itemStateChanged(final ItemEvent _e) {
updateIsEnable();
@@ -252,13 +223,12 @@
}
}
}
-
}
protected InterpolationPanel buildInterpolationInZonePanel() {
cbInterInRing_ = new BuCheckBox(FSigLib
- .getS("Ne modifier que les points situ\xE9s \xE0 l'int\xE9rieur de l'enveloppe des donn\xE9es sources"));
+ .getS("Ne modifier que les points situ\xE9s \xE0 l'int\xE9rieur de l'enveloppe des donn\xE9es sources"));
ftInterInRing_ = BuTextField.createDoubleField();
ftInterInRing_.setValue(CtuluLib.getDouble(1E-3));
ftInterInRing_.setColumns(8);
@@ -266,7 +236,7 @@
ftInterInRing_.setToolTipText(FSigLib.getS("Entrer la distance en m\xE8tres"));
final BuLabel lb = new BuLabel(FSigLib.getS("Distance maximale:"));
lb.setToolTipText(createHtmlString("Permet de pr\xE9ciser la distance maximale<br>"
- + "entre l'enveloppe et les points \xE0 modifier par l'interpolation"));
+ + "entre l'enveloppe et les points \xE0 modifier par l'interpolation"));
return new InterpolationPanel(cbInterInRing_, lb, ftInterInRing_);
}
@@ -340,7 +310,6 @@
pnBut.setLayout(new BuButtonLayout(0, SwingConstants.RIGHT));
final BuButton btPrev = new BuButton(FSigLib.getS("Pr\xE9visualiser"));
btPrev.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(final ActionEvent _e) {
buildPreview();
@@ -374,30 +343,29 @@
protected void buildPnFiles() {
if (pnFiles_ == null) {
pnFiles_ = new FSigFileLoaderPanel(interpolator_.getAttributes(), impl_, interpolator_.getTarget().getGrid()
- .getExtRings());
+ .getExtRings());
}
}
-
BuLabel warn_;
protected void buildPnInterpol() {
if (pnInterp_ == null) {
pnInterp_ = new BuPanel();
// pnInterInfo_ = interpolator_.getData().getInfoPanel();
- pnInterInfo_=new FSigWizardImportHelper.InfoPanel();
- ((FSigWizardImportHelper.InfoPanel)pnInterInfo_).setSrc(interpolator_.getData());
+ pnInterInfo_ = new FSigWizardImportHelper.InfoPanel();
+ ((FSigWizardImportHelper.InfoPanel) pnInterInfo_).setSrc(interpolator_.getData());
final BuPanel bottom = new BuPanel();
bottom.setLayout(new BuVerticalLayout());
cbZone_ = new BuCheckBox(FSigLib.getS("Initialiser \xE0 partir des zones"));
cbZone_.setToolTipText(createHtmlString("Si activ\xE9, tous les points appartenant \xE0 une zone (ligne ferm\xE9e) "
- + "seront intialis\xE9s avec les valeurs de cette zone", "Cette action est prioritaire sur l'interpolation"));
+ + "seront intialis\xE9s avec les valeurs de cette zone", "Cette action est prioritaire sur l'interpolation"));
cbInterp_ = new BuCheckBox(FSigLib.getS("Interpoler \xE0 partir des points"));
cbInterp_.setToolTipText(createHtmlString(
- "Si activ\xE9, les valeurs seront interpol\xE9es \xE0 partir des donn\xE9es g\xE9ographiques",
- "Les donn\xE9es d\xE9j\xE0 modifi\xE9es par les zones ne seront pas prise en compte"));
+ "Si activ\xE9, les valeurs seront interpol\xE9es \xE0 partir des donn\xE9es g\xE9ographiques",
+ "Les donn\xE9es d\xE9j\xE0 modifi\xE9es par les zones ne seront pas prise en compte"));
cbInterpLines_ = new BuCheckBox(FSigLib.getS("Utiliser les sommets des lignes pour l'interpolation"));
cbInterpLines_.setToolTipText(FSigLib
- .getS("Si activ\xE9, les sommets des lignes (ferm\xE9es ou non) seront utilis\xE9es pour l'interpolation"));
+ .getS("Si activ\xE9, les sommets des lignes (ferm\xE9es ou non) seront utilis\xE9es pour l'interpolation"));
cbZone_.setSelected(true);
cbInterp_.setSelected(false);
cbInterpLines_.setSelected(false);
@@ -413,7 +381,7 @@
pnInterMethode_ = new BuPanel();
pnInterMethode_.setBorder(BorderFactory.createCompoundBorder(BuBorders.EMPTY0505, BorderFactory
- .createTitledBorder(FSigLib.getS("Interpolation"))));
+ .createTitledBorder(FSigLib.getS("Interpolation"))));
pnInterMethode_.setLayout(new BuVerticalLayout());
pnInterMethode_.add(cbInterpLines_);
pnInterMethode_.add(buildInterpolationInZonePanel());
@@ -424,14 +392,12 @@
pnInterp_.add(bottom, BuBorderLayout.CENTER);
pnInterp_.add(pnInterInfo_, BuBorderLayout.NORTH);
cbInterp_.addItemListener(new ItemListener() {
-
@Override
public void itemStateChanged(final ItemEvent _e) {
setInterpolationEnable(cbInterp_.isEnabled() && cbInterp_.isSelected());
}
});
cbInterp_.addPropertyChangeListener("enable", new PropertyChangeListener() {
-
@Override
public void propertyChange(final PropertyChangeEvent _evt) {
setInterpolationEnable(cbInterp_.isEnabled() && cbInterp_.isSelected());
@@ -440,8 +406,8 @@
} else {
pnInterp_.remove(pnInterInfo_);
// pnInterInfo_ = interpolator_.getData().getInfoPanel();
- pnInterInfo_=new FSigWizardImportHelper.InfoPanel();
- ((FSigWizardImportHelper.InfoPanel)pnInterInfo_).setSrc(interpolator_.getData());
+ pnInterInfo_ = new FSigWizardImportHelper.InfoPanel();
+ ((FSigWizardImportHelper.InfoPanel) pnInterInfo_).setSrc(interpolator_.getData());
pnInterp_.add(pnInterInfo_, BuBorderLayout.NORTH);
}
final FSigGeomSrcData data = interpolator_.getData();
@@ -478,7 +444,6 @@
cbUseLayer_ = new BuCheckBox(FSigLib.getS("Modifier \xE0 partir de calques"));
cbUseFiles_ = new BuCheckBox(FSigLib.getS("Modifier \xE0 partir de fichiers"));
final ItemListener listener = new ItemListener() {
-
@Override
public void itemStateChanged(ItemEvent _e) {
interpolator_.setData(null);
@@ -503,7 +468,6 @@
protected void buildPreview(final boolean _showPreview) {
final FSigLoaderPreviewer prev = new FSigLoaderPreviewer() {
-
@Override
public FSigGeomSrcData loadData(final ProgressionInterface _prog) {
buildMapperResult(_prog);
@@ -596,9 +560,9 @@
if (_cqToScan instanceof ZCalqueEditionGroup) {
res = ((ZCalqueEditionGroup) _cqToScan).getAttributes();
} else if (_cqToScan instanceof ZCalqueAffichageDonneesInterface
- && ((ZCalqueAffichageDonneesInterface) _cqToScan).modeleDonnees() instanceof ZModeleGeometry) {
+ && ((ZCalqueAffichageDonneesInterface) _cqToScan).modeleDonnees() instanceof ZModeleGeometry) {
res = ((ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) _cqToScan).modeleDonnees()).getGeomData()
- .getAttributes();
+ .getAttributes();
}
return res == null ? nullAtt_ : res;
}
@@ -618,7 +582,6 @@
final FSigVarAttrMapperTableModel model = interpolator_.getAttModel();
if (!model.equals(table_.getModel())) {
model.addTableModelListener(new TableModelListener() {
-
@Override
public void tableChanged(final TableModelEvent _e) {
updateCibleState();
@@ -635,7 +598,7 @@
return;
}
cbInterpLines_.setEnabled(_b && interpolator_.getData().getNbPolygones() > 0
- || interpolator_.getData().getNbPolylignes() > 0);
+ || interpolator_.getData().getNbPolylignes() > 0);
for (int i = pnInterMethode_.getComponentCount() - 1; i >= 0; i--) {
pnInterMethode_.getComponent(i).setEnabled(_b);
}
@@ -664,7 +627,7 @@
protected void updateCibleState() {
if (lbCibleError_ != null) {
lbCibleError_.setText(interpolator_.getAttModel().isAttributeUsed() ? CtuluLibString.EMPTY_STRING : FSigLib
- .getS("Aucune variable cible ne sera modifi\xE9e"));
+ .getS("Aucune variable cible ne sera modifi\xE9e"));
}
}
@@ -705,24 +668,22 @@
interpolator_.maxDistanceToIgnore_ = v == null ? 1E-10 : ((Double) v).doubleValue();
if (FuLog.isTrace()) {
FuLog.trace(getClass().getName() + " max distance zone " + interpolator_.interpolationInZone_ + ""
- + interpolator_.maxDistanceIntZone_);
+ + interpolator_.maxDistanceIntZone_);
FuLog.trace(getClass().getName() + " max distance ignore" + interpolator_.ignorePtExtern_ + ": "
- + interpolator_.maxDistanceIntZone_);
+ + interpolator_.maxDistanceIntZone_);
}
final CtuluTaskDelegate task = impl_.createTask(FSigLib.getS("Interpolation"));
task.start(new Runnable() {
-
@Override
public void run() {
final CtuluAnalyze analyze = new CtuluAnalyze();
- BitSet set = null;
+ FastBitSet set = null;
if (cbModifySelected_.isEnabled() && cbModifySelected_.isSelected()) {
set = selectedPt_;
}
interpolator_.process(analyze, set, task.getStateReceiver());
SwingUtilities.invokeLater(new Runnable() {
-
@Override
public void run() {
if (analyze.containsErrors()) {
@@ -788,31 +749,31 @@
public String getStepText() {
final StringBuffer r = new StringBuffer();
switch (current_) {
- case 0:
- r.append(FSigLib.getS("Choisir le type de la source: fichiers ou calques g\xE9ographiques."));
- break;
- case 1:
- if (cbUseLayer_.isSelected()) {
- r.append(FSigLib.getS("Choisir les calques g\xE9ographiques."));
- r.append(CtuluLibString.LINE_SEP).append(
- FSigLib.getS("Utiliser les touches 'Ctrl' et/ou 'Maj' pour s\xE9lectionner plusieurs calques."));
- } else {
- r.append(FSigLib.getS("Choisir les fichiers \xE0 utiliser."));
- r.append(CtuluLibString.LINE_SEP).append(FSigWizardImportHelper.getFormatExtHelp()).append(
- CtuluLibString.LINE_SEP).append(FSigWizardImportHelper.getInsertOrderHelp());
+ case 0:
+ r.append(FSigLib.getS("Choisir le type de la source: fichiers ou calques g\xE9ographiques."));
+ break;
+ case 1:
+ if (cbUseLayer_.isSelected()) {
+ r.append(FSigLib.getS("Choisir les calques g\xE9ographiques."));
+ r.append(CtuluLibString.LINE_SEP).append(
+ FSigLib.getS("Utiliser les touches 'Ctrl' et/ou 'Maj' pour s\xE9lectionner plusieurs calques."));
+ } else {
+ r.append(FSigLib.getS("Choisir les fichiers \xE0 utiliser."));
+ r.append(CtuluLibString.LINE_SEP).append(FSigWizardImportHelper.getFormatExtHelp()).append(
+ CtuluLibString.LINE_SEP).append(FSigWizardImportHelper.getInsertOrderHelp());
- }
- break;
- case 2:
- r.append(FSigLib.getS("D\xE9finir les variables \xE0 modifier"));
- r.append(CtuluLibString.LINE_SEP).append(
- FSigLib.getS("Si la s\xE9lection du calque actif est non vide, il est possible de ne modifier que les objets s\xE9lectionn\xE9s"));
- break;
- case 3:
- r.append(FSigLib.getS("Pr\xE9ciser la m\xE9thode d'interpolation"));
- break;
- default:
- break;
+ }
+ break;
+ case 2:
+ r.append(FSigLib.getS("D\xE9finir les variables \xE0 modifier"));
+ r.append(CtuluLibString.LINE_SEP).append(
+ FSigLib.getS("Si la s\xE9lection du calque actif est non vide, il est possible de ne modifier que les objets s\xE9lectionn\xE9s"));
+ break;
+ case 3:
+ r.append(FSigLib.getS("Pr\xE9ciser la m\xE9thode d'interpolation"));
+ break;
+ default:
+ break;
}
return r.toString();
}
@@ -820,16 +781,16 @@
@Override
public String getStepTitle() {
switch (current_) {
- case 0:
- return FSigLib.getS("Choix du type de source");
- case 1:
- return FSigLib.getS("Source: s\xE9lection");
- case 2:
- return FSigLib.getS("D\xE9finition de la cible");
- case 3:
- return FSigLib.getS("M\xE9thodes d'interpolation");
- default:
- return CtuluLibString.EMPTY_STRING;
+ case 0:
+ return FSigLib.getS("Choix du type de source");
+ case 1:
+ return FSigLib.getS("Source: s\xE9lection");
+ case 2:
+ return FSigLib.getS("D\xE9finition de la cible");
+ case 3:
+ return FSigLib.getS("M\xE9thodes d'interpolation");
+ default:
+ return CtuluLibString.EMPTY_STRING;
}
}
@@ -872,5 +833,4 @@
public void valueChanged(final TreeSelectionEvent _e) {
filterSelectedLayer();
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-23 21:45:38
|
Revision: 8247
http://fudaa.svn.sourceforge.net/fudaa/?rev=8247&view=rev
Author: deniger
Date: 2013-01-23 21:45:29 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java
Added Paths:
-----------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigLoadResultToAtomicProcess.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java 2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java 2013-01-23 21:45:29 UTC (rev 8247)
@@ -53,7 +53,7 @@
/**
* Une implementation d'un groupe de calques GIS. Il peut contenir des calques SIG points ou polylignes, avec attributs.
- *
+ *
* @author Fred Deniger
* @version $Id$
*/
@@ -64,6 +64,7 @@
* @version $Id$
*/
static final class CommandForLayerCreation implements CtuluCommand {
+
private final BCalque parent_;
private final ZCalqueAffichageDonnees la_;
@@ -91,16 +92,17 @@
* @author fred deniger
* @version $Id$
*/
- static final class NewNamePanel extends CtuluDialogPanel {
+ public static final class NewNamePanel extends CtuluDialogPanel {
+
/**
- *
+ *
*/
private final BuTextField ft_;
/**
* @param _ft
*/
- NewNamePanel(final BuTextField _ft) {
+ public NewNamePanel(final BuTextField _ft) {
ft_ = _ft;
}
@@ -114,35 +116,26 @@
return true;
}
}
-
int grIdx_;
-
EbliActionInterface actionAddGroup_;
-
- protected EbliActionInterface actionAddPoint_;
-
- protected EbliActionInterface actionAddPoly_;
-
+ protected EbliActionInterface actionAddPoint_;
+ protected EbliActionInterface actionAddPoly_;
EbliActionInterface actionModifyAtt_;
-
transient FSigAttibuteTypeManager att_;
-
GISAttributeInterface[] attributes_;
-
// final boolean canAddGroup_;
-
protected transient final FSigVisuPanel visu_;
FSigLayerGroup(final FSigVisuPanel _impl, final EbliActionInterface _actPoint, final EbliActionInterface _actPoly,
- final EbliActionInterface _modifyAttributes) {
+ final EbliActionInterface _modifyAttributes) {
// canAddGroup_ = false;
visu_ = _impl;
att_ = visu_.getAttributeMng();
actionAddPoly_ = _actPoly;
actionAddPoint_ = _actPoint;
actionModifyAtt_ = _modifyAttributes;
- setActions(new EbliActionInterface[] { actionAddPoly_, actionAddPoint_, null, actionModifyAtt_, null,
- visu_.getEditor().getExportAction(), visu_.getEditor().getImportAction() });
+ setActions(new EbliActionInterface[]{actionAddPoly_, actionAddPoint_, null, actionModifyAtt_, null,
+ visu_.getEditor().getExportAction(), visu_.getEditor().getImportAction()});
}
/**
@@ -160,7 +153,7 @@
buildAddPoint();
buildAddPoly();
buildModifyAtt();
- setActions(new EbliActionInterface[] { actionAddGroup_, null, visu_.getEditor().getExportAction() });
+ setActions(new EbliActionInterface[]{actionAddGroup_, null, visu_.getEditor().getExportAction()});
att_ = visu_.getAttributeMng();
attributes_ = _att;
}
@@ -170,7 +163,7 @@
}
public FSigLayerGroup addGroupAct(final String _title, final BCalque _parent, final boolean _enPremier,
- final GISAttributeInterface[] _att) {
+ final GISAttributeInterface[] _att) {
/*
* if (!canAddGroup_) { return null; }
*/
@@ -198,7 +191,6 @@
visu_.getEditor().updatePalette();
}
-
/**
* Pour le titre propose par d\xE9faut d'un calque de lignes bris\xE9es.
*/
@@ -210,7 +202,7 @@
protected String askForName(final String _title, final boolean _poly) {
final BuTextField ft = new BuTextField(CtuluLib.getS("Nouveau")
- + CtuluLibString.getEspaceString(_poly ? idxPoly_ : idxPt_));
+ + CtuluLibString.getEspaceString(_poly ? idxPoly_ : idxPt_));
ft.setColumns(12);
final CtuluDialogPanel pn = new NewNamePanel(ft);
pn.addLabel(BuResource.BU.getString("Nom"));
@@ -243,14 +235,18 @@
}
}
+ protected void setAttributes(GISAttributeInterface[] attributes_) {
+ this.attributes_ = attributes_;
+ }
+
protected void buildModifyAtt() {
if (actionModifyAtt_ == null) {
actionModifyAtt_ = new FSigLayerAction.ModifyAttributeAction(visu_.getArbreCalqueModel());
}
}
- private void finishActionCreation(final BCalque _parent, final CtuluCommandContainer _cmd,
- final ZCalqueAffichageDonnees _la, final boolean _addCancel) {
+ protected void finishActionCreation(final BCalque _parent, final CtuluCommandContainer _cmd,
+ final ZCalqueAffichageDonnees _la, final boolean _addCancel) {
final List action = new ArrayList(5);
action.addAll(Arrays.asList(visu_.getEditor().getEditAction()));
action.add(visu_.getEditor().getActionDelete());
@@ -276,12 +272,12 @@
@Override
public ZCalqueLigneBrisee addLigneBriseeLayerAct(final String _title, final GISZoneCollectionLigneBrisee _zone,
- final CtuluCommandContainer _cmd) {
+ final CtuluCommandContainer _cmd) {
return addLigneBriseeLayerAct(_title, new ZModeleLigneBriseeEditable(_zone), _cmd);
}
public ZCalqueLigneBrisee addLigneBriseeLayerAct(final String _title, final ZModeleLigneBriseeEditable _model,
- final CtuluCommandContainer _cmd) {
+ final CtuluCommandContainer _cmd) {
final ZCalqueLigneBriseeEditable la = new FSigLayerLineEditable(_model, visu_.getEditor());
la.setName(BGroupeCalque.findUniqueChildName(this, "poly"));
la.setTitle(_title);
@@ -295,12 +291,12 @@
@Override
public ZCalquePointEditable addPointLayerAct(final String _title, final GISZoneCollectionPoint _zone,
- final CtuluCommandContainer _cmd) {
+ final CtuluCommandContainer _cmd) {
return addPointLayerAct(_title, new ZModelePointEditable(_zone), _cmd);
}
public ZCalquePointEditable addPointLayerAct(final String _title, final ZModelePointEditable _modele,
- final CtuluCommandContainer _cmd) {
+ final CtuluCommandContainer _cmd) {
final FSigLayerPointEditable la = new FSigLayerPointEditable(_modele, visu_.getEditor());
la.setName(BGroupeCalque.findUniqueChildName(this, "point"));
la.setTitle(_title);
@@ -337,7 +333,6 @@
basicDetruire(_c);
if (idx >= 0) {
getCmdMng().addCmd(new CtuluCommand() {
-
@Override
public void redo() {
FSigLayerGroup.this.basicDetruire(_c);
@@ -348,7 +343,6 @@
FSigLayerGroup.this.add(_c, idx);
}
-
});
}
@@ -365,7 +359,6 @@
/*
* public final boolean isCanAddGroup() { return canAddGroup_; }
*/
-
@Override
public boolean isTitleModifiable() {
return true;
@@ -377,7 +370,9 @@
}
public static void editFor(final FSigLayerGroup _layer) {
- if (_layer == null) { return; }
+ if (_layer == null) {
+ return;
+ }
final FSigAttributeTableModel model = new FSigAttributeTableModel(_layer.getAttributes(), true);
final CtuluListEditorPanel panel = model.buildEditor();
final CtuluDialogPanel pn = new CtuluDialogPanel();
@@ -388,9 +383,10 @@
final BCalque[] cq = _layer.getCalques();
final GISAttributeInterface[] att = model.getAttributes();
final Map newName = model.getRenamedAttribute();
- if (Arrays.equals(att, _layer.attributes_) && newName.size() == 0) { return; }
+ if (Arrays.equals(att, _layer.attributes_) && newName.size() == 0) {
+ return;
+ }
final CtuluCommandComposite cmp = new CtuluCommandComposite() {
-
@Override
protected void actionToDoAfterUndoOrRedo() {
_layer.visu_.getArbreCalqueModel().fireObservableChanged();
@@ -404,7 +400,7 @@
};
for (int i = 0; i < cq.length; i++) {
if (cq[i] instanceof ZCalqueAffichageDonneesInterface
- && ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees() instanceof ZModeleGeometry) {
+ && ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees() instanceof ZModeleGeometry) {
final ZModeleGeometry donnees = (ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees();
donnees.getGeomData().setAttributes(att, cmp);
}
@@ -412,7 +408,6 @@
final GISAttributeInterface[] old = _layer.attributes_;
_layer.attributes_ = att;
cmp.addCmd(new CtuluCommand() {
-
@Override
public void redo() {
_layer.attributes_ = att;
@@ -424,14 +419,12 @@
_layer.attributes_ = old;
}
-
});
final boolean changed = FSigAttributeTableModel.rename(newName);
if (changed) {
cmp.addCmd(new CtuluCommand() {
-
@Override
public void redo() {
FSigAttributeTableModel.rename(newName);
@@ -442,7 +435,6 @@
public void undo() {
FSigAttributeTableModel.rename(newName);
}
-
});
}
if (cmp.getNbCmd() > 0) {
@@ -460,11 +452,10 @@
/**
* On autorise la modification du manager d'attribut
- *
+ *
* @param _att the att to set
*/
public void setAtt(FSigAttibuteTypeManager _att) {
att_ = _att;
}
-
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java 2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerLineEditable.java 2013-01-23 21:45:29 UTC (rev 8247)
@@ -30,5 +30,6 @@
public BCalquePersistenceInterface getPersistenceMng() {
return new FSigLayerLinePersistence();
}
+
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java 2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigDataModelStoreAdapter.java 2013-01-23 21:45:29 UTC (rev 8247)
@@ -45,13 +45,9 @@
GISAttributeInterface[] atts_;
Object[][] cacheAtt_;
-
final FeatureType features_;
-
Geometry[] geoms_;
-
int[] idxInSrc_;
-
int nbGeom_ = -1;
final FeatureSource src_;
@@ -65,15 +61,14 @@
features_ = src_.getSchema();
updateNumGeom(_progress);
}
-
+
@Override
public GISDataModel createTranslate(GISPoint xyToAdd) {
- if(xyToAdd==null){
+ if (xyToAdd == null) {
return this;
}
return new GisDataModelTranslated(this, xyToAdd);
}
-
/**
* @param _factory l'usine de dataStore
@@ -82,7 +77,7 @@
* @throws IOException
*/
public FSigDataModelStoreAdapter(final FileDataStoreFactorySpi _factory, final File _f,
- final ProgressionInterface _progress) throws IOException {
+ final ProgressionInterface _progress) throws IOException {
final DataStore dataStore = _factory.createDataStore(_f.toURI().toURL());
final String[] name = dataStore.getTypeNames();
if (name == null || name.length == 0) {
@@ -186,7 +181,6 @@
* 0; i--) { r[i] = feature.getAttribute(idxInSrc_[i]); } return r; } } catch (final Exception e) { if
* (FuLog.isTrace()) FuLog.warning(e); } finally { if (it != null) it.close(); } return null; }
*/
-
protected void replacePolygonWithLine(final int _i) {
geoms_[_i] = ((Polygon) geoms_[_i]).getExteriorRing();
}
@@ -426,5 +420,4 @@
}
}
-
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java 2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoadResult.java 2013-01-23 21:45:29 UTC (rev 8247)
@@ -22,36 +22,49 @@
import org.fudaa.fudaa.sig.FSigGeomSrcData;
/**
- * Une classe contenant des objets GIS import\xE9s depuis un ou plusieurs fichiers contenant des
- * informations GIS. Cette classe est charg\xE9e par l'interface de chargement
- * {@link FSigFileLoaderI}, qui peut \xEAtre appel\xE9e plusieurs fois de facon iterative.
- *
+ * Une classe contenant des objets GIS import\xE9s depuis un ou plusieurs fichiers contenant des informations GIS. Cette classe est charg\xE9e par
+ * l'interface de chargement {@link FSigFileLoaderI}, qui peut \xEAtre appel\xE9e plusieurs fois de facon iterative.
+ *
* @author Fred Deniger
* @version $Id: FSigFileLoadResult.java,v 1.1.6.2 2008-04-01 17:11:49 bmarchan Exp $
*/
public class FSigFileLoadResult {
private boolean first_ = true;
-
public Set<GISAttributeInterface> allAttribute_ = new HashSet<GISAttributeInterface>();
public Set<GISAttributeInterface> attribute_ = new HashSet<GISAttributeInterface>();
-
- /** La somme des points contenus dans tous les mod\xE8les de points */
+ /**
+ * La somme des points contenus dans tous les mod\xE8les de points
+ */
public int nbPoint_;
- /** La somme des points contenus dans tous les mod\xE8les (points, polylignes, polygones, etc.) */
+ /**
+ * La somme des points contenus dans tous les mod\xE8les (points, polylignes, polygones, etc.)
+ */
public int nbPointTotal_;
- /** La somme des polygones contenus dans tous les mod\xE8les de polygones */
+ /**
+ * La somme des polygones contenus dans tous les mod\xE8les de polygones
+ */
public int nbPolygones_;
- /** La somme des poylignes contenus dans tous les mod\xE8les de polylignes */
+ /**
+ * La somme des poylignes contenus dans tous les mod\xE8les de polylignes
+ */
public int nbPolylignes_;
- /** La liste des mod\xE8les {@link GISDataModel} de polylignes */
+ /**
+ * La liste des mod\xE8les {@link GISDataModel} de polylignes
+ */
public List<GISDataModel> ligneModel_ = new ArrayList<GISDataModel>();
- /** La liste des mod\xE8les {@link GISDataModel} de points */
+ /**
+ * La liste des mod\xE8les {@link GISDataModel} de points
+ */
public List<GISDataModel> pointModel_ = new ArrayList<GISDataModel>();
- /** La liste des mod\xE8les {@link GISDataModel} de polygones */
+ /**
+ * La liste des mod\xE8les {@link GISDataModel} de polygones
+ */
public List<GISDataModel> polygoneModel_ = new ArrayList<GISDataModel>();
- /** La liste des mod\xE8les {@link GISDataModel} de multipoints */
-
+
+ /**
+ * La liste des mod\xE8les {@link GISDataModel} de multipoints
+ */
public void addUsedAttributes(final GISAttributeInterface[] _att) {
if (_att == null) {
return;
@@ -84,6 +97,20 @@
return res;
}
+ /**
+ * permet de prendre en compte les attributs atomiques stock\xE9s comme tableau dans les attributs globaux.
+ *
+ * @return
+ */
+ public FSigGeomSrcData createDataWithAtomic() {
+ if (isEmpty()) {
+ return null;
+ }
+ final FSigGeomSrcData res = createData();
+ FSigLoadResultToAtomicProcess process = new FSigLoadResultToAtomicProcess();
+ return process.transform(res);
+ }
+
public GISAttributeInterface findOrCreateAttribute(final H2dVariableType _t, final boolean _isAtomic) {
if (_t == H2dVariableType.BATHYMETRIE && _isAtomic) {
allAttribute_.add(GISAttributeConstants.BATHY);
@@ -102,7 +129,7 @@
GISAttributeInterface res = findAttributes(_name, _data, _isAtomic);
if (res == null) {
res = GISLib.createAttributeFrom(_name, _data, _isAtomic);
- if(res!=null) {
+ if (res != null) {
allAttribute_.add(res);
}
}
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java 2013-01-23 21:44:55 UTC (rev 8246)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigFileLoaderPanel.java 2013-01-23 21:45:29 UTC (rev 8247)
@@ -276,7 +276,7 @@
}
}
super.valideData();
- return res == null ? null : res.createData();
+ return res == null ? null : res.createDataWithAtomic();
}
/**
Added: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigLoadResultToAtomicProcess.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigLoadResultToAtomicProcess.java (rev 0)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigLoadResultToAtomicProcess.java 2013-01-23 21:45:29 UTC (rev 8247)
@@ -0,0 +1,72 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.sig.wizard;
+
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISDataModel;
+import org.fudaa.ctulu.gis.GISDataModelAttributeToAtomicSubstitutionAdapter;
+import org.fudaa.ctulu.gis.GISLib;
+import org.fudaa.fudaa.sig.FSigGeomSrcData;
+
+/**
+ * Permet de transformer les attributs d'un chargement en atomique.
+ *
+ * @author Frederic Deniger
+ */
+public class FSigLoadResultToAtomicProcess {
+
+ private GISDataModel transform(GISDataModel gisDataModel) {
+ GISDataModel res = gisDataModel;
+ int nbAttributes = gisDataModel.getNbAttributes();
+ for (int i = 0; i < nbAttributes; i++) {
+ GISAttributeInterface attribute = gisDataModel.getAttribute(i);
+ GISAttributeInterface target = null;
+ if (!attribute.isAtomicValue()) {
+ target = GISLib.createAttributeFrom(attribute.getName(), attribute.getDataClass());
+ if (!target.isAtomicValue()) {
+ target = null;
+ }
+ }
+ if (target != null) {
+ res = new GISDataModelAttributeToAtomicSubstitutionAdapter(res, attribute, target);
+ }
+ }
+ return res;
+ }
+
+ public FSigGeomSrcData transform(FSigGeomSrcData init) {
+ FSigGeomSrcData res = new FSigGeomSrcData();
+ res.setNbPoints(init.getNbPoints());
+ res.setNbPointsTotal(init.getNbPointsTotal());
+ res.setNbPolygones(init.getNbPolygones());
+ res.setNbPolylignes(init.getNbPolylignes());
+ //doit on transformer les points
+ res.setPoints(init.getPoints());
+ res.setPolygones(transformPolygons(init));
+ res.setPolylignes(transformPolylines(init));
+
+ return res;
+
+ }
+
+ public GISDataModel[] transformPolygons(FSigGeomSrcData init) {
+ GISDataModel[] polygones = init.getPolygones();
+ GISDataModel[] targetPolygones = new GISDataModel[polygones.length];
+ for (int i = 0; i < targetPolygones.length; i++) {
+ targetPolygones[i] = transform(polygones[i]);
+ }
+ return targetPolygones;
+
+ }
+
+ public GISDataModel[] transformPolylines(FSigGeomSrcData init) {
+ GISDataModel[] polylines = init.getPolylignes();
+ GISDataModel[] targetPolylines = new GISDataModel[polylines.length];
+ for (int i = 0; i < targetPolylines.length; i++) {
+ targetPolylines[i] = transform(polylines[i]);
+ }
+ return targetPolylines;
+
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-04-07 15:29:35
|
Revision: 9104
http://sourceforge.net/p/fudaa/svn/9104
Author: bmarchan
Date: 2015-04-07 15:29:33 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
Ameliorations
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java 2015-04-07 14:57:34 UTC (rev 9103)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/FSigResource.java 2015-04-07 15:29:33 UTC (rev 9104)
@@ -11,6 +11,7 @@
import org.fudaa.fudaa.ressource.FudaaResource;
import com.memoire.bu.BuResource;
+import com.memoire.fu.FuLib;
/**
* @version $Id: FSigResource.java,v 1.4 2006-09-19 15:10:20 deniger Exp $
@@ -24,4 +25,22 @@
super(_b);
}
+ /**
+ * Traduit et retourne la chaine traduite, avec ou sans valeurs \xE0 ins\xE9rer.
+ *
+ * @param _s La chaine \xE0 traduire.
+ * @param _vals Les valeurs, de n'importe quelle type.
+ * @return La chaine traduite.
+ */
+ public static String getS(String _s, Object ... _vals) {
+ String r = FSIG.getString(_s);
+ if (r == null) {
+ return r;
+ }
+
+ for (int i=0; i<_vals.length; i++) {
+ r = FuLib.replace(r, "{"+i+"}", _vals[i].toString());
+ }
+ return r;
+ }
}
\ No newline at end of file
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java 2015-04-07 14:57:34 UTC (rev 9103)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigTempLineInLayer.java 2015-04-07 15:29:33 UTC (rev 9104)
@@ -26,6 +26,8 @@
public class FSigTempLineInLayer {
private Color colorLineTempo_ = Color.RED;
+ private TraceIconModel iconModel_=new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, colorLineTempo_);
+ private TraceLigneModel lineModel_=new TraceLigneModel(TraceLigne.MIXTE, 2, colorLineTempo_);
GrBoite initZoom_;
@@ -66,11 +68,22 @@
}
/**
- * @param _colorLineTempo the colorLineTempo to set
+ * Modifie la couleur du segment et des icones.
+ * @param _colorLineTempo La couleur de ligne
*/
public void setColorLineTempo(Color _colorLineTempo) {
colorLineTempo_ = _colorLineTempo;
+ lineModel_.setCouleur(_colorLineTempo);
+ iconModel_.setCouleur(_colorLineTempo);
}
+
+ public void setLineModel(TraceLigneModel _model) {
+ lineModel_=_model;
+ }
+
+ public void setIconModel(TraceIconModel _model) {
+ iconModel_=_model;
+ }
/**
* @param _s la ligne a afficher temporairement. si null n'affiche rien
@@ -89,12 +102,10 @@
initZoom_ = panel_.getVueCalque().getViewBoite();
tmp_ = new ZCalqueLigneBrisee();
tmp_.setDestructible(true);
- final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, colorLineTempo_);
- tmp_.setIconModel(0, model);
- tmp_.setIconModel(1, model);
- final TraceLigneModel ligne = new TraceLigneModel(TraceLigne.MIXTE, 2, colorLineTempo_);
- tmp_.setLineModel(0, ligne);
- tmp_.setLineModel(1, ligne);
+ tmp_.setIconModel(0, iconModel_);
+ tmp_.setIconModel(1, iconModel_);
+ tmp_.setLineModel(0, lineModel_);
+ tmp_.setLineModel(1, lineModel_);
panel_.getVueCalque().getCalque().enPremier(tmp_);
panel_.getCqInfos().enPremier();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X