1932 Commits

Author SHA1 Message Date
JoePfeiffer
f5265ffcb5 Fire a change event to update the UI when FinSet::setTabOffsetMethod() is called. 2020-12-12 19:14:19 -07:00
JoePfeiffer
f8430c6504 Calculate fintab height from body radii at for and aft fintab extents, instead
of assuming constant radius body tube
2020-12-12 19:13:08 -07:00
JoePfeiffer
afbccd416d Fix call to types.toArray() in ComponentPresetDatabase.java to generate array using correct type instead of trying to do a cast. 2020-12-09 16:14:04 -07:00
JoePfeiffer
123aa2d296 In FreeformFinSet.java:update, only validate freeform fin tab length if fin length has changed (ie don't revalidate when fin tab length has changed) 2020-12-02 19:18:35 -07:00
JoePfeiffer
b5a68a7636 Add logging for debug 2020-12-02 19:18:35 -07:00
JoePfeiffer
495ef34970 Merge old findMotor() and findMotors() methods in ThrustCurveMotorSetDatabase.java
Turns out the motor digest hash function can have collisions.  Since the digest is stored in the .ork file we don't want to rewrite it as that will cause *lots* of spurious "thrust curves don't match" warnings, and I really don't want to get into looking up by some sort of new digest if it exists else old digest.

Since some motor description fields are also stored in the .ork file, I'm effectively using these as a key to resolve collisions.  Now that I need to pass them in to the findMotor() method, I'm merging it with findMotors() (which searches based on motor descriptions)

New combined method returns all motors that match digest and description;
If there are none returns all motors that match digest;
If there are none returns all motors that match description (may be empty)

Passing a digest and no other description emulates the behavior of the old findMotor() (but it may return more than one motor).
Passing description elements and no digest duplicates the behavior of the old findMotors()
2020-11-17 15:02:58 -07:00
JoePfeiffer
db64a85a3a add logging to ThrustCurveMotorSetDatabase for debug 2020-11-17 10:41:54 -07:00
Joe Pfeiffer
6582b24bc4
Merge pull request #809 from JoePfeiffer/fix-807
get rid of error message when no data for motor in specified format (fixes #807)
2020-11-07 09:43:08 -06:00
Daniel_M_Williams
6d4c1eb20d [doc] Update version string to '20-11-alpha-16' 2020-11-07 10:38:07 -05:00
JoePfeiffer
d231cb320f Get rid of a bit of duplicate code
Handle case with no data in specified format for motor
2020-11-05 10:41:15 -07:00
Daniel_M_Williams
cf8b40229b [fixes #751] Unifies angle-offset labels to 'Rotation' for component config dialogs 2020-11-01 19:51:13 -05:00
Daniel_M_Williams
c9d408a8ee [fix #801] eliminate redundant angle-offset property in LaunchLug component 2020-11-01 19:38:16 -05:00
Daniel Williams
67fed96137
Merge pull request #672 from JoePfeiffer/use-simulation-options
Use simulation options (addresses
2020-11-01 18:54:10 -05:00
JoePfeiffer
8cf94a57f0 add logging to SimulationStatus for debugging 2020-10-20 09:53:28 -06:00
Daniel_M_Williams
ccc8e4ab80 [fixes #774] Override-component-mass works correctly on massive components 2020-10-15 10:28:08 -07:00
Daniel_M_Williams
a4e7f2175c [fixes #775] component override-CoM-x works correctly
mass calculations now correctly treat the center-of-mass offset as relative to the individual
component (whereas, previously, it was an absolute offset / relative to the center of the rocket)
2020-10-15 10:28:08 -07:00
JoePfeiffer
96f46867c1 Get rid of unnecessary line feed to clean up indentation 2020-10-10 09:39:37 -06:00
JoePfeiffer
0381be91ca Check that next symmetric component, if non-null, is active 2020-09-30 20:40:28 -06:00
JoePfeiffer
796d245bbe fireChangeEvent() when activating/deactivating a stage to force recalculation of bounds on stage separation 2020-09-26 17:42:57 -06:00
JoePfeiffer
1036ac98bf add logging to BarrowmanCalculator for debugging 2020-09-26 16:41:00 -06:00
JoePfeiffer
a44c90d522 Since FlightConfiguration:getContextListAt() is now only returning contexts which are active, change name to getActiveContextListAt(). Note that it's only ever called from FlightConfiguration:getActiveInstances() and recursively, so this is making the two method names consistent. 2020-09-12 14:49:21 -06:00
JoePfeiffer
5e64b3e565 Correct FlightConfigurationTest to enable Stage 1 of Falcon9Heavy before using getActiveInstances() to obtain its component instances 2020-09-12 12:29:24 -06:00
JoePfeiffer
20ab8ef8b1 Only calculate instancemap from active components
One thing to mention is I had a choice of either adding a special case for the rocket itself, or change the result of isStageActive for stage -1 to be true instead of false as previously.  I couldn't see a place where the previous version mattered, so I changed it.
2020-09-09 17:17:10 -06:00
JoePfeiffer
206ba58a7e Modified MassCalculator unit test to test at nonzero ignition time 2020-09-09 17:10:29 -06:00
JoePfeiffer
f5d56f6e99 Correct motor mass calculation for motor ignition time
Adds the MotorClusterState from the current SimulationState to the MassCalculation constructor.  The ignition time of each motor is subtracted from the current simulationTime to calculate its current mass.

MassCalculation is also used for static analysis; in this case a synthetic time is passed (and there is no SimulationState).  In this case, a null is passed in to the MassCalculation constructor; whether or not this the case is used to determine whether or not to calculate a motor time based on its ignition time.

Also clamp motorTime from MotorClusterState to be no less than 0 when calculating motor mass.
2020-09-09 17:10:29 -06:00
JoePfeiffer
b64a3b3fa8 The simulation now uses mass data from the entire motor as a unit,
rather than separating out the propellant data.  This commit clarifies
the code by replacing instances of "propellant" with "motor" in
variable names and messages where appropriate.

It does not update the translations into other languages.
2020-09-09 17:10:29 -06:00
Daniel Williams
3f7009b9f7
Merge pull request #769 from teyrana/fix/755/cg-error
[fixes #755] Correctly calculate cg.x override
2020-09-05 15:11:47 -04:00
Daniel_M_Williams
bd09354fd3 [fixes #755] Correctly calculates mass override (particularly on stages) 2020-09-02 22:33:39 -04:00
Daniel_M_Williams
685b40ef2f [fix][ui] Change Display name for MassComponent from 'Unspecified' to 'Mass Component' 2020-09-01 20:14:49 -04:00
Daniel_M_Williams
5b94bedb5f [fixes #755] Correctly calculate cg.x override 2020-09-01 19:58:17 -04:00
Daniel_M_Williams
58712cb69f [fix] RocketFigure now zooms to whole rocket extents even iff stages are deactivated 2020-09-01 19:14:19 -04:00
Daniel_M_Williams
b9992674ef [fix] writes new tests to for BoundingBox behavior 2020-09-01 19:14:19 -04:00
Daniel_M_Williams
b0bc372ece [fix] FlightConfiguration now correctly calculates the bounds of partially-active rockets 2020-09-01 19:14:18 -04:00
Daniel_M_Williams
81b2f60e55 [feat] Implements BoxBounded interface on several RocketComponents 2020-09-01 19:14:18 -04:00
JoePfeiffer
94a5e1c2d9 fix typo -- two missing right parentheses 2020-08-30 11:44:19 -06:00
JoePfeiffer
724cd3f5dc Don't set a warning if recovery device is deployed (for instance, due to apogee detect) while motor is coasting.
Background:  a motor that has burned out can be in one of two states:  DELAYING (the delay charge has not yet fired) or SPENT (either the delay charge, if any, has fired or there was no delay charge).

The existing SimulationStatus:getActiveMotors() method returned a list of motors that were active for the stage, and which were not SPENT.  The test for the warning redudantly tested for a SPENT motor, still didn't test for a DELAYING motr, and consequently set the warning.

This PR
(1) adds a boolean MotorClusterStatus:isDelaying() method, analogous to the existing state test methods

(2) modifies SimulationStatus.java:getActiveMotors() to return all the motors, not just the ones that aren't SPENT.  This is to improve consistency with FlightConfiguration:getActiveMotors(), and to make for a more consistent usage between the two calls to the method.

(3) adds !isDelaying() to the test for the warning.
2020-08-30 11:18:57 -06:00
Daniel_M_Williams
e33353cf68 [fix] Restores functionality of OptimizationDialog 2020-08-23 22:00:53 -04:00
Daniel_M_Williams
a00636a1ed [fix] migrates calls from 'simulation.rocket.selected' -> 'simulation.activeconfig' 2020-08-23 22:00:53 -04:00
Daniel_M_Williams
728964531b [refactor][cleanup] refactored optimization.parameters.StabilityParameter -- shortened function, and removed deprecated function call 2020-08-23 22:00:52 -04:00
Daniel_M_Williams
7c72f3a231 [cleanup] adds 'final' keyword in RocketComponent.findComponent(...) 2020-08-23 22:00:52 -04:00
Daniel_M_Williams
41c06572a7 [fix] Rockets now correctly copy their FlightConfigurations 2020-08-23 22:00:51 -04:00
Daniel_M_Williams
1eb329b850 [fix] when copying documents, the simulation->FlightConfigurationId is correctly copied 2020-08-23 22:00:51 -04:00
Daniel_M_Williams
70cbc54daf [cleanup] Applies a bunch of changes suggested by the linter in the Optimization Code 2020-08-22 11:18:03 -04:00
Daniel_M_Williams
aa90feb61b [version] increments the build label to '20-08-alpha-15' 2020-08-22 09:47:22 -04:00
Daniel_M_Williams
28ba049975 [fix] Fixed compile issues; Dialog now opens cleanly 2020-08-22 09:47:22 -04:00
JoePfeiffer
99bdf71ba8 In FinSetCalc.calculateFinGeometry(), make sure x coordinates of interections
between lines defining fins and strips being used to estimate geometry aren't beyond bounds of fin.
2020-08-17 17:39:08 -06:00
Daniel_M_Williams
a9afb829ef [cleanup] cleans up some whitespace and redundant variables in FlightConfiguration 2020-08-16 14:34:22 -04:00
Daniel_M_Williams
8a14d98fcc [fixes #741] RailButtons will correctly identify their first parent BodyTube 2020-08-16 14:32:29 -04:00
Daniel_M_Williams
68927a0e53 [fixes #740] Railbuttons now correctly load instance-separation
Actual fix: removed debugging / dev hard-coding.  /facepalm
2020-08-14 19:29:24 -04:00
Daniel_M_Williams
eb197427f2 [fix] tightens up calculation of adjacent SymmetricComponents 2020-08-14 18:51:54 -04:00