Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5708] trunk/soft/fudaa-prepro
|
From: <chr...@us...> - 2010-03-11 17:15:30
|
Revision: 5708
http://fudaa.svn.sourceforge.net/fudaa/?rev=5708&view=rev
Author: chrisc83
Date: 2010-03-11 17:15:22 +0000 (Thu, 11 Mar 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportFactory.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportOperationOnClosedLineAbstract.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportPanelFilterFactory.java
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -73,14 +73,14 @@
final MvExportTaskSkeletonWithCondLim skeleton = new MvExportTaskSkeletonWithCondLim(_fact.getDatas(),
_fact.vects_, ser);
MvExportFactory.addSingleFileChooser(skeleton, fmt, _initFile);
-
+
// -- conditions limites --//
MvExportFactory.addSingleFileCondLimitesChooser(skeleton, TelemacCLFileFormat.getInstance(), null);
final MvExportTaskSkeleton.ExportPanelVarTime selection = _fact.buildVarChooser();
ser.volumique_ = isVolumique;
skeleton.setPnVar(selection);
- skeleton.setPnFilter(_fact.buildFilter(ui, _selection, selection.getTimeSelectionModel()));
+ skeleton.setPnFilter(_fact.buildFilter(ui, dd, _selection, selection.getTimeSelectionModel()));
VolumiqueCustomPanel volumiqueCustomPanel = new VolumiqueCustomPanel();
volumiqueCustomPanel.cb_.setSelected(isVolumique);
skeleton.setCustom(new MvExportTaskSkeleton.ExportPanelCustom[] { volumiqueCustomPanel });
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -22,11 +22,6 @@
import javax.swing.ListSelectionModel;
import javax.swing.filechooser.FileFilter;
-import com.memoire.bu.BuBorders;
-import com.memoire.bu.BuFileFilter;
-import com.memoire.fu.FuComparator;
-import com.memoire.fu.FuLog;
-
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluUI;
@@ -36,6 +31,7 @@
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.interpolation.InterpolationVectorContainer;
import org.fudaa.dodico.ef.EfGridData;
+import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.FileFormatGridVersion;
import org.fudaa.dodico.ef.io.corelebth.CorEleBthFileFormat;
import org.fudaa.dodico.ef.io.dunes.DunesMAIFileFormat;
@@ -52,6 +48,11 @@
import org.fudaa.fudaa.sig.layer.FSigVisuPanel;
import org.geotools.data.FileDataStoreFactorySpi;
+import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuFileFilter;
+import com.memoire.fu.FuComparator;
+import com.memoire.fu.FuLog;
+
/**
* @author Fred Deniger
* @version $Id: MvExportFactory.java,v 1.23 2007-06-05 09:01:12 deniger Exp $
@@ -130,13 +131,14 @@
int[] initIpobo_;
private final FSigVisuPanel panel;
final CtuluUI ui;
-
+ final EfGridInterface grid;
+
/**
* @param _vars
* @param _time
* @param _datas
*/
- public MvExportFactory(final CtuluUI ui,final ListModel _vars, final FudaaCourbeTimeListModel _time, final EfGridData _datas,
+ public MvExportFactory(final CtuluUI ui, final EfGridInterface grid,final ListModel _vars, final FudaaCourbeTimeListModel _time, final EfGridData _datas,
final InterpolationVectorContainer _vects, FSigVisuPanel panel) {
super();
this.panel = panel;
@@ -145,6 +147,7 @@
datas_ = _datas;
vects_ = _vects;
this.ui=ui;
+ this.grid = grid;
assert ui!=null;
}
@@ -152,7 +155,7 @@
return new MvExportTaskSkeleton.ExportPaneVarTimelSingleChooser(time_);
}
- protected MvExportPanelFilter buildFilter(CtuluUI ui, final MvSelectionNodeOrEltData _selection, final ListSelectionModel _time) {
+ protected MvExportPanelFilter buildFilter(CtuluUI ui, EfGridInterface grid, final MvSelectionNodeOrEltData _selection, final ListSelectionModel _time) {
final MvExportOperationItem[] item = new MvExportOperationItem[1];
// item[0] = new MvExportPanelFilterDefault.ExportFilterItemNone();
item[0] = new MvExportPanelFilterDefault.ExportFilterItemSelection(_selection);
@@ -237,7 +240,7 @@
final MvExportTaskSkeleton skeleton = new MvExportTaskSkeleton(datas_, vects_, new MvExportActDataStoreSrc(_store));
final MvExportTaskSkeleton.ExportPanelVarTimeChooser selection = buildVarChooser();
skeleton.setPnVar(selection);
- skeleton.setPnFilter(buildFilter(ui, _selection, selection.getTimeSelectionModel()));
+ skeleton.setPnFilter(buildFilter(ui, grid, _selection, selection.getTimeSelectionModel()));
skeleton.setPnFile(new MvExportTaskSkeleton.ExportPanelFileChooserMulti(titre, suffixe, _initFile, CtuluLibFile
.getCorrectExtension(_store.getFileExtensions()[0]), new FileFilter[] { new BuFileFilter(CtuluLibFile
.getCorrectExtension(_store.getFileExtensions())) }));
@@ -274,6 +277,11 @@
return ui;
}
+ public EfGridInterface getGrid()
+ {
+ return grid;
+ }
+
public void setInitIpobo(final int[] _initIpobo) {
initIpobo_ = _initIpobo;
}
@@ -292,7 +300,7 @@
_skeleton.setPnVar(selection);
listSelection = selection.getTimeSelectionModel();
}
- _skeleton.setPnFilter(buildFilter(ui, _selection, listSelection));
+ _skeleton.setPnFilter(buildFilter(ui, grid, _selection, listSelection));
}
}
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -88,7 +88,7 @@
final MvExportTaskSkeleton.ExportPanelVarTime selection = MvExportActX3D.createChooser(_fact.getDatas(), _fact
.getTime());
skeleton.setPnVar(selection);
- skeleton.setPnFilter(_fact.buildFilter(_fact.getUi(), _selection, selection.getTimeSelectionModel()));
+ skeleton.setPnFilter(_fact.buildFilter(_fact.getUi(), dd, _selection, selection.getTimeSelectionModel()));
return skeleton;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportFactory.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportFactory.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportFactory.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -27,6 +27,7 @@
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.interpolation.InterpolationVectorContainer;
import org.fudaa.dodico.ef.EfGridData;
+import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.io.corelebth.CorEleBthFileFormat;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.dodico.reflux.io.RefluxRefondeSolutionFileFormat;
@@ -98,8 +99,8 @@
@Override
protected MvExportPanelFilter buildFilter(CtuluUI ui,
- final MvSelectionNodeOrEltData _selection, final ListSelectionModel _timeSelection) {
- return TrExportPanelFilterFactory.buildFilter(ui,_selection, _timeSelection, time_ != null
+ EfGridInterface grid, final MvSelectionNodeOrEltData _selection, final ListSelectionModel _timeSelection) {
+ return TrExportPanelFilterFactory.buildFilter(ui, grid,_selection, _timeSelection, time_ != null
&& datas_.isDefined(H2dVariableType.HAUTEUR_EAU), (TrVisuPanel) getPanel());
}
@@ -134,7 +135,7 @@
skeleton.setPnVar(selection);
listSelection = selection.getTimeSelectionModel();
}
- skeleton.setPnFilter(buildFilter(getUi(), _selection, listSelection));
+ skeleton.setPnFilter(buildFilter(getUi(), dd, _selection, listSelection));
skeleton.setCustom(new ExportPanelCustom[] { custom });
return skeleton;
}
@@ -176,7 +177,7 @@
skeleton.setPnVar(timeChooser);
}
- skeleton.setPnFilter(buildFilter(getUi(), _selection, listSelection));
+ skeleton.setPnFilter(buildFilter(getUi(), dd, _selection, listSelection));
skeleton.setCustom(new ExportPanelCustom[] { custom });
return skeleton;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportOperationOnClosedLineAbstract.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportOperationOnClosedLineAbstract.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportOperationOnClosedLineAbstract.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -38,18 +38,9 @@
protected MvLineChooser mvLineChooser;
EfGridInterface grid;
- public TrExportOperationOnClosedLineAbstract(CtuluUI ui,final String title, final TrVisuPanel panel) {
+ public TrExportOperationOnClosedLineAbstract(final String title, final TrVisuPanel panel) {
this.title = title;
this.panel = panel;
-
- if (panel == null)
- {
- this.ui = ui;
- }
- else
- {
- this.ui=panel.getCtuluUI();
- }
}
public TrExportOperationOnClosedLineAbstract(CtuluUI ui,EfGridInterface grid,final String title) {
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportPanelFilterFactory.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportPanelFilterFactory.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportPanelFilterFactory.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -18,6 +18,7 @@
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.dodico.ef.EfGridData;
+import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.fudaa.meshviewer.MvSelectionNodeOrEltData;
import org.fudaa.fudaa.meshviewer.export.MvExportOperationItem;
import org.fudaa.fudaa.meshviewer.export.MvExportPanelFilter;
@@ -33,7 +34,7 @@
public final class TrExportPanelFilterFactory {
private TrExportPanelFilterFactory() {}
- public static MvExportPanelFilter buildFilter(final CtuluUI ui,final MvSelectionNodeOrEltData _selection,
+ public static MvExportPanelFilter buildFilter(final CtuluUI ui, EfGridInterface grid, final MvSelectionNodeOrEltData _selection,
final ListSelectionModel _timeSelection, final boolean _hauteurFilter, TrVisuPanel visu) {
final List<MvExportOperationItem> item = new ArrayList<MvExportOperationItem>();
// item[0] = new MvExportPanelFilterDefault.ExportFilterItemNone();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
