2532 Commits

Author SHA1 Message Date
Daniel_M_Williams
ac6ae0b440 [fix] 2D display of Cg and Cp values now respects the rotation slider 2020-05-07 17:47:56 -04:00
Daniel_M_Williams
2a524c2855 [fix] 2D Rocket Figure will now display off-axis CoM and CoP values 2020-05-06 15:26:06 -04:00
Daniel Williams
91652e7e4f
Merge pull request #652 from JoePfeiffer/fix-648
Avoid considering cp with 0 weight when calculating worst-case CP for display in RocketInfo
2020-05-05 23:00:39 -04:00
JoePfeiffer
2d9239fe5b When determining worst-case CP, only consider cases where the CP's weight is non-zero 2020-05-05 10:46:31 -06:00
JoePfeiffer
51b2f7a03f cp.weight doesn't have any obvious relationahip to mass. We may want to revisit the idea of having a separate minimum cp.weight, but for the moment just making it be MathUtil.EPSILON removes the confusion and doesn't change behavior (MassCalculator.MIN_MASS is set to MathUtil.EPSILON in that class) 2020-05-05 10:37:22 -06:00
Daniel Williams
db63de492e
Merge pull request #644 from JoePfeiffer/fix-627b
Small tweaks on database download from thrustcurve.org
2020-05-04 00:42:13 -04:00
Daniel Williams
1430f7b140
Merge pull request #639 from alexkarezin/readme-link-to-dashboard
[Documentation] Linking project overview dashboard to README
2020-05-04 00:40:36 -04:00
Daniel Williams
8288de651f
Merge pull request #646 from teyrana/640-fix-dialog-close
[fixes #640] Dialogs should now close with the [x] button
2020-05-02 12:01:59 -04:00
Daniel_M_Williams
d038b1b190 [fixes #640] Dialogs should now closing with the [x] button in the corner. (and 'close' button. And ESC) 2020-05-02 11:15:46 -04:00
JoePfeiffer
834fb73617 Some thrust curves had two data points at the end of the curve, one with a thrust of 0. We can delete the 0-thrust point and accept the curve.
One (KBA K1750) had a duplicate (time and thrust both equal) data point.  Delete the duplicate and accpept
2020-05-01 10:21:33 -06:00
JoePfeiffer
16091b456d Clarifying error message when there are two data points for a single time.
I wrote the original, and I still didn't understand it when I came across it for the first time in a few months!
2020-05-01 09:55:33 -06:00
alexkarezin
3ea7fd2520
as requested - moving to the header of the file 2020-04-30 12:17:22 -04:00
alexkarezin
b89189dc1d
Linking project overview dashboard to README
Adding a link to the README header. The linked dashboard describes overall repository structure. The goal is to help new developers explore project and understand architecture/dependencies. Direct link: https://sourcespy.com/github/openrocketopenrocket/
2020-04-30 11:32:16 -04:00
Daniel Williams
1c7171eff2
Merge pull request #626 from teyrana/fix/555/fff/update
[Resolves #555] editing FreeformFins now updates main window
2020-04-25 18:01:05 -04:00
Daniel_M_Williams
da2fea3468 [fix] fixed unit tests for FreeformFinSet, due to fixing #555 2020-04-25 17:51:52 -04:00
Daniel_M_Williams
77bc272e7b [fix] FreeformFins now update main RocketWindow when a point is changed 2020-04-25 17:13:51 -04:00
Daniel Williams
a230d42fab
Merge pull request #630 from teyrana/fix/551/duplicate-button
[fixes #551] [UI] removed 'add stage' text button; reordered remaining buttons
2020-04-25 13:16:49 -04:00
Daniel_M_Williams
bbe2598454 [ui] removed 'add stage' text button; reordered remaining buttons 2020-04-25 13:15:27 -04:00
Daniel Williams
77382e4fc0
Merge pull request #635 from itshanney/fix/text-files-cleanup
[Documentation] Cleanup of text files in repo
2020-04-25 12:51:30 -04:00
Justin Hanney
2a3950fce9 Remove core/TODO; Tweak README.md 2020-04-24 20:02:14 -07:00
Justin Hanney
3116188c1d Adjust formatting for README.md 2020-04-24 20:02:03 -07:00
Justin Hanney
9c50efc708 More unify formatting of ChangeLog 2020-04-24 20:01:53 -07:00
Justin Hanney
5c7f255668 Unify formatting of ChangeLog 2020-04-24 20:01:45 -07:00
Justin Hanney
c0e3a9c497 Remove redundant README.TXT in favor of README.md 2020-04-24 20:01:34 -07:00
Justin Hanney
6adc19b267 Merge README.TXT into README.md 2020-04-24 20:01:27 -07:00
Justin Hanney
1dae23133b Move ChangeLog and README.TXT to root folder 2020-04-24 20:01:12 -07:00
Daniel_M_Williams
2203a3d18c [fix] restores travis-ci commenting on PRs 2020-04-24 18:14:32 -07:00
Daniel Williams
7934f0beec
Merge pull request #633 from JoePfeiffer/fix-627
Fix 627
2020-04-23 10:48:06 -04:00
JoePfeiffer
bf6624fb70 I can't find anywhere that these classes are imported by anything else 2020-04-22 09:29:57 -06:00
JoePfeiffer
b9a881c5c9 The deleted methods (setTotalThrustEstimate(), setBurnTimeEstimate(), setAverageThrustEstimate(), and setMaxThrustEstimate()) were never called. The member variables maxThrust, burnTimeEstimate, averageThrust, totalImpulse are all calculated by computeStatistics() and the values (if any) from the thrustcurve file are ignored. 2020-04-22 09:29:57 -06:00
Billy Olsen
58b92be39e Fix FreeformFinSetTest unit test
FreeformFinSetTest.testFreeformCMComputation_triangleOnTransition
was broken with the last merge. This change updates the expected
area for the fin tab to be the area of the triangle under the
curve as well as update the new CG contants in the tests.

Identified in #631

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-04-21 14:40:09 -07:00
Daniel_M_Williams
4326c71c71 [address 618] improves display of freeform fin tabs on transition bodies 2020-04-20 07:58:55 -07:00
Daniel Williams
37e1180963
Merge pull request #628 from wolsen/move-unit-test
Move MotorRowFilterTest into correct package
2020-04-19 23:28:11 -04:00
Joe Pfeiffer
ebd994ea03
Merge pull request #629 from wolsen/delete-errant-log
Remove openrocket.log from tree
2020-04-19 21:22:35 -06:00
Billy Olsen
4590d7d1b8 Remove openrocket.log from tree
Remove the openrocket.log file that is errantly in the tree.
Update .gitignore to not include openrocket.log in the future.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-04-19 20:15:40 -07:00
Billy Olsen
bbf60e0bba Move MotorRowFilterTest into correct package
MotorRowFilterTest lives in the wrong package and causes Eclipse
to fail building. Oddly, it still builds using the ant commandline,
but since it declares it should be in the package
net.sf.openrocket.gui.dialogs.motor.thrustcurve this change moves
it to the location it declares.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-04-19 19:58:51 -07:00
Daniel Williams
bd8bef2c85
Merge pull request #602 from wolsen/fix-stage-length
[Fixes 452] Reflect length of selected stages
2020-04-19 22:34:09 -04:00
Billy Olsen
b7345f5c3c Correctly calculate the maximum height for side view.
When calculating the subject dimensions, use the height as the
radius of the circle which intersects all four corners of the
BoundingBox in the Y, Z plane for both the rear view and the
side view. The rear view was already doing this, but it was
non-obvious that the side view should also be using this to
calculate the height.

It becomes obvious if we think about a winged rocket, i.e. a
rocket who's fins in the Z direction are larger than those in
the Y direction. In this configuration, a height based off of
the fins in along the Y-axis alone will result in a "Fit" scaling
which encapuslates the Y-axis fins. However, rotating that
rocket will move the larger wings (the Z-axis fins) into the
view, but the height will not allow for the wings to draw properly
on the screen.

Thusly, using the radius from the circle intersecting the bounding
box along the Y, Z plane will ensure that the widest point from the
body will be able to fit within the side view, regardless of the
rotation around the X axis.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-04-19 19:15:54 -07:00
Billy Olsen
355bfb61c1 Use FinSet.getBoundingBox() when computing bounds
Use the FinSet.getBoundingBox() when computing the bounds for the
current configuration in FlightConfiguration.calculateBounds().
The FinSet already contains a BoundingBox method, however it returns
a larger BoundingBox than necessary to encapsulate the component.

Change the FinSet.getBoundingBox() to create a bounding box of the
smallest size to ensure a tight bounds for the FinSet. This is done
by taking each of the locations for the component and determining
where the fin tip point is and updating the BoundingBox with this
location.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-04-19 19:15:14 -07:00
Daniel Williams
7ddcd9ed6b
Merge pull request #622 from JoePfeiffer/fix-620
[Fixes 620] avoid prevent null strings in new motors
2020-04-18 10:44:24 -04:00
JoePfeiffer
6dc1f6c194 unit test for MotorRowFilter 2020-04-17 08:44:12 -06:00
JoePfeiffer
839f555d55 Fixed spelling error getTotalImpuse() => getTotalImpulse() 2020-04-16 13:47:45 -06:00
JoePfeiffer
ede47666f9 Modified ThrustCurveMotor to ensure all fields have sane default values
Created MotorRowFilterTest unit test
2020-04-16 11:36:47 -06:00
Billy Olsen
25475a92fb Rework the FlightConfiguration.calculateBounds() for instances
Use the information provided in the getActiveInstances() in order to
calculate the length of the rocket. This change takes each component
instance and uses the component bounds and the instance's transform
in order to determine the instance's actual bounds. The length is
then calculated as the difference between the min and max X values,
using the BoundingBox.

Note, this particular change special-cases a few of the components
in order to get the right length. It is preferred to revisit each
special case in subsequent patches in order to keep this patch set
minimal for the time being.

The length calculations are already stressed during unit tests, but
the results are a bit more accurate and thus the unit tests are
updated to reflect the new values.

Fixes #452

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-04-12 18:18:17 -07:00
Daniel Williams
7745563c0d
Merge pull request #614 from itshanney/bugfix/remove-guice-warnings
Update guice library to remove AOP; Fixes issue #609
2020-04-06 21:45:55 -04:00
Daniel Williams
d61d0e47c7
Merge pull request #617 from teyrana/fix/536-fin-npe
[Fixes #536] NullPointerException while editing FreeformFinSet Components
2020-04-06 21:33:40 -04:00
Daniel_M_Williams
1ec588dff4 [refactor] converted Rocket.listenerList from ArrayList -> HashSet 2020-04-06 21:32:39 -04:00
Daniel_M_Williams
336b899a06 [fix] reworks / fixes the way ComponentConfigDialogs are closed
- Close hooks are now called for all methods of closing a dialog ('close', 'X', and escape)
- Adds a rocket.removeComponentChangeListener to close hook
- removes redundant / buggy methods
2020-04-06 21:25:55 -04:00
Daniel_M_Williams
24ae797959 [fix] Merged duplicate class-instance 'finset' property with parent's 'component' property. 2020-04-06 21:25:55 -04:00
Daniel_M_Williams
644404b070 [fix] Adds duplicate guard when add a 'ComponentChangeListener' to the rocket 2020-04-06 21:25:54 -04:00