Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8177] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr
|
From: <de...@us...> - 2013-01-04 18:09:28
|
Revision: 8177
http://fudaa.svn.sourceforge.net/fudaa/?rev=8177&view=rev
Author: deniger
Date: 2013-01-04 18:09:21 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrRefluxBcBoundaryMiddleLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeVolumeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeCoordinatePersistBuilder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileXYProvider.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/replay/TrReplayVolumeVisuCustomizer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBcBoundaryBlockLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacSiphonLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirLayer.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrRefluxBcBoundaryMiddleLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrRefluxBcBoundaryMiddleLayer.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrRefluxBcBoundaryMiddleLayer.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -296,7 +296,7 @@
}
@Override
- public void paintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
+ public void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
final GrBoite _clipReel) {
if (isSelectionEmpty()) { return; }
final GrBoite b = new GrBoite();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -1097,7 +1097,7 @@
}
@Override
- public final void paintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
+ public final void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
final GrBoite _clipReel) {
if (getIsoModelAbstract().isCurrentDataElementType()) {
paintElementSelection(_g, _trace, _versEcran, _clipReel);
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -20,7 +20,6 @@
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.BitSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -33,6 +32,7 @@
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluNumberFormatI;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.FastBitSet;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
import org.fudaa.ctulu.gis.GISPrecision;
@@ -1209,7 +1209,7 @@
bilanModel.setMinTimeIdx(startTime);
bilanModel.setMaxTimeIdx(endTime);
if (selectedElementIdx != null) {
- BitSet selectedElts = new BitSet();
+ FastBitSet selectedElts = new FastBitSet();
for (int i : selectedElementIdx) {
selectedElts.set(i);
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeVolumeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeVolumeModel.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeVolumeModel.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -5,7 +5,6 @@
import java.awt.EventQueue;
import java.util.ArrayList;
-import java.util.BitSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -19,6 +18,7 @@
import org.fudaa.ctulu.CtuluListSelection;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.FastBitSet;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.dodico.ef.EfFilter;
import org.fudaa.dodico.ef.EfFilterNone;
@@ -42,7 +42,7 @@
public class TrPostCourbeVolumeModel extends AbstractPostCourbeModel {
private EnumThresholdCalculation computation = EnumThresholdCalculation.ALL;
- private BitSet selectedMeshes;
+ private FastBitSet selectedMeshes;
private double seuil;
private int minTimeIdx = -1;
private int maxTimeIdx = -1;
@@ -64,11 +64,11 @@
this.computation = computation;
}
- public BitSet getSelectedMeshes() {
+ public FastBitSet getSelectedMeshes() {
return selectedMeshes;
}
- public void setSelectedMeshes(BitSet selectedMeshes) {
+ public void setSelectedMeshes(FastBitSet selectedMeshes) {
this.selectedMeshes = selectedMeshes;
}
@@ -177,7 +177,7 @@
int[] idx = (int[]) mapData.get("selectedMeshes");
selectedMeshes = null;
if (idx != null) {
- selectedMeshes = new BitSet();
+ selectedMeshes = new FastBitSet();
for (int i : idx) {
selectedMeshes.set(i);
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -10,7 +10,6 @@
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-import java.util.BitSet;
import javax.swing.*;
import org.fudaa.ctulu.*;
import org.fudaa.ctulu.gui.CtuluComboBoxModelAdapter;
@@ -249,8 +248,8 @@
public H2dVariableType getSelectedVariable() {
return (H2dVariableType) listVar_.getSelectedItem();
}
-
- @Override
+
+ @Override
public EbliScene getScene() {
return getVisuPanel().getPostImpl().getCurrentLayoutFille().getScene();
}
@@ -385,11 +384,11 @@
return Double.parseDouble(seuil_.getText());
}
- public BitSet getSelectedMeshes() {
+ public FastBitSet getSelectedMeshes() {
if (cbAll_.isSelected()) {
return null;
}
- BitSet set = new BitSet();
+ FastBitSet set = new FastBitSet();
EfFilter filter = getFilter();
int nb = source_.getGrid().getEltNb();
for (int i = 0; i < nb; i++) {
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeCoordinatePersistBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeCoordinatePersistBuilder.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCourbeCoordinatePersistBuilder.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -4,11 +4,11 @@
import com.vividsolutions.jts.geom.CoordinateSequence;
import com.vividsolutions.jts.geom.LineString;
import java.io.File;
-import java.util.BitSet;
import java.util.List;
import java.util.Map;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.FastBitSet;
import org.fudaa.ctulu.gis.GISGeometryFactory;
import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsI;
import org.fudaa.ebli.courbe.EGCourbePersist;
@@ -45,8 +45,8 @@
cs[i] = new Coordinate(lineX[i], lineY[i]);
}
- BitSet hiddenPoints = CtuluListSelection.createForSelectedIdx(hiddenPointsIdx);
- BitSet hiddenSegment = CtuluListSelection.createForSelectedIdx(hiddenSegmentsIdx);
+ FastBitSet hiddenPoints = CtuluListSelection.createForSelectedIdx(hiddenPointsIdx);
+ FastBitSet hiddenSegment = CtuluListSelection.createForSelectedIdx(hiddenSegmentsIdx);
LineString init = GISGeometryFactory.INSTANCE.createLineString(cs);
final Cached createCachedData = MvProfileXYProvider.createCachedData(courbeX, courbeY, hiddenSegment, hiddenPoints, init);
return createCachedData;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileXYProvider.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileXYProvider.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileXYProvider.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -3,9 +3,9 @@
import com.memoire.fu.FuEmptyArrays;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.LineString;
-import java.util.BitSet;
import org.fudaa.ctulu.CtuluListSelection;
import org.fudaa.ctulu.CtuluVariable;
+import org.fudaa.ctulu.FastBitSet;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gis.GISGeometryFactory;
import org.fudaa.dodico.ef.operation.EfLineIntersection;
@@ -152,8 +152,8 @@
final int nbData = in.getNbData();
double[] x = new double[nbData];
double[] y = new double[in.getNbData()];
- BitSet hiddenSegment = new BitSet();
- BitSet hiddenPoint = new BitSet();
+ FastBitSet hiddenSegment = new FastBitSet();
+ FastBitSet hiddenPoint = new FastBitSet();
for (int i = 0; i < nbData; i++) {
x[i] = in.getX(i);
y[i] = in.getY(i);
@@ -171,7 +171,7 @@
}
- public static Cached createCachedData(double[] x, double[] y, BitSet hiddenSegment, BitSet hiddenPoint, LineString lineString) {
+ public static Cached createCachedData(double[] x, double[] y, FastBitSet hiddenSegment, FastBitSet hiddenPoint, LineString lineString) {
Cached res = new Cached(x, y, hiddenSegment, hiddenPoint);
res.setProfilelineString(lineString);
return res;
@@ -181,12 +181,12 @@
private final double[] x;
private final double[] y;
- private BitSet hiddenSegment;
- private BitSet hiddenNode;
+ private FastBitSet hiddenSegment;
+ private FastBitSet hiddenNode;
private EfLineIntersectionsResultsI res;
private LineString profilelineString;
- private Cached(double[] x, double[] y, BitSet hiddenSegment, BitSet hiddenPoint) {
+ private Cached(double[] x, double[] y, FastBitSet hiddenSegment, FastBitSet hiddenPoint) {
this.x = x == null ? FuEmptyArrays.DOUBLE0 : x;
this.y = y == null ? FuEmptyArrays.DOUBLE0 : y;
assert x.length == y.length;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/replay/TrReplayVolumeVisuCustomizer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/replay/TrReplayVolumeVisuCustomizer.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/replay/TrReplayVolumeVisuCustomizer.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -3,8 +3,8 @@
*/
package org.fudaa.fudaa.tr.post.replay;
-import java.util.BitSet;
import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.FastBitSet;
import org.fudaa.ebli.commun.EbliSelectionState;
import org.fudaa.fudaa.meshviewer.layer.MvElementLayer;
import org.fudaa.fudaa.tr.post.TrPostCourbeVolumeModel;
@@ -39,7 +39,7 @@
public void customizeVisu(final TrPostVisuPanel vue2d) {
MvElementLayer polygonLayer = vue2d.getGridGroup().getPolygonLayer();
polygonLayer.setVisible(true);
- BitSet selectedMeshes = modele.getSelectedMeshes();
+ FastBitSet selectedMeshes = modele.getSelectedMeshes();
if (selectedMeshes != null) {
polygonLayer.changeSelection(new CtuluListSelection(selectedMeshes), EbliSelectionState.ACTION_REPLACE);
} else {
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesLayer.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarDonneesBrutesLayer.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -536,7 +536,7 @@
}
@Override
- public void paintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
+ public void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
final GrBoite _clipReel) {
if (delegate_ == null) { return; }
delegate_.paintSelection(_g, _trace, _versEcran, _clipReel);
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayer.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -898,7 +898,7 @@
}
@Override
- public void paintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran, final GrBoite _clipReel) {
+ public void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran, final GrBoite _clipReel) {
if (getM().isModeElt()) {
super.paintSelection(_g, _trace, _versEcran, _clipReel);
return;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBcBoundaryBlockLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBcBoundaryBlockLayer.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBcBoundaryBlockLayer.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -291,7 +291,7 @@
}
@Override
- public void paintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
+ public void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
final GrBoite _clipReel) {
Color cs = _trace.getColor();
if (isAttenue()) {
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacSiphonLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacSiphonLayer.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacSiphonLayer.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -532,7 +532,7 @@
}
@Override
- public void paintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran, final GrBoite _clipReel) {
+ public void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran, final GrBoite _clipReel) {
if (isWorkOnSourcePoint()) {
final GrBoite clip = _clipReel;
/*
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirLayer.java 2013-01-03 23:01:17 UTC (rev 8176)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirLayer.java 2013-01-04 18:09:21 UTC (rev 8177)
@@ -958,7 +958,7 @@
}
@Override
- public void paintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
+ public void doPaintSelection(final Graphics2D _g, final ZSelectionTrace _trace, final GrMorphisme _versEcran,
final GrBoite _clipReel) {
if (getM().isWorkOnFrontierPt()) {
super.paintSelection(_g, _trace, _versEcran, _clipReel);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
