From fbefcf65f139f2ea0c2ca02b92b4fe021d348def Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Thu, 7 Nov 2013 21:04:46 -0600 Subject: [PATCH] Fix low limit on motor filter by impulse class to exclude motors at that limit. This prevents, for example, full C motors with 10Ns impulse from showing up as Ds. --- .../openrocket/gui/dialogs/motor/thrustcurve/ImpulseClass.java | 3 ++- .../gui/dialogs/motor/thrustcurve/MotorRowFilter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ImpulseClass.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ImpulseClass.java index 8f639c893..bb32530ea 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ImpulseClass.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ImpulseClass.java @@ -3,7 +3,8 @@ package net.sf.openrocket.gui.dialogs.motor.thrustcurve; public enum ImpulseClass { - A("A",0.0, 2.5 ), +// Impulse class A starts below zero to catch the MMX motors. + A("A",-1.0, 2.5 ), B("B",2.5, 5.0 ), C("C",5.0, 10.0), D("D",10.0, 20.0), diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorRowFilter.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorRowFilter.java index b4ac85e9f..febe014b4 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorRowFilter.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorRowFilter.java @@ -213,7 +213,7 @@ public class MotorRowFilter extends RowFilter implements Ch private boolean filterByImpulseClass(ThrustCurveMotorSet m) { if ( minimumImpulse != null ) { - if( m.getTotalImpuse() < minimumImpulse.getLow() ) { + if( m.getTotalImpuse() <= minimumImpulse.getLow() ) { return false; } }