Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8143] trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/ fudaa/modeleur
|
From: <de...@us...> - 2012-12-15 00:50:57
|
Revision: 8143
http://fudaa.svn.sourceforge.net/fudaa/?rev=8143&view=rev
Author: deniger
Date: 2012-12-15 00:50:50 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridAction.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/GridContourConvexHullPanel.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditable.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridExportFactory.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
Added Paths:
-----------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridController.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LinearRingComboBoxModel.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditableConfigure.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridData.java
Removed Paths:
-------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridData.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridDelegate.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlIsoLayerConfigure.java
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridAction.java 2012-12-15 00:36:06 UTC (rev 8142)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridAction.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -14,9 +14,9 @@
*/
public class ExportGridAction extends EbliActionSimple {
- private final LayerGridDelegate delegate;
+ private final LayerGridController delegate;
- public ExportGridAction(LayerGridDelegate delegate) {
+ public ExportGridAction(LayerGridController delegate) {
super(MdlResource.getS("Exporter le maillage"), BuResource.BU.getIcon("exporter"), "EXPORT_GRID");
this.delegate = delegate;
}
Deleted: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridData.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridData.java 2012-12-15 00:36:06 UTC (rev 8142)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridData.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -1,56 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.modeleur.grid;
-
-import java.io.IOException;
-import org.fudaa.ctulu.CtuluVariable;
-import org.fudaa.dodico.ef.EfData;
-import org.fudaa.dodico.ef.EfDataNode;
-import org.fudaa.dodico.ef.EfGridData;
-import org.fudaa.dodico.ef.EfGridInterface;
-import org.fudaa.dodico.h2d.type.H2dVariableType;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class ExportGridData implements EfGridData {
-
- private final MdlElementModel model;
- private final int bathyIdx;
-
- public ExportGridData(MdlElementModel model, int bathyIdx) {
- this.model = model;
- this.bathyIdx = bathyIdx;
- }
-
- @Override
- public boolean isElementVar(CtuluVariable _idxVar) {
- return false;
- }
-
- @Override
- public boolean isDefined(CtuluVariable _var) {
- return H2dVariableType.BATHYMETRIE.equals(_var);
- }
-
- @Override
- public EfData getData(CtuluVariable _o, int _timeIdx) throws IOException {
- double[] bathy = new double[getGrid().getPtsNb()];
- for (int i = 0; i < bathy.length; i++) {
- bathy[i] = model.getValueFromGrid(bathyIdx, i);
- }
- return new EfDataNode(bathy);
- }
-
- @Override
- public double getData(CtuluVariable _o, int _timeIdx, int _idxObjet) throws IOException {
- return model.getValueFromGrid(bathyIdx, _idxObjet);
- }
-
- @Override
- public EfGridInterface getGrid() {
- return model.getGrid();
- }
-}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/GridContourConvexHullPanel.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/GridContourConvexHullPanel.java 2012-12-15 00:36:06 UTC (rev 8142)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/GridContourConvexHullPanel.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -6,6 +6,7 @@
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.vividsolutions.jts.geom.LinearRing;
+import java.awt.Component;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.List;
@@ -13,6 +14,7 @@
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
+import javax.swing.JList;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISAttributeModel;
@@ -63,61 +65,32 @@
private class LinearRingCellRenderer extends CtuluCellTextRenderer {
@Override
- protected void setValue(Object _value) {
+ public Component getListCellRendererComponent(JList _list, Object _value, int _index, boolean _isSelected, boolean _cellHasFocus) {
+ return super.getListCellRendererComponent(_list, getValue(_value, _index), _index, _isSelected, _cellHasFocus);
+ }
+
+ protected String getValue(Object _value, int selectedIdx) {
if (_value == null) {
- super.setValue(MdlResource.getS("Aucun"));
+ return MdlResource.getS("Aucun");
} else {
- int idx = cbConvexHull.getSelectedIndex() - 1;
+ int idx = selectedIdx - 1;
+ if (selectedIdx < 0) {
+ idx = cbConvexHull.getSelectedIndex() - 1;
+ }
if (idx >= 0) {
- int att = getSelectedLayer().modeleDonnees().getGeomData().getIndiceOf(GISAttributeConstants.LABEL);
+ int att = getSelectedLayer().modeleDonnees().getGeomData().getIndiceOf(GISAttributeConstants.TITRE);
GISAttributeModel dataModel = getSelectedLayer().modeleDonnees().getGeomData().getDataModel(att);
String title = (String) dataModel.getObjectValueAt(idx);
if (StringUtils.isEmpty(title)) {
title = MdlResource.getS("Ligne ferm\xE9e {0}", Integer.toString(idx + 1));
}
- super.setValue(title);
+ return title;
}
- super.setValue(_value);
}
+ return _value.toString();
}
}
- private static class LinearRingComboBoxModel extends AbstractListModel implements ComboBoxModel {
-
- private final MdlLayer2dContour selectedLayer;
- Object selected_;
-
- public LinearRingComboBoxModel(MdlLayer2dContour selectedLayer) {
- this.selectedLayer = selectedLayer;
- }
-
- @Override
- public int getSize() {
- return selectedLayer.modeleDonnees().getNombre() + 1;
- }
-
- @Override
- public Object getElementAt(int index) {
- if (index == 0) {
- return null;
- }
- return selectedLayer.modeleDonnees().getGeometries().getGeometry(index - 1);
- }
-
- @Override
- public Object getSelectedItem() {
- return selected_;
- }
-
- @Override
- public void setSelectedItem(final Object _anItem) {
- if (_anItem != selected_) {
- selected_ = _anItem;
- fireContentsChanged(this, -1, -1);
- }
- }
- }
-
protected void updateConvexHullCb() {
MdlLayer2dContour selectedLayer = getSelectedLayer();
if (selectedLayer == null) {
Copied: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridController.java (from rev 8135, trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridDelegate.java)
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridController.java (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridController.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -0,0 +1,125 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.grid;
+
+import com.vividsolutions.jts.geom.Geometry;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.dodico.h2d.type.H2dVariableType;
+import org.fudaa.ebli.calque.ZModelGeometryListener;
+import org.fudaa.ebli.calque.edition.ZCalqueMultiPointEditable;
+import org.fudaa.ebli.commun.EbliActionInterface;
+import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.geometrie.GrMorphisme;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.meshviewer.layer.MvIsoLayerQuickPainter;
+import org.fudaa.fudaa.meshviewer.layer.MvIsoModelDefault;
+import org.fudaa.fudaa.modeleur.LibUtils;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class LayerGridController implements ZModelGeometryListener {
+
+ private final MdlCalqueMultiPointEditable parentLayer;
+ private MdlElementModel grid;
+ MvIsoModelDefault isoModel;
+ MdlGridData gridData;
+ MvIsoLayerQuickPainter painter;
+
+ public LayerGridController(MdlCalqueMultiPointEditable parentLayer) {
+ this.parentLayer = parentLayer;
+ parentLayer.modeleDonnees().addModelListener(this);
+ }
+
+ @Override
+ public void geometryAction(Object _source, int _indexGeom, Geometry _geom, int _action) {
+ if (grid != null) {
+ grid = null;
+ parentLayer.remove(getGridLayer());
+ }
+ }
+
+ public void paintDonnees(int width, int height, final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel, final GrBoite _clipReel) {
+ if (gridData == null || parentLayer.getPaletteCouleur() == null) {
+ return;
+ }
+ if (!parentLayer.isTraceIsoLine() && !parentLayer.isTraceIsoSurface()) {
+ return;
+ }
+ if (isoModel == null) {
+ isoModel = new MvIsoModelDefault(gridData);
+ isoModel.setVar(H2dVariableType.BATHYMETRIE);
+ }
+ if (painter == null) {
+ painter = new MvIsoLayerQuickPainter(isoModel);
+ }
+ painter.setModel(isoModel);
+ painter.setTraceIsoLine(parentLayer.isTraceIsoLine());
+ painter.setPaletteCouleur(parentLayer.getPaletteCouleur());
+ //TODO a continuer
+ painter.setIsAntaliasing(parentLayer.isAntialiasing());
+ painter.setAlpha(parentLayer.getAlpha());
+ painter.setLigneModel(parentLayer.getLineModel(0));
+ painter.paintDonnees(width, height, _g, _versEcran, _versReel, _clipReel);
+
+ }
+
+ @Override
+ public void attributeAction(Object _source, int _indexAtt, GISAttributeInterface _att, int _action) {
+ }
+
+ @Override
+ public void attributeValueChangeAction(Object _source, int _indexAtt, GISAttributeInterface _att, int _indexGeom, Object _newValue) {
+ }
+
+ public MdlElementLayer getGridLayer() {
+ return (MdlElementLayer) parentLayer.getCalqueParNom("cqGrid");
+ }
+
+ public ZCalqueMultiPointEditable getParentLayer() {
+ return parentLayer;
+ }
+
+ public MdlGridData createExportGridData() {
+ return gridData;
+ }
+
+ public void setGridLayer(MdlElementModel grid) {
+ this.grid = grid;
+ gridData = null;
+ isoModel = null;
+ MdlElementLayer eltLayer = getGridLayer();
+ if (grid == null) {
+ if (eltLayer != null) {
+ parentLayer.remove(eltLayer);
+ }
+ } else {
+ installGridLayer(eltLayer, grid);
+ }
+ ((FSigEditor) parentLayer.getEditor()).getPanel().getVueCalque().repaint(0);
+ ((FSigEditor) parentLayer.getEditor()).getPanel().getVueCalque().revalidate();
+ }
+
+ public void installGridLayer(MdlElementLayer eltLayer, MdlElementModel grid) {
+ if (eltLayer == null) {
+ eltLayer = new MdlElementLayer();
+ eltLayer.setTitle(MdlResource.getS("Maillage"));
+ eltLayer.setName("cqGrid");
+ eltLayer.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1f, Color.LIGHT_GRAY));
+ eltLayer.setAlpha(128);
+ parentLayer.add(eltLayer);
+ }
+ final int attributeZ = LibUtils.getAttributeZPosition(parentLayer.modeleDonnees().getGeomData());
+ gridData = new MdlGridData(grid, attributeZ);
+ eltLayer.setActions(new EbliActionInterface[]{new ExportGridAction(this)});
+ eltLayer.setModele(grid);
+ eltLayer.repaint();
+ }
+}
Deleted: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridDelegate.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridDelegate.java 2012-12-15 00:36:06 UTC (rev 8142)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridDelegate.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -1,125 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.modeleur.grid;
-
-import com.vividsolutions.jts.geom.Geometry;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import org.fudaa.ctulu.gis.GISAttributeInterface;
-import org.fudaa.dodico.h2d.type.H2dVariableType;
-import org.fudaa.ebli.calque.ZModelGeometryListener;
-import org.fudaa.ebli.calque.edition.ZCalqueMultiPointEditable;
-import org.fudaa.ebli.commun.EbliActionInterface;
-import org.fudaa.ebli.geometrie.GrBoite;
-import org.fudaa.ebli.geometrie.GrMorphisme;
-import org.fudaa.ebli.trace.TraceLigne;
-import org.fudaa.ebli.trace.TraceLigneModel;
-import org.fudaa.fudaa.meshviewer.layer.MvIsoLayerQuickPainter;
-import org.fudaa.fudaa.meshviewer.layer.MvIsoModelDefault;
-import org.fudaa.fudaa.modeleur.LibUtils;
-import org.fudaa.fudaa.modeleur.resource.MdlResource;
-import org.fudaa.fudaa.sig.layer.FSigEditor;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class LayerGridDelegate implements ZModelGeometryListener {
-
- private final MdlCalqueMultiPointEditable parentLayer;
- private MdlElementModel grid;
- MvIsoModelDefault isoModel;
- ExportGridData gridData;
- MvIsoLayerQuickPainter painter;
-
- public LayerGridDelegate(MdlCalqueMultiPointEditable parentLayer) {
- this.parentLayer = parentLayer;
- parentLayer.modeleDonnees().addModelListener(this);
- }
-
- @Override
- public void geometryAction(Object _source, int _indexGeom, Geometry _geom, int _action) {
- if (grid != null) {
- grid = null;
- parentLayer.remove(getGridLayer());
- }
- }
-
- public void paintDonnees(int width, int height, final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel, final GrBoite _clipReel) {
- if (gridData == null || parentLayer.getPaletteCouleur() == null) {
- return;
- }
- if (!parentLayer.isTraceIsoLine() && !parentLayer.isTraceIsoSurface()) {
- return;
- }
- if (isoModel == null) {
- isoModel = new MvIsoModelDefault(gridData);
- isoModel.setVar(H2dVariableType.BATHYMETRIE);
- }
- if (painter == null) {
- painter = new MvIsoLayerQuickPainter(isoModel);
- }
- painter.setModel(isoModel);
- painter.setTraceIsoLine(parentLayer.isTraceIsoLine());
- painter.setPaletteCouleur(parentLayer.getPaletteCouleur());
- //TODO a continuer
- painter.setIsAntaliasing(parentLayer.isAntialiasing());
- painter.setAlpha(parentLayer.getAlpha());
- painter.setLigneModel(parentLayer.getLineModel(0));
- painter.paintDonnees(width, height, _g, _versEcran, _versReel, _clipReel);
-
- }
-
- @Override
- public void attributeAction(Object _source, int _indexAtt, GISAttributeInterface _att, int _action) {
- }
-
- @Override
- public void attributeValueChangeAction(Object _source, int _indexAtt, GISAttributeInterface _att, int _indexGeom, Object _newValue) {
- }
-
- public MdlElementLayer getGridLayer() {
- return (MdlElementLayer) parentLayer.getCalqueParNom("cqGrid");
- }
-
- public ZCalqueMultiPointEditable getParentLayer() {
- return parentLayer;
- }
-
- public ExportGridData createExportGridData() {
- return gridData;
- }
-
- public void setGridLayer(MdlElementModel grid) {
- this.grid = grid;
- gridData = null;
- isoModel = null;
- MdlElementLayer eltLayer = getGridLayer();
- if (grid == null) {
- if (eltLayer != null) {
- parentLayer.remove(eltLayer);
- }
- } else {
- installGridLayer(eltLayer, grid);
- }
- ((FSigEditor) parentLayer.getEditor()).getPanel().getVueCalque().repaint(0);
- ((FSigEditor) parentLayer.getEditor()).getPanel().getVueCalque().revalidate();
- }
-
- public void installGridLayer(MdlElementLayer eltLayer, MdlElementModel grid) {
- if (eltLayer == null) {
- eltLayer = new MdlElementLayer();
- eltLayer.setTitle(MdlResource.getS("Maillage"));
- eltLayer.setName("cqGrid");
- eltLayer.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1f, Color.LIGHT_GRAY));
- eltLayer.setAlpha(128);
- parentLayer.add(eltLayer);
- }
- final int attributeZ = LibUtils.getAttributeZPosition(parentLayer.modeleDonnees().getGeomData());
- gridData = new ExportGridData(grid, attributeZ);
- eltLayer.setActions(new EbliActionInterface[]{new ExportGridAction(this)});
- eltLayer.setModele(grid);
- eltLayer.repaint();
- }
-}
Added: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LinearRingComboBoxModel.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LinearRingComboBoxModel.java (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LinearRingComboBoxModel.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -0,0 +1,48 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.grid;
+
+import javax.swing.AbstractListModel;
+import javax.swing.ComboBoxModel;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dContour;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class LinearRingComboBoxModel extends AbstractListModel implements ComboBoxModel {
+ private final MdlLayer2dContour selectedLayer;
+ Object selected_;
+
+ public LinearRingComboBoxModel(MdlLayer2dContour selectedLayer) {
+ this.selectedLayer = selectedLayer;
+ }
+
+ @Override
+ public int getSize() {
+ return selectedLayer.modeleDonnees().getNombre() + 1;
+ }
+
+ @Override
+ public Object getElementAt(int index) {
+ if (index == 0) {
+ return null;
+ }
+ return selectedLayer.modeleDonnees().getGeometries().getGeometry(index - 1);
+ }
+
+ @Override
+ public Object getSelectedItem() {
+ return selected_;
+ }
+
+ @Override
+ public void setSelectedItem(final Object _anItem) {
+ if (_anItem != selected_) {
+ selected_ = _anItem;
+ fireContentsChanged(this, -1, -1);
+ }
+ }
+
+}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditable.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditable.java 2012-12-15 00:36:06 UTC (rev 8142)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditable.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -27,7 +27,7 @@
public void setTraceIsoLine(boolean traceIsoLine) {
if (traceIsoLine != this.traceIsoLine) {
this.traceIsoLine = traceIsoLine;
- firePropertyChange(MdlIsoLayerConfigure.ISO_LINE_PAINTED, !traceIsoLine, traceIsoLine);
+ firePropertyChange(MdlCalqueMultiPointEditableConfigure.ISO_LINE_PAINTED, !traceIsoLine, traceIsoLine);
repaint();
}
}
@@ -39,7 +39,7 @@
public void setTraceIsoSurface(boolean traceIsoSurface) {
if (traceIsoSurface != this.traceIsoSurface) {
this.traceIsoSurface = traceIsoSurface;
- firePropertyChange(MdlIsoLayerConfigure.ISO_SURFACE_PAINTED, !traceIsoSurface, traceIsoSurface);
+ firePropertyChange(MdlCalqueMultiPointEditableConfigure.ISO_SURFACE_PAINTED, !traceIsoSurface, traceIsoSurface);
repaint();
}
}
Copied: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditableConfigure.java (from rev 8135, trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlIsoLayerConfigure.java)
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditableConfigure.java (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditableConfigure.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -0,0 +1,132 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.grid;
+
+import java.awt.Color;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.List;
+import org.fudaa.ebli.calque.BCalqueConfigureSectionAbstract;
+import org.fudaa.ebli.controle.BSelecteurCheckBox;
+import org.fudaa.ebli.controle.BSelecteurInterface;
+import org.fudaa.ebli.controle.BSelecteurLineModel;
+import org.fudaa.ebli.palette.BPalettePlage;
+import org.fudaa.ebli.palette.BPalettePlageInterface;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+
+/**
+ * Permet de configurer un calque MdlCalqueMultiPointEditable.
+ *
+ * @author Frederic Deniger
+ */
+public class MdlCalqueMultiPointEditableConfigure extends BCalqueConfigureSectionAbstract {
+
+ public static final String ISO_LINE_COLOR_PROP = "isoLine.draw.color";
+ public static final String ISO_LINE_PROP = BSelecteurLineModel.getProperty(0);
+ public static final String ISO_LINE_PAINTED = "isoLine.painted";
+ public static final String ISO_SURFACE_PAINTED = "isoSurface.painted";
+
+ public MdlCalqueMultiPointEditableConfigure(final MdlCalqueMultiPointEditable _target) {
+ super(_target, MdlResource.getS("Isolignes / Isosurfaces"));
+ }
+
+ @Override
+ public BSelecteurInterface[] createSelecteurs() {
+ final List dest = new ArrayList();
+ final BSelecteurCheckBox cbIsoSurface = new BSelecteurCheckBox(ISO_SURFACE_PAINTED);
+ cbIsoSurface.setTitle(MdlResource.getS("Tracer des isosurfaces"));
+ final BSelecteurCheckBox cbIsoLine = new BSelecteurCheckBox(ISO_LINE_PAINTED);
+ cbIsoLine.setTitle(MdlResource.getS("Tracer des isolignes"));
+ final BSelecteurLineModel line = new BSelecteurLineModel(ISO_LINE_PROP);
+ line.setAddColor(false);
+ dest.add(cbIsoSurface);
+ dest.add(cbIsoLine);
+ dest.add(line);
+ line.setEnabled(((MdlCalqueMultiPointEditable) target_).isTraceIsoLine());
+ cbIsoLine.getCb().addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(final ItemEvent _e) {
+ line.setEnabled(cbIsoLine.getCb().isSelected());
+ if (cbIsoLine.getCb().isSelected()) {
+ cbIsoSurface.getCb().setSelected(false);
+ }
+ }
+ });
+ cbIsoSurface.getCb().addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(final ItemEvent _e) {
+ if (cbIsoSurface.getCb().isSelected()) {
+ cbIsoLine.getCb().setSelected(false);
+ }
+ }
+ });
+
+ return (BSelecteurInterface[]) dest.toArray(new BSelecteurInterface[dest.size()]);
+ }
+
+ @Override
+ public Object getProperty(final String _key) {
+ if (ISO_LINE_PAINTED.equals(_key)) {
+ return Boolean.valueOf(((MdlCalqueMultiPointEditable) target_).isTraceIsoLine());
+ }
+ if (ISO_SURFACE_PAINTED.equals(_key)) {
+ return Boolean.valueOf(((MdlCalqueMultiPointEditable) target_).isTraceIsoSurface());
+ }
+ if (ISO_LINE_PROP.equals(_key)) {
+ return ((MdlCalqueMultiPointEditable) target_).getLineModel(0);
+ }
+ if (ISO_LINE_COLOR_PROP.equals(_key)) {
+ final BPalettePlageInterface plages = ((MdlCalqueMultiPointEditable) target_).getPaletteCouleur();
+ Color c = null;
+ if (plages.getNbPlages() > 0) {
+ c = plages.getPlageInterface(0).getCouleur();
+ }
+ if (c == null) {
+ return null;
+ }
+ for (int i = plages.getNbPlages() - 1; i > 0; i--) {
+ if (!c.equals(plages.getPlageInterface(i).getCouleur())) {
+ return null;
+ }
+
+ }
+ return c;
+ }
+ return null;
+ }
+
+ @Override
+ public boolean setProperty(final String _key, final Object _newProp) {
+ if (ISO_LINE_PAINTED.equals(_key)) {
+ ((MdlCalqueMultiPointEditable) target_).setTraceIsoLine(((Boolean) _newProp).booleanValue());
+ return true;
+ }
+ if (ISO_SURFACE_PAINTED.equals(_key)) {
+ ((MdlCalqueMultiPointEditable) target_).setTraceIsoSurface(((Boolean) _newProp).booleanValue());
+ return true;
+ }
+ if (ISO_LINE_PROP.equals(_key)) {
+ ((MdlCalqueMultiPointEditable) target_).setLineModel(0, ((TraceLigneModel) _newProp));
+ return true;
+ }
+ if (ISO_LINE_COLOR_PROP.equals(_key)) {
+ final Color c = (Color) _newProp;
+ if (c == null) {
+ return false;
+ }
+ final BPalettePlageInterface plages = ((MdlCalqueMultiPointEditable) target_).getPaletteCouleur();
+ if (plages != null) {
+ final BPalettePlage plage = new BPalettePlage(plages.getPlages());
+ for (int i = plage.getNbPlages() - 1; i >= 0; i--) {
+ plage.getPlage(i).setCouleur(c);
+ }
+ ((MdlCalqueMultiPointEditable) target_).setPaletteCouleurPlages(plage);
+
+ }
+ }
+ return false;
+ }
+}
Copied: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridData.java (from rev 8140, trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/ExportGridData.java)
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridData.java (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridData.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -0,0 +1,56 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.grid;
+
+import java.io.IOException;
+import org.fudaa.ctulu.CtuluVariable;
+import org.fudaa.dodico.ef.EfData;
+import org.fudaa.dodico.ef.EfDataNode;
+import org.fudaa.dodico.ef.EfGridData;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.h2d.type.H2dVariableType;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class MdlGridData implements EfGridData {
+
+ private final MdlElementModel model;
+ private final int varIdx;
+
+ public MdlGridData(MdlElementModel model, int bathyIdx) {
+ this.model = model;
+ this.varIdx = bathyIdx;
+ }
+
+ @Override
+ public boolean isElementVar(CtuluVariable _idxVar) {
+ return false;
+ }
+
+ @Override
+ public boolean isDefined(CtuluVariable _var) {
+ return H2dVariableType.BATHYMETRIE.equals(_var);
+ }
+
+ @Override
+ public EfData getData(CtuluVariable _o, int _timeIdx) throws IOException {
+ double[] data = new double[getGrid().getPtsNb()];
+ for (int i = 0; i < data.length; i++) {
+ data[i] = model.getValueFromGrid(varIdx, i);
+ }
+ return new EfDataNode(data);
+ }
+
+ @Override
+ public double getData(CtuluVariable _o, int _timeIdx, int _idxObjet) throws IOException {
+ return model.getValueFromGrid(varIdx, _idxObjet);
+ }
+
+ @Override
+ public EfGridInterface getGrid() {
+ return model.getGrid();
+ }
+}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridExportFactory.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridExportFactory.java 2012-12-15 00:36:06 UTC (rev 8142)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridExportFactory.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -14,7 +14,7 @@
*/
public class MdlGridExportFactory {
- public static MvExportFactory create(LayerGridDelegate gridDelegate) {
+ public static MvExportFactory create(LayerGridController gridDelegate) {
FSigEditor editor = (FSigEditor) gridDelegate.getParentLayer().getEditor();
DefaultListModel varModel = new DefaultListModel();
varModel.addElement(H2dVariableType.BATHYMETRIE);
@@ -23,7 +23,7 @@
return res;
}
- public static void startExport(LayerGridDelegate gridDelegate) {
+ public static void startExport(LayerGridController gridDelegate) {
final MvExportFactory exporter = create(gridDelegate);
MvExportFactory.startExport(exporter, exporter.getUi(), null);
}
Deleted: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlIsoLayerConfigure.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlIsoLayerConfigure.java 2012-12-15 00:36:06 UTC (rev 8142)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlIsoLayerConfigure.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -1,140 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.modeleur.grid;
-
-import java.awt.Color;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.ArrayList;
-import java.util.List;
-import org.fudaa.ebli.calque.BCalqueConfigureSectionAbstract;
-import org.fudaa.ebli.controle.BSelecteurCheckBox;
-import org.fudaa.ebli.controle.BSelecteurColorChooserBt;
-import org.fudaa.ebli.controle.BSelecteurInterface;
-import org.fudaa.ebli.controle.BSelecteurLineModel;
-import org.fudaa.ebli.palette.BPalettePlage;
-import org.fudaa.ebli.palette.BPalettePlageInterface;
-import org.fudaa.ebli.trace.TraceLigneModel;
-import org.fudaa.fudaa.modeleur.resource.MdlResource;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class MdlIsoLayerConfigure extends BCalqueConfigureSectionAbstract {
-
- public static final String ISO_LINE_COLOR_PROP = "isoLine.draw.color";
- public static final String ISO_LINE_PROP = BSelecteurLineModel.getProperty(0);
- public static final String ISO_LINE_PAINTED = "isoLine.painted";
- public static final String ISO_SURFACE_PAINTED = "isoSurface.painted";
-
- public MdlIsoLayerConfigure(final MdlCalqueMultiPointEditable _target) {
- super(_target, MdlResource.getS("Isolignes / Isosurfaces"));
- }
-
- @Override
- public BSelecteurInterface[] createSelecteurs() {
- final List dest = new ArrayList();
- final BSelecteurCheckBox cbIsoSurface = new BSelecteurCheckBox(ISO_SURFACE_PAINTED);
- cbIsoSurface.setTitle(MdlResource.getS("Tracer des isosurfaces"));
- final BSelecteurCheckBox cbIsoLine = new BSelecteurCheckBox(ISO_LINE_PAINTED);
- cbIsoLine.setTitle(MdlResource.getS("Tracer des isolignes"));
- final BSelecteurLineModel line = new BSelecteurLineModel(ISO_LINE_PROP);
- line.setAddColor(false);
- dest.add(cbIsoSurface);
- dest.add(cbIsoLine);
- dest.add(line);
- line.setEnabled(((MdlCalqueMultiPointEditable) target_).isTraceIsoLine());
-// final BSelecteurColorChooserBt selecteurColorChooserBt = new BSelecteurColorChooserBt(ISO_LINE_COLOR_PROP);
-// selecteurColorChooserBt.setTitle(MdlResource.getS("Utiliser une seule couleur"));
-// selecteurColorChooserBt.setTooltip(MdlResource
-// .getS("Permet de modifier la palette de couleur et de n'utiliser qu'une seule couleur"));
-// selecteurColorChooserBt.setEnabled(cbIsoLine.getCb().isSelected());
-// dest.add(selecteurColorChooserBt);
-
- cbIsoLine.getCb().addItemListener(new ItemListener() {
- @Override
- public void itemStateChanged(final ItemEvent _e) {
- line.setEnabled(cbIsoLine.getCb().isSelected());
-// selecteurColorChooserBt.setEnabled(cbIsoLine.getCb().isSelected());
- if (cbIsoLine.getCb().isSelected()) {
- cbIsoSurface.getCb().setSelected(false);
- }
- }
- });
- cbIsoSurface.getCb().addItemListener(new ItemListener() {
- @Override
- public void itemStateChanged(final ItemEvent _e) {
- if (cbIsoSurface.getCb().isSelected()) {
- cbIsoLine.getCb().setSelected(false);
- }
- }
- });
-
- return (BSelecteurInterface[]) dest.toArray(new BSelecteurInterface[dest.size()]);
- }
-
- @Override
- public Object getProperty(final String _key) {
- if (ISO_LINE_PAINTED.equals(_key)) {
- return Boolean.valueOf(((MdlCalqueMultiPointEditable) target_).isTraceIsoLine());
- }
- if (ISO_SURFACE_PAINTED.equals(_key)) {
- return Boolean.valueOf(((MdlCalqueMultiPointEditable) target_).isTraceIsoSurface());
- }
- if (ISO_LINE_PROP.equals(_key)) {
- return ((MdlCalqueMultiPointEditable) target_).getLineModel(0);
- }
- if (ISO_LINE_COLOR_PROP.equals(_key)) {
- final BPalettePlageInterface plages = ((MdlCalqueMultiPointEditable) target_).getPaletteCouleur();
- Color c = null;
- if (plages.getNbPlages() > 0) {
- c = plages.getPlageInterface(0).getCouleur();
- }
- if (c == null) {
- return null;
- }
- for (int i = plages.getNbPlages() - 1; i > 0; i--) {
- if (!c.equals(plages.getPlageInterface(i).getCouleur())) {
- return null;
- }
-
- }
- return c;
- }
- return null;
- }
-
- @Override
- public boolean setProperty(final String _key, final Object _newProp) {
- if (ISO_LINE_PAINTED.equals(_key)) {
- ((MdlCalqueMultiPointEditable) target_).setTraceIsoLine(((Boolean) _newProp).booleanValue());
- return true;
- }
- if (ISO_SURFACE_PAINTED.equals(_key)) {
- ((MdlCalqueMultiPointEditable) target_).setTraceIsoSurface(((Boolean) _newProp).booleanValue());
- return true;
- }
- if (ISO_LINE_PROP.equals(_key)) {
- ((MdlCalqueMultiPointEditable) target_).setLineModel(0, ((TraceLigneModel) _newProp));
- return true;
- }
- if (ISO_LINE_COLOR_PROP.equals(_key)) {
- final Color c = (Color) _newProp;
- if (c == null) {
- return false;
- }
- final BPalettePlageInterface plages = ((MdlCalqueMultiPointEditable) target_).getPaletteCouleur();
- if (plages != null) {
- final BPalettePlage plage = new BPalettePlage(plages.getPlages());
- for (int i = plage.getNbPlages() - 1; i >= 0; i--) {
- plage.getPlage(i).setCouleur(c);
- }
- ((MdlCalqueMultiPointEditable) target_).setPaletteCouleurPlages(plage);
-
- }
- }
- return false;
- }
-}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2012-12-15 00:36:06 UTC (rev 8142)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2012-12-15 00:50:50 UTC (rev 8143)
@@ -7,7 +7,7 @@
*/
package org.fudaa.fudaa.modeleur.layer;
-import org.fudaa.fudaa.modeleur.grid.MdlIsoLayerConfigure;
+import org.fudaa.fudaa.modeleur.grid.MdlCalqueMultiPointEditableConfigure;
import java.awt.Color;
import java.awt.Graphics2D;
import java.util.ArrayList;
@@ -28,7 +28,7 @@
import org.fudaa.ebli.geometrie.GrMorphisme;
import org.fudaa.ebli.palette.BPalettePlage;
import org.fudaa.ebli.trace.TraceIconModel;
-import org.fudaa.fudaa.modeleur.grid.LayerGridDelegate;
+import org.fudaa.fudaa.modeleur.grid.LayerGridController;
import org.fudaa.fudaa.modeleur.grid.MdlCalqueMultiPointEditable;
import org.fudaa.fudaa.sig.layer.FSigEditor;
@@ -43,7 +43,7 @@
/**
* classe charg\xE9e de la relation entre le calque multi point et le maillage associ\xE9.
*/
- private final LayerGridDelegate layerGridDelegate;
+ private final LayerGridController layerGridDelegate;
/**
* l'indice des jeux de donn\xE9es contenant la bathym\xE9trie.
*/
@@ -60,11 +60,11 @@
setDestructible(true);
installActions();
updatePositionDataBathy();
- layerGridDelegate = new LayerGridDelegate(this);
+ layerGridDelegate = new LayerGridController(this);
setLegende(_editor == null ? null : _editor.getPanel().getCqLegend());
}
- public LayerGridDelegate getLayerGridDelegate() {
+ public LayerGridController getLayerGridDelegate() {
return layerGridDelegate;
}
@@ -74,7 +74,7 @@
protected BConfigurableInterface getAffichageConf() {
final BConfigurableInterface[] sect = new BConfigurableInterface[2 + getNbSet()];
sect[0] = new ZCalqueAffichageDonneesConfigure(this);
- sect[1] = new MdlIsoLayerConfigure(this);
+ sect[1] = new MdlCalqueMultiPointEditableConfigure(this);
for (int i = 2; i < sect.length; i++) {
sect[i] = new ZCalqueAffichageDonneesTraceConfigure(this, i - 2);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
