Commit 8daa46eb authored by rink's avatar rink
Browse files

restore trajDoIntrp. Acts as an override.

parent da9f116c
...@@ -84,6 +84,7 @@ public class TrajectoryParams { ...@@ -84,6 +84,7 @@ public class TrajectoryParams {
boolean terrainFollowEnabled = true; boolean terrainFollowEnabled = true;
boolean trcrStreamingEnabled = false; boolean trcrStreamingEnabled = false;
boolean saveTracerLocations = false; boolean saveTracerLocations = false;
boolean trajDoIntrp = true;
int trajForm = LINE; int trajForm = LINE;
float cylWidth = 0.00014f; float cylWidth = 0.00014f;
...@@ -133,6 +134,7 @@ public class TrajectoryParams { ...@@ -133,6 +134,7 @@ public class TrajectoryParams {
this.trcrStreamingEnabled = params.getTracerStreamingEnabled(); this.trcrStreamingEnabled = params.getTracerStreamingEnabled();
this.saveTracerLocations = params.getSaveTracerLocations(); this.saveTracerLocations = params.getSaveTracerLocations();
this.timeStepScaleFactor = params.getTimeStepScaleFactor(); this.timeStepScaleFactor = params.getTimeStepScaleFactor();
this.trajDoIntrp = params.getTrajDoIntrp();
} }
public TrajectoryParams(double trajVisibilityTimeWindow, double trajRefreshInterval, int numIntrpPts, int startSkip, SmoothParams smoothParams) { public TrajectoryParams(double trajVisibilityTimeWindow, double trajRefreshInterval, int numIntrpPts, int startSkip, SmoothParams smoothParams) {
...@@ -386,6 +388,14 @@ public class TrajectoryParams { ...@@ -386,6 +388,14 @@ public class TrajectoryParams {
this.timeStepScaleFactor = fac; this.timeStepScaleFactor = fac;
} }
public boolean getTrajDoIntrp() {
return this.trajDoIntrp;
}
public void setTrajDoIntrp(boolean yesno) {
this.trajDoIntrp = yesno;
}
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null || !(obj instanceof TrajectoryParams)) { if (obj == null || !(obj instanceof TrajectoryParams)) {
return false; return false;
...@@ -446,6 +456,9 @@ public class TrajectoryParams { ...@@ -446,6 +456,9 @@ public class TrajectoryParams {
else if (this.timeStepScaleFactor != trajParams.timeStepScaleFactor) { else if (this.timeStepScaleFactor != trajParams.timeStepScaleFactor) {
return false; return false;
} }
else if (this.trajDoIntrp != trajParams.trajDoIntrp) {
return false;
}
} }
return true; return true;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment