2407 Commits

Author SHA1 Message Date
Billy Olsen
97c1112c56 Fix ground hit velocity calculation
The ground hit velocity is calculated by taking the last recorded
total velocity for the flight data and using that as the ground
hit velocity if the last altitude measurement is less than 10 m.

This method worked until commit f11a3e4 introduced the ability to
track and report all events that happened after a GROUND_HIT event.
That commit introduced a GroundStepper that will step between the
GROUND_HIT event and the SIMULATION_END event and will always
add a measurement to the flight data to record the rocket being on
the ground.

A better way of measuring the ground hit velocity is to interpolate
the velocity at the time the GROUND_HIT event, as that would actually
be the appropriate ground hit velocity.

Closes #576

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-06 07:33:33 -07:00
Daniel Williams
3aaf8c6802
Merge pull request #556 from neilbalch/java11-upgrade
Upgrade to Java 11/Java 13 and retire Android app
2020-03-03 21:36:44 -05:00
Daniel Williams
e51545d7f3
Merge pull request #570 from wolsen/add-railbutton-presets
Add railbutton presets
2020-03-03 18:44:53 -05:00
Neil
c0203b9267
Merge pull request #3 from teyrana/fix_java11_3d
[fix] Restores 3d Views to PR #556 -- Java 11 upgrade
2020-03-03 11:21:17 -08:00
Billy Olsen
e0983c05cc Add back instance panel dropped in previous commit
Adds back the instance options in the previous commit for specifying
instance details about rail buttons. This change adds it back but
slightly tweaks the layout and location in order to keep the config
panel in a 2 column arrangement.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-03 09:37:56 -07:00
Billy Olsen
3995a330da Add new material types for rail buttons
Add two new material types for rail buttons, delrin and nylon.
The material densities are pulled from wikipedia and cross-referenced
with Dupont's material database.

Additionally, set Delrin as the default material for RailButtons.

Closes #554

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-02 20:33:56 -07:00
Billy Olsen
f8993e89db Add rail button presets options
Allow rail buttons to define presets. This change doesn't actually add
any default presets to the library, but enables the ability to add some
preset options for rail buttons.

Partially Closes #554

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-01 18:32:32 -07:00
Billy Olsen
232b363712 Fix large rail button default size.
The default values assigned to RailButton sizes were configured with
a 1.0 meter outer diameter and 0.8 meter internal diameter (for 1010
rail buttons) which resulted in overly large rail buttons when added
using the default values.

Presuming that 1010 rail buttons are the common and an acceptable
default, change the default button sizes to align with the 1010 size.

Additionally, this change fixes some of the layout issues present in
add railbutton dialog.

Closes #554

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-01 18:26:30 -07:00
Daniel_M_Williams
5e3dbb6575 [fix] Restores 3d Views to PR #556 -- Java 11 upgrade 2020-02-29 20:44:42 -05:00
Neil
cea5229fbf
Merge pull request #2 from teyrana/retire_android
Due to lack of interest, the Android client is being retired.
2020-02-23 09:13:06 -08:00
Daniel_M_Williams
9a33599428 [Retire Android Client] Due to lack of interest, the Android client is being retired. 2020-02-23 08:54:22 -05:00
Neil
df8aee842b
Merge pull request #1 from teyrana/java11-upgrade
Changed SDK name; Added Resource directories
2020-02-20 20:49:39 -08:00
Daniel_M_Williams
aeab0c3d81 [fix] added example rockets to jarfile 2020-02-19 22:30:32 -05:00
Daniel Williams
da5dcca83d
Revert PR#543 -- Change causes a stack overflow while during simulation of certain rockets.
Revert "Fix 525" -- PR causes Stack Overflow when simulating other rockets.
2020-02-15 10:40:39 -05:00
Daniel Williams
95d497827d
Revert "Fix 525" 2020-02-15 09:23:01 -05:00
Daniel_M_Williams
c12e405467 [fix] local JDK pathing fixes to make branch work on my machine 2020-02-15 08:42:40 -05:00
Daniel Williams
64514ed514
Merge pull request #521 from JoePfeiffer/fix-361 -- Extend simulation until last motor burns out
Fix 361
2020-02-14 21:58:10 -05:00
Daniel Williams
be02f99f7e
Merge pull request #543 from JoePfeiffer/fix-525
90% of this is just refactoring APIs, and I think those are migrating to a clearer, more succinct form. 👍 +1
2020-02-10 22:21:36 -05:00
Neil Balch
f26e3afcf3 Upgrade codebase to Java 11 2019-10-28 08:56:05 -07:00
Wes Cravens
0509f9e8ec
Merge pull request #545 from bweissinger/unstable
[Fix #544] InnerTube.getInstanceOffsets() returning Coordinate.ZERO for single inner tube
2019-09-01 11:26:13 -05:00
bweissinger
778413c882 Correct InnerTube.getInstanceOffsets() returning Coordinate.ZERO instead of actual offset values 2019-09-01 00:42:39 -05:00
JoePfeiffer
ffef415ed5 Added an emacs work file by accident. Removing it here 2019-06-17 15:31:09 -06:00
JoePfeiffer
934cccb811 Was thinking about getting rid of RocketUtils since it's only used by android app; there's no harm in leaving it... 2019-06-17 15:28:50 -06:00
JoePfeiffer
85c21e5812 This is a much bigger commit than I like to make, and will result in a much bigger
PR than I like as well.  All I can do is apologize...

Fixes length calculation in RocketPanel.

(1) Finished switching over from deprecated getBounds() function to getBoundingBox().
getBounds() function is removed.

(2) 3D rendering code had its own getBounds().  Switched this over to
RocketComponent:getBoundingBox() as well

(3) Made getBoundingBox() consistently get the bounding box relative to the component.
Implementations for some components were calculating box relative to start of rocket

(4) Used InstanceMap to iterate through all instances of components in creating bounding box.
2019-06-17 15:25:27 -06:00
JoePfeiffer
1b188e20be finished first draft of fixing lengths 2019-06-10 17:04:09 -06:00
JoePfeiffer
719576cc62 bunch of changes along the way to fixing length calculation 2019-06-10 17:04:08 -06:00
Wes Cravens
b5cde10824
Merge pull request #519 from JoePfeiffer/fix-516
fix issue 516
2019-05-29 10:25:33 -05:00
Wes Cravens
7acaaf18d5
Merge pull request #535 from teyrana/fix_497
[fix #497] Disables Fin-Thickness-Warnings on Phantom Fins
2019-05-29 10:25:24 -05:00
Wes Cravens
02634fef6f
Merge pull request #533 from teyrana/fix_525_zero_diameter
Fixes #525; Main Figure display rocket diameter again.
2019-04-10 10:47:46 -05:00
Wes Cravens
ef08041802
Merge pull request #530 from JoePfeiffer/fix-527
Fix #527
2019-04-10 10:47:26 -05:00
Wes Cravens
48adb703d3
Merge pull request #523 from JoePfeiffer/fix-522
Fix 522
2019-04-10 10:46:44 -05:00
Wes Cravens
5a0338515c
Merge pull request #520 from teyrana/fix_482_grid
[Fixes #482][graphics] adjusts line color and width in FinPointFigure
2019-04-10 10:46:25 -05:00
Daniel_M_Williams
0823de5e2a [fix #497] Disables Fin-Thickness-Warnings on Phantom Fins 2019-04-04 19:08:45 -04:00
Daniel_M_Williams
93a60c94f7 [fixes #525] main window (again) displays max diameter of centerline components
-- added FlightConfiguration::getCoreComponents() method
2019-03-31 09:34:08 -04:00
JoePfeiffer
d635ed4c74 Remove validation when modifying fin tab 2019-03-19 14:35:45 -06:00
JoePfeiffer
f51ce5e931 oops, that shouldn't have been in there 2019-03-13 14:51:06 -06:00
JoePfeiffer
18ce41d9e7 Modified setTabHeight, setTabLength, and setTabOffset to take a second
parameter, determining whether to validate fin tab, and made them
private.

Created two public wrappers for each, one calling for validation
(which has the same signature as the original three methods), and the
other not.

Called NoValidate versions of the three in file loading functions so
validation doesn't interfere with tab length when tab is read before
fin.

Tried to make the coding of the three more consistent with each
other.
2019-03-13 14:45:30 -06:00
JoePfeiffer
efacebf5d8 Refactored MassCalculation.calculateAssembly() to separate calculation
of structure from calculation of motors, so mass and CG overrides
don't affect motors

Modified structure calculation so that when an override is in effect
and children are also being overridden, don't include root of tree as
an element in its own right when computing MOI.

Modified MassCalculatorTest to look for correct MOI value.
2019-03-07 18:05:44 -07:00
JoePfeiffer
fc5ef54d9d Modify comments on public accessors to match code 2019-03-04 11:23:49 -07:00
Wes Cravens
6efc7e42a1
Merge pull request #518 from ChrisMickelson/unstable
Spashscreen update for 2019
2019-03-04 11:45:55 -06:00
Wes Cravens
85fba669cd
Merge pull request #515 from teyrana/alpha12
[version] bump to alpha-12
2019-03-04 11:45:41 -06:00
Wes Cravens
d22b0f3154
Merge pull request #517 from JoePfeiffer/fix-481
Fix 481
2019-03-04 11:45:27 -06:00
JoePfeiffer
cf63044c42 Oops, I shouldn't have added that to my repository 2019-02-20 19:08:42 -07:00
JoePfeiffer
f11a3e4d69 Fix issue 361
Continue a simulation until there are no more flight events, instead
of terminating on landing.  Add warnings for all events that occur
after landing.
2019-02-20 19:05:58 -07:00
JoePfeiffer
eeb82c4573 Add warning when flight events remain in queue at ground hit time
(addresses issue #361)
2019-02-19 13:21:58 -07:00
Daniel_M_Williams
e45e116b97 [graphics] adjusts line color and width in FinPointFigure 2019-02-17 11:33:56 -05:00
JoePfeiffer
eb3a129e67 Modify FinSetCalc to only produce result for one fin, to be summed in
BarrowmanCalculator

Modify BarrowmanCalculator to actually sum fin nonaxial forces

Modify FinSetCalcTest to sum fins in test3Fin() and test4Fin()

Extra bonus:  if at some point we allow fins to be other than radially
symmetrical, this code should still work (not tested)
2019-02-11 15:37:21 -07:00
JoePfeiffer
6c535bff94 Modified thrustcurve serialization to be more robust in the case of
some common (but generally not important) errors in thrustcurves, and
not enter thrustcurves that will cause simulation failures into the
database.

(1) Permits thrustcurves to start at time 0 with a nonzero thrust.
Previous code inserted a datapoint with time 0 and thrust 0; this
caused thrust interpolation code to fail while running a simulation.
If the first datapoint is at a time greater than 0 it does enter a
(0, 0) datapoint, as this is the correct documented behavior for RASP
files.

(2) Permits thrustcurves to end with a nonzero thrust.  Similarly to
the previous case, the old code entered a new datapoint at the same
time as the previous end of thrust with thrust 0, which would break
thrust interpolation.

(3) Thrustcurves that have a zero-thrust datapoint and a non-zero
thrust datapoint at time 0 have the first datapoint removed.

(4) Thrustcurves with more serious errors -- mainly multiple thrusts
at a single time -- aren't entered into the database, as they will
break thrust interpolation and there is no obvious way to guess which
of the datapoints is correct, or to see how to average them.
2019-02-09 18:00:30 -07:00
ChrisMickelson
ec0e1a2353
Update splashscreen copyright year to 2019 2019-02-06 14:15:34 -06:00
ChrisMickelson
a91fbb0ab5
Splashscreen source file update for 2019
Gzipped xcf file as well as png. Changed copyright year to 2019.
2019-02-06 14:13:46 -06:00