hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,370 Commits 2 Branches 43 Tags
Commit Graph

3370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Williams
709ded2659
Merge pull request #765 from JoePfeiffer/fix-762 
Don't set a warning if recovery device is deployed while motor is coasting
 2020-09-01 19:13:03 -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 Williams
9ca6b0be1a
Merge pull request #709 from teyrana/fix/optimizer 
[fixes #701] Re-enables Rocket Optimizer
 2020-08-26 10:43:51 -04: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
d3a66294d1 [rm][refactor] Optimization Dialog now allows optimizing only on existing, defined simulations 2020-08-23 22:00:53 -04:00
Daniel_M_Williams
73e8caa0e5 [tweak] adjusted default size for the optimization dialog 2020-08-23 22:00:52 -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
1d552f99f9 [fix] 'Edit Simulation' Dialog now correctly displays the associated flight configuration 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
9f8ed13713 [fix][optimizer] update the in-dialog figure when the user clicks 'apply optimization' 2020-08-22 09:47:22 -04:00
Daniel_M_Williams
d7c0e9d8ac [fix] prevented exception when you remove a optimization row while editing it. 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
Joe Pfeiffer
75c72806f9
Merge pull request #750 from JoePfeiffer/clamp-calculateFinGeometry 
clamp x coordinate of intersections
 2020-08-18 21:10:37 -06: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 Williams
08f49d6a04
Merge pull request #749 from teyrana/fix/741-render-rail-button 
Fix/741 render rail button
 2020-08-16 14:44:58 -04: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 Williams
e90318a7ac
Merge pull request #745 from teyrana/fix/740-button-save-load 
[fixes #740] Railbuttons now correctly load instance-separation
 2020-08-14 19:34:24 -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 Williams
56135aafd4
Merge pull request #744 from teyrana/742-load-crash 
Resolves #742 - Crash on rocket-load
 2020-08-14 19:01:03 -04:00
Daniel_M_Williams
eb197427f2 [fix] tightens up calculation of adjacent SymmetricComponents 2020-08-14 18:51:54 -04:00
Daniel_M_Williams
ac1d6b698a [refactor] streamlined null checks in SymmetricComponent.get{Prev|Next}SymmetricComponent 2020-08-14 18:40:10 -04:00
Daniel_M_Williams
bbf9c4d8a4 [refactor] adjusted variable names in SymmetricComponent.get{Prev|Next}SymmetricComponent to be more obvious 2020-08-14 18:40:10 -04:00
Daniel_M_Williams
db79511184 [fix][comment] fixed test explanatory comment to be accurate 2020-08-14 18:09:39 -04:00
Daniel Williams
168fa689c5
Merge pull request #737 from teyrana/fix/fffzoom 
Fix/FreeformFinConfig - editing fin points
 2020-08-14 16:48:27 -04:00
Daniel_M_Williams
748a871e57 [fix] limits a FreeformFinSet maximum size to 2.5m x 2.5m. This prevents a stack-overflow while editing 2020-08-14 16:38:39 -04:00
Daniel_M_Williams
b960d37a4a [fix] dragging fin points will now drag the view pane (preventing a user from dragging a point out of view) 2020-08-14 16:37:45 -04:00
Daniel_M_Williams
08c5ecafdf [fix] zooming in and out now zooms center-to-center 2020-08-09 15:18:54 -04:00
Daniel_M_Williams
ae83846e4e [fix] restored autozoom behavior on figures -- particularly FinPointFigure 2020-08-09 11:07:35 -04:00
Daniel Williams
1eeef10a5f
Merge pull request #739 from teyrana/fix/699-select-stage 
[fix] resolves issue #699,  fixes PR #738, which only partially selected the first stage
 2020-08-09 11:07:00 -04:00
Daniel_M_Williams
a1f17b8f7f [fix] resolves issue #699, fixes PR #738, which only partially selected the first stage 2020-08-09 11:06:11 -04:00
Daniel Williams
73bd52fde9
Merge pull request #738 from teyrana/fix/699-select-sustainer 
[fixes #699] pre-select first AxialStage on Rocket-Open
 2020-08-08 18:27:05 -04:00
Daniel_M_Williams
4cd56c1616 [fixes #699] preselect first AxialStage on Rocket-Open 2020-08-08 18:26:12 -04:00
Daniel Williams
b17d03138a
Merge pull request #731 from teyrana/fix/726-positioning 
[Fixes #726] Fixes multiple issues when changing Fin-Offset-Methods
 2020-08-08 11:25:26 -04:00
Daniel Williams
b62f9fc753
Merge pull request #734 from teyrana/fix/724/motor-dimensions 
[fixes #733][fixes #724] Fix the motor-selection-dialog unit updating
 2020-08-08 11:24:47 -04:00
Daniel Williams
1471a33a0d
Merge pull request #736 from JoePfeiffer/fix-725 
Don't create new SimulationStatus on landing.
 2020-08-08 11:24:38 -04:00
JoePfeiffer
23c39d5aef Don't create new SimulationStatus on landing. 
Makes consistent with BasicLandingStepper; more generally, if you don't need a more specialized derived from SimulationStatus (as is the case with RK4SimulationStepper), you don't need to create a new SimulationStatus when entering a new flight phase.
 2020-08-06 14:19:33 -06:00
Daniel_M_Williams
0a0fcc96a9 [fixes #724] Fixes unit-updating in rocket-motor-selection 2020-08-03 23:23:40 -04:00
Daniel_M_Williams
1a261a7c75 [fixes #733] fixes rare bug -- rocket sometimes sends events to deleted ComponentConfigDialog instances 2020-08-02 17:40:09 -04:00
Daniel Williams
917503149c
Merge pull request #732 from teyrana/refactor/reduce180 
Refactor out deprecated functions.
 2020-08-02 16:49:54 -04:00
Daniel_M_Williams
aeae4b1e03 [refactor] ported reduce360 -> reduce2Pi. Because the units are in radians 2020-08-02 16:49:32 -04:00