mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-16 01:01:02 +00:00
adapt default values: wind grid 30x60, heatmap with streamlets, windline seeds on back
This commit is contained in:
1 parent
451ef596dc
commit
2ff9bb0c18
4 files changed
+42
-22
No files matched your search
+11
-5
@@ -242,7 +242,7 @@ public class SimulatorServiceImpl extends RemoteServiceServlet implements Simula
|
||||
wf.setGridAreaGps(gridAreaGps);
|
||||
}
|
||||
|
||||
final WindFieldDTO wfDTO = createWindFieldDTO(wf, startTime, endTime, timeStep, params.isShowLines());
|
||||
final WindFieldDTO wfDTO = createWindFieldDTO(wf, startTime, endTime, timeStep, params.isShowLines(), params.getSeedLines());
|
||||
logger.info("Exiting getWindField");
|
||||
return wfDTO;
|
||||
|
||||
@@ -304,7 +304,7 @@ public class SimulatorServiceImpl extends RemoteServiceServlet implements Simula
|
||||
}
|
||||
|
||||
private WindFieldDTO createWindFieldDTO(final WindFieldGenerator wf, final TimePoint startTime, final TimePoint endTime,
|
||||
final TimePoint timeStep, final boolean isShowLines) {
|
||||
final TimePoint timeStep, final boolean isShowLines, final char seedLines) {
|
||||
|
||||
final WindFieldDTO windFieldDTO = new WindFieldDTO();
|
||||
final List<SimulatorWindDTO> wList = new ArrayList<SimulatorWindDTO>();
|
||||
@@ -327,8 +327,14 @@ public class SimulatorServiceImpl extends RemoteServiceServlet implements Simula
|
||||
|
||||
windFieldDTO.setMatrix(wList);
|
||||
if (isShowLines) {
|
||||
getWindLinesFromStartLine(wf, windFieldDTO, startTime, endTime, timeStep);
|
||||
getWindLinesFromEndLine(wf, windFieldDTO, startTime, endTime, timeStep);
|
||||
|
||||
if (seedLines == 'f') {
|
||||
getWindLinesFromStartLine(wf, windFieldDTO, startTime, endTime, timeStep);
|
||||
}
|
||||
if (seedLines == 'b') {
|
||||
getWindLinesFromEndLine(wf, windFieldDTO, startTime, endTime, timeStep);
|
||||
}
|
||||
|
||||
}
|
||||
return windFieldDTO;
|
||||
}
|
||||
@@ -566,7 +572,7 @@ public class SimulatorServiceImpl extends RemoteServiceServlet implements Simula
|
||||
|
||||
WindFieldDTO windFieldDTO = null;
|
||||
if (pattern != null) {
|
||||
windFieldDTO = createWindFieldDTO(wf, startTime, endTime, timeStep, params.isShowLines());
|
||||
windFieldDTO = createWindFieldDTO(wf, startTime, endTime, timeStep, params.isShowLines(), params.getSeedLines());
|
||||
}
|
||||
final SimulatorResultsDTO simulatorResults = new SimulatorResultsDTO(rcDTO, pathDTO, windFieldDTO);
|
||||
|
||||
|
||||
+11
-1
@@ -36,7 +36,9 @@ public class WindFieldGenParamsDTO implements IsSerializable {
|
||||
private boolean showStreamlets;
|
||||
|
||||
private boolean showLines;
|
||||
|
||||
|
||||
private char seedLines;
|
||||
|
||||
|
||||
public WindFieldGenParamsDTO() {
|
||||
setDefaultTimeSettings();
|
||||
@@ -157,4 +159,12 @@ public class WindFieldGenParamsDTO implements IsSerializable {
|
||||
this.showLines = showLines;
|
||||
}
|
||||
|
||||
public char getSeedLines() {
|
||||
return seedLines;
|
||||
}
|
||||
|
||||
public void setSeedLines(char seedLines) {
|
||||
this.seedLines = seedLines;
|
||||
}
|
||||
|
||||
}
|
||||
+18
-15
@@ -20,22 +20,16 @@ public class SimulatorEntryPoint extends AbstractEntryPoint {
|
||||
private SimulatorViewModes viewMode;
|
||||
|
||||
private final SimulatorServiceAsync simulatorSvc = GWT.create(SimulatorService.class);
|
||||
private int xRes = 5;
|
||||
private int yRes = 5;
|
||||
private int xRes = 60;
|
||||
private int yRes = 30;
|
||||
private boolean autoUpdate = false;
|
||||
private char mode = 'f';
|
||||
/**
|
||||
* Show the wind arrows in wind display and replay modes.
|
||||
*/
|
||||
private boolean showArrows = true;
|
||||
|
||||
/**
|
||||
* Show the "heat map" and the wind lines in the wind display and replay modes.
|
||||
*/
|
||||
private boolean showGrid = false;
|
||||
private boolean showLines = false;
|
||||
|
||||
private boolean showStreamlets = false;
|
||||
|
||||
private boolean showArrows = false; // show the wind arrows in wind display and replay modes.
|
||||
private boolean showGrid = true; // show the "heat map" in the wind display and replay modes.
|
||||
private boolean showLines = false; // show the wind lines in the wind display and replay modes.
|
||||
private char seedLines = 'b'; // seed lines at: 'b'ack, 'f'ront
|
||||
private boolean showStreamlets = true; // show the wind streamlets in the wind display and replay modes.
|
||||
|
||||
private static Logger logger = Logger.getLogger(SimulatorEntryPoint.class.getName());
|
||||
|
||||
@@ -100,9 +94,18 @@ public class SimulatorEntryPoint extends AbstractEntryPoint {
|
||||
} else {
|
||||
showStreamlets = false;
|
||||
}
|
||||
if (windDisplayStr.contains("b")) {
|
||||
seedLines = 'b';
|
||||
}
|
||||
if (windDisplayStr.contains("f")) {
|
||||
seedLines = 'f';
|
||||
}
|
||||
if (windDisplayStr.contains("c")) {
|
||||
seedLines = 'c';
|
||||
}
|
||||
}
|
||||
SimulatorMainPanel mainPanel = new SimulatorMainPanel(simulatorSvc, stringMessages, this, xRes, yRes,
|
||||
autoUpdate, mode, showGrid, showLines, showArrows, showStreamlets);
|
||||
autoUpdate, mode, showGrid, showLines, seedLines, showArrows, showStreamlets);
|
||||
|
||||
switch (viewMode) {
|
||||
case ONESCREEN:
|
||||
|
||||
+2
-1
@@ -185,7 +185,7 @@ public class SimulatorMainPanel extends SplitLayoutPanel {
|
||||
}
|
||||
|
||||
public SimulatorMainPanel(final SimulatorServiceAsync svc, final StringMessages stringMessages, final ErrorReporter errorReporter,
|
||||
final int xRes, final int yRes, final boolean autoUpdate, final char mode, final boolean showGrid, final boolean showLines, final boolean showArrows, final boolean showStreamlets) {
|
||||
final int xRes, final int yRes, final boolean autoUpdate, final char mode, final boolean showGrid, final boolean showLines, final char seedLines, final boolean showArrows, final boolean showStreamlets) {
|
||||
|
||||
super();
|
||||
|
||||
@@ -223,6 +223,7 @@ public class SimulatorMainPanel extends SplitLayoutPanel {
|
||||
windParams.setShowArrows(showArrows);
|
||||
windParams.setShowGrid(showGrid);
|
||||
windParams.setShowLines(showLines);
|
||||
windParams.setSeedLines(seedLines);
|
||||
windParams.setShowStreamlets(showStreamlets);
|
||||
|
||||
timer = new Timer(PlayModes.Replay, 1000l);
|
||||
|
||||
Reference in new issue
Block a user