eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-07 21:01:03 +00:00
Code Activity

Merge branch 'origin/simulator_maps_v3'

Browse Source
This commit is contained in:
Christopher Ronnewinkel (D036654) committed 2014-07-15 21:09:13 +02:00
2 parents 76ebd2a3fa b19d82c1e2
commit fbcb140d76
3 files changed
+9 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/StreamletParameters.java
+2 -2
View File
@@ -6,8 +6,8 @@ public class StreamletParameters {
public double motionScale = 1.0; public double motionScale = 1.0;
public double swarmScale = 1.0; public double swarmScale = 1.0;
public int detailZoom = 15; public int detailZoom = 15;
public double lineScale = 1.0; public double lineScale = 0.1;
public double lineBase = 1.5; public double lineBase = 1.2;
public StreamletParameters() { public StreamletParameters() {
} }
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindStreamletsCanvasOverlay.java
+2 -1
View File
@@ -74,7 +74,8 @@ public class WindStreamletsCanvasOverlay extends FullCanvasOverlay implements Ti
} }
public void setWindField(final WindFieldDTO windFieldDTO) { public void setWindField(final WindFieldDTO windFieldDTO) {
this.windFieldDTO = windFieldDTO; this.windFieldDTO = windFieldDTO;
this.swarm = null;
} }
@Override @Override
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/SimulatorField.java
+5 -5
View File
@@ -31,9 +31,9 @@ public class SimulatorField implements VectorField {
private final Position bdC; private final Position bdC;
private final double xScale; private final double xScale;
private double motionFactor; private double motionFactor;
private double lineBase; private double lineBase;
private double lineScale; private double lineScale;
private final double maxLength; private final double maxLength;
private final double particleFactor; private final double particleFactor;
@@ -100,7 +100,7 @@ public class SimulatorField implements VectorField {
} }
} }
this.maxLength = maxWindSpeed; this.maxLength = maxWindSpeed;
this.particleFactor = 2.0; this.particleFactor = 1.0;
final double latAvg = (this.rcEnd.getLatDeg() + this.rcStart.getLatDeg()) / 2.; final double latAvg = (this.rcEnd.getLatDeg() + this.rcStart.getLatDeg()) / 2.;
this.lngScale = Math.cos(latAvg * Math.PI / 180.0); this.lngScale = Math.cos(latAvg * Math.PI / 180.0);
final double difLat = this.rcEnd.getLatDeg() - this.rcStart.getLatDeg(); final double difLat = this.rcEnd.getLatDeg() - this.rcStart.getLatDeg();
@@ -151,7 +151,7 @@ public class SimulatorField implements VectorField {
+ dataAtStep[idx.yTop][2 * idx.xBot + 1] * idx.yMod * (1 - idx.xMod) + dataAtStep[idx.yTop][2 * idx.xBot + 1] * idx.yMod * (1 - idx.xMod)
+ dataAtStep[idx.yBot][2 * idx.xTop + 1] * (1 - idx.yMod) * idx.xMod + dataAtStep[idx.yBot][2 * idx.xTop + 1] * (1 - idx.yMod) * idx.xMod
+ dataAtStep[idx.yTop][2 * idx.xTop + 1] * idx.yMod * idx.xMod; + dataAtStep[idx.yTop][2 * idx.xTop + 1] * idx.yMod * idx.xMod;
return new Vector(avgX / this.lngScale, avgY); return new Vector(avgX, avgY);
} }
@Override @Override