1482 Commits

Author SHA1 Message Date
Daniel_M_Williams
612f64fa4c [Bugfix] Merge with commit 4c00a206531968aab2e048ea4f9ef7e27e12dd52 2015-12-22 21:17:35 -05:00
Daniel_M_Williams
bc906c6652 [Bugfix] moved ConfigurationTest to FlightConfigurationTest
- in FlightConfiguration:
  -- adjusted functions to consistently refer to <x>ActiveMotors()
  -- corresponding functions now act the same way
- removed '.release()' calls from FlightConfiguration
2015-12-20 22:21:33 -05:00
Daniel_M_Williams
af56da4162 removed event handling from deploy & separate configs 2015-12-20 22:07:14 -05:00
Daniel_M_Williams
3f4cf696c1 [Bugfix] Test Patch which replaces event-passing in FlightConfiguration with a simple 'update()'
- listener lists removed from FlightConfiguration
- listener lists removed from MotorConfiguration
- added update() calles to Rocket FlightConfigurationSet, other configs
- merged FlightConfigurable into FlightConfigurableParameterSet
- Fixed ParallelStageTest
- updated some function calls in/to FlightConfiguration
2015-12-20 21:47:13 -05:00
Daniel_M_Williams
8e2d4f1b95 minor unit test fixes: pstage, finset 2015-12-20 12:21:21 -05:00
Daniel_M_Williams
4a075fcc2e fixed instance count saving for parallel stages 2015-12-20 12:05:19 -05:00
Daniel_M_Williams
ce215a4bb0 added rocket.enableEvents() calls to TestRockets.java 2015-12-18 13:32:19 -05:00
Daniel_M_Williams
b6c30a59ba fixed extra capitalization of FlightConfigurationId 2015-12-16 20:19:32 -05:00
Kevin Ruland
4c00a20653 Remove the unnecessary class FlightConfigurationSet. 2015-12-15 23:36:39 -06:00
Daniel_M_Williams
c3b2316cbf fixed ParallelStageTest 2015-12-15 22:10:12 -05:00
Daniel_M_Williams
f1eb3d75d8 fixed LaunchLugTest 2015-12-15 22:08:11 -05:00
Kevin Ruland
470799da72 flightConfiguration clone was creating two copies of each
MotorConfiguration.
2015-12-15 07:33:25 -06:00
Kevin Ruland
66f1e0b901 Rename some classes for clarity. 2015-12-14 22:46:36 -06:00
Kevin Ruland
f429255801 Merge remote-tracking branch 'upstream/master' 2015-12-14 22:13:41 -06:00
Kevin Ruland
e89754bbb2 Fix RocketTest.testCopyFrom. 2015-12-14 21:45:48 -06:00
Kevin Ruland
d840f302ba Only write back through version 1.6. Added test motor to support
OpenRocketSaverTest.
2015-12-14 21:40:51 -06:00
Kevin Ruland
b998bd30c5 Rebase and fix MotorMountHandler. 2015-12-14 21:02:02 -06:00
Kevin Ruland
391571708f Test argument in FlightConfigurationID constructor. Initialize
FlightConfigurationID in SimulationOptions to new random id.  Make the
TestRockets compile
2015-12-14 20:58:05 -06:00
Daniel_M_Williams
3537748005 Merge branch 'master' of https://github.com/openrocket/openrocket into parallel_staging 2015-12-14 20:14:52 -05:00
Daniel_M_Williams
fb278b3566 fixed FinSetTest 2015-12-14 20:13:51 -05:00
Daniel_M_Williams
e7fbec3d89 [Bugfix] Restored AUTOMATIC Ignition Event, et al.
Restored Automatic ignition Option
    - "bottom" core stage is the lowest centerline ('AFTER')
    - Parallel Stages are always considered as 'launch' stages...
      and thus ignite on launch.
Motors now copy Ignition parameters when loaded into a rocket.
Added additional error checking in FlightConfigurationID
    - class is now tolerant of random string initializations
2015-12-14 19:44:43 -05:00
Kevin Ruland
88f84396d0 Initial refactoring of MotorInstance and ThrustCurveMotorInstance 2015-12-14 18:41:02 -06:00
Kevin Ruland
d12f7b596f Reenable calls to setMotorMount in rocksim import code. 2015-12-13 14:17:28 -06:00
Kevin Ruland
9edf111a56 Changed Unit to go at most 3 digits (I think java changed something in
the number formatting code).  Exclude some methods from ComponentCompare
test which were added recently.
2015-12-13 14:08:57 -06:00
Kevin Ruland
4c56c53135 Added CaseInfo enum and compatible case information to
MotorInformationPanl.
2015-12-13 10:58:47 -06:00
Daniel_M_Williams
6af57134aa [Bugfix] Removed "Automatic" ignition Option
Removed Automatic ignition Option
    - "bottom" core stage is ill-defined in current configuration
    - 'automatic' values in files get loaded as 'launch'
Fixed file values for loading Pods
2015-12-13 11:08:32 -05:00
Daniel_M_Williams
ec05e46a0e [Bugfix] Fixed Stage Separation Bugs
UI elements now change per-configuration separations not the defaults
   fixed separation configuration file-write code.
Added max-time guard for simulations at 1200 seconds.
2015-12-12 19:38:38 -05:00
Daniel_M_Williams
238726f371 Merge branch 'master' of https://github.com/openrocket/openrocket into parallel_staging
Conflicts:
	swing/src/net/sf/openrocket/gui/main/BasicFrame.java (resolved)
2015-12-12 11:14:13 -05:00
Daniel_M_Williams
fc3e19fbcd [Bugfix] Fixed Display (and other) bugs
FlightConfiguration.clone() now correctly clones internal data
    -> caused mysterious disapearing-rocket-display bug
    -> added FlightConfiguration.instanceNumber for debugging
Refined stage-set-active methods to fine tune event firings
Improved output of various debug methods.
Fixed various warnings
2015-12-12 11:00:17 -05:00
Kevin Ruland
17540d160c Oops forgot the webservice. 2015-12-07 22:29:51 -06:00
Kevin Ruland
b415238a02 Changed Motor to support additional fields case info, prop info, and
availability flag provided by Thrustcurve.org.  Change serialization
process to pull current files from Thrustcurve.org using the xml api,
use the corrected data for diameter and length, and use a consistent
motor designation.  Added fields to the Motor chooser - case info is a
column in the listing (replacing MotorType), the other info is in the
motor details tab.  Added toggle to hide motors which are OOP.
2015-12-07 22:27:05 -06:00
Daniel_M_Williams
0308d8d0c6 refined xml tags for InnerTube 2015-12-06 16:29:19 -05:00
Daniel_M_Williams
1988ee4266 [Bugfix] Fixed Simulations bugs - Sim should be operational now.
Motors are now cloned for each new simulation (including background and foreground runs)
    -> motors are now cloned within the configuration clone method.
    -> MotorInstance.reset() resets instance to launch state
Removed spurious negative time-step check in ThrustCurveMotorInstance:154
    -> was triggered during normal simulation operations.
Added MotorInstance time updates to AbstractSimulationStepper:
    -> moved from MotorInstanceConfiguration.step(...)
Misc variable name changes to be more descriptive
2015-12-06 12:09:29 -05:00
Daniel_M_Williams
65ddd1b2a2 [Bugfix] Fixed Simulation bug - propellant mass storage
fixed propellantMass bug.
2015-12-04 09:30:09 -05:00
Daniel_M_Williams
729effd690 [Bugfix] Merged FlightConfiguration MotorInstanceConfiguration
fixed ignition configuration load / save
2015-12-03 21:44:34 -05:00
Daniel_M_Williams
890d390b4b [Refactor]ed SimpleStack class to JDK 'ArrayDeque' class 2015-12-03 13:40:21 -05:00
Daniel_M_Williams
defcf24c86 [Bugfix] Fixed several Config Id-Simulation Display Issues
- Initial selected configuration is the last loaded
- Correctly loads the correct config Id for each simulation
- Can correctly display the Config Id for each sim. (both in table, and edit)
2015-12-02 19:44:55 -05:00
Daniel_M_Williams
040c451a3d [Bugfix] Improves FlightConfiguration selection, readability
-ParameterSetModel fixed - controlled configuration in the main window. et al.
    - now implements a generic ComboBoxModel<T>, instead of just a FlightConfigurationId.
2015-12-01 18:43:21 -05:00
Daniel_M_Williams
c65fb80dbf [Bugfix] Various small tweaks, Improved Configuration Naming
- events from a rocket start out disabled, and are turned on by the RocketLoader
- FlightConfgurations will once again describe their contained motors, if not explicitly named otherwise
- Refined ComponentChangeEvent type enum
- Added other miscellaneous debugging statements and methods
2015-12-01 14:38:48 -05:00
Daniel_M_Williams
b1108a0c83 [bugfix] refixed motor loading code. 2015-11-29 17:42:14 -05:00
Daniel_M_Williams
1a036904c0 [bugfix] .ork files load motors correctly (again). 2015-11-26 10:22:40 -05:00
Daniel_M_Williams
a43fbe79bc [bugfix] 'remove motor' button now works correctly 2015-11-26 09:05:08 -05:00
Daniel_M_Williams
a32b303069 [bugfix] fixed minor initialization bug 2015-11-25 19:27:34 -05:00
Daniel_M_Williams
12cda5b722 small internal API refinements 2015-11-25 18:02:25 -05:00
bkuker
2d465a3576 Simple rail button render 2015-11-24 13:13:17 -05:00
bkuker
a1f2dc35fc implement getComponentBounds for Rail Button to get 3d wireframe 2015-11-24 12:57:36 -05:00
Daniel_M_Williams
657c407ba5 [UI] fixed RailButton UI, file I/O 2015-11-23 23:54:07 -05:00
Daniel_M_Williams
1ce452265c [Feature] Implemented RailButton Shapes (2D only)
RailButtons loaded, edited, and displayed (in 2d, and 3d)
2015-11-23 14:40:57 -05:00
Daniel_M_Williams
82e3a7ff1c [Feature] Implemented more RailButton code:
RailButtons can be loaded, and edited, but not really displayed.
    - data entry has defined file parameters, but needs some debugging.
    - added icons for component creation.  The button just needs to be uncommented
    - display works, but only for rotation = 0;
       - requires a new type of shape drawing.  Not inherently hard, just tedious.
2015-11-22 22:28:51 -05:00
Daniel_M_Williams
643fa71478 [Feature] Implemented RailButton IO code. 2015-11-22 16:25:36 -05:00