2037 Commits

Author SHA1 Message Date
Daniel_M_Williams
0ab8dde5fb cleaned up FlightConfiguration naming code 2016-01-01 17:11:59 -05:00
Daniel_M_Williams
96f2cc048b adjusted getName() method to be more descriptive 2016-01-01 17:02:34 -05:00
Daniel_M_Williams
513e74fd15 Merge with commit f8cfebe from kruland2607/openrocket 2016-01-01 16:04:33 -05:00
Kevin Ruland
f8cfebe5f5 Fix the motor cg computation. Partial fix to barrowman aero. 2015-12-31 09:57:36 -06:00
Daniel_M_Williams
206214e47a [BugFix] Fixed MassCalculator Unit Tests
- Added debug statements to MassCalculator, enabled by a 'debug' flag
- Adjusted values in MassCalculatorTest
  -- added additional unit test cases
- Fixed implementations in MassCalculator
- Implemented getPosition() and getX() in MotorConfiguration
- added motor to test rocket Estes Alpha 3 in TestRockets
2015-12-26 14:57:17 -05:00
Daniel_M_Williams
c649292f56 'fixed' ComponentCompareTest (removed; because the test is superflous 2015-12-25 19:36:24 -05:00
Daniel_M_Williams
711f71e2c8 Fixed TestRocketOptimizationFunction unit tests 2015-12-25 13:33:46 -05:00
Daniel_M_Williams
53b20eb999 (re)fixed parallel stage unit test 2015-12-25 11:02:33 -05:00
Daniel_M_Williams
ab643d5ab5 [Major] Removed Rocket FlightConfiguration event code
# FlightConfigurations have stubs of eventListening and dispatching code.
  - Removed code from FlightConfigurations
  - Removed code from calling classes
2015-12-23 23:25:03 -05:00
Daniel_M_Williams
0979cff505 fixed bugs in the Photo Renderer 2015-12-23 23:17:59 -05:00
Daniel_M_Williams
efd1656fc8 [Major] Re-Implemented Rocket configuration list
# FlightConfigurations behave differently than the ...ParameterSet instance
  - Rockets no longer have a defaultConfig, but have a selectedConfiguration
  - therefore these function were completely re-implemented native to the Rocket class
  - FlightConfigurationTest verifies this functionality
  - simplified several function calls through the code base
  - added convenience methods for getting the config[] to the UI
# expanded RocketTest to verify Rocket.copyWithOriginalID():
  - rocket is cloned, so non-trivial members must be cloned as well.
2015-12-23 22:32:52 -05:00
Daniel_M_Williams
f59ebdd06e [Major] Re-Implemented ..ParameterSet to represent the default more simply
- the default value is now simply an entry in the map
  - size() returns only the number of overrides
  - getIds() returns only the ids of overrides
- added ParemeterSetTest to test FlightConfigurableParameterSet
- removed (already defanged) event handling functions from MotorConfig
- removed (already defanged) event handling functions from DeploymentConfig
- removed (already defanged) event handling functions from IgnitionConfig
- FlightConfigurableParameter no longer extends ChangeSet
- fully parameterized DoubleModel to <T extends Enum<T> >
- fully parameterized EnumModel to <T extends Enum<T> >
2015-12-23 00:21:09 -05:00
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
kruland2607
8fb7d16a66 Merge pull request #255 from kruland2607/master
Work on Motor Instance.
2015-12-14 22:48:20 -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
kruland2607
34447b9588 Merge pull request #254 from kruland2607/motorinstance
Motorinstance
2015-12-14 21:50:37 -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
kruland2607
426ee80688 Merge pull request #253 from teyrana/parallel_staging
Restored Automatic Ignition Event, plus a few other small fixes.
2015-12-14 20:55:40 -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
kruland2607
a5e9bb39ff Merge pull request #252 from teyrana/parallel_staging
Parallel staging, Pods, Rail Buttons
2015-12-13 10:54:21 -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
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