hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1801 from JoePfeiffer/sort-by-stage

Browse Source 
Sort on source stage for simultaneous events
This commit is contained in:
Sibo Van Gool 2022-11-08 21:38:26 +01:00 committed by GitHub
commit 7625b2ee00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/net/sf/openrocket/simulation/FlightEvent.java
View File

@ -146,15 +146,33 @@ public class FlightEvent implements Comparable<FlightEvent> {
/** /**
* Compares this event to another event depending on the event time. Secondary * Compares this event to another event depending on the event time. Secondary
* sorting is performed on stages; lower (numerically higher) stage first. Tertiary
* sorting is performed based on the event type ordinal. * sorting is performed based on the event type ordinal.
*/ */
@Override @Override
public int compareTo(FlightEvent o) { public int compareTo(FlightEvent o) {
// first, sort on time
if (this.time < o.time) if (this.time < o.time)
return -1; return -1;
if (this.time > o.time) if (this.time > o.time)
return 1; return 1;
// second, sort on stage presence. Events with no source go first
if ((this.getSource() == null) && (o.getSource() != null))
return -1;
if ((this.getSource() != null) && (o.getSource() == null))
return 1;
// third, sort on stage order. Bigger stage number goes first
if ((this.getSource() != null) && (o.getSource() != null)) {
if (this.getSource().getStageNumber() > o.getSource().getStageNumber())
return -1;
if (this.getSource().getStageNumber() < o.getSource().getStageNumber())
return 1;
}
// finally, sort on event type
return this.type.ordinal() - o.type.ordinal(); return this.type.ordinal() - o.type.ordinal();
} }