1700 Commits

Author SHA1 Message Date
Daniel_M_Williams
3ae4b0d277 [Bugfix] Fixed some FlightConfiguration-related UI elements
- Removed configuration from the document class -- please retrieve it from the rocket instead
- Refined debug code points, particularly in InnerTube
- Fixed <RocketComponent>.removeChild( component ) to function correctly
- fixed UI element: FlightConfiguration ComboBox chooser
    - Renamed FlightConfigurationSet -> ParameterSet
    - FlightConfigurationModel -> ParamaterSetModel
- fixed engine drawing (partially. Still needs Testing.
2015-10-22 20:13:36 -04:00
Daniel_M_Williams
8e78a314cd [Bugfix] Ironing out motor-instance model changes.
- renamed <RocketComponent>.getLocation() => getLocations()
    - trailing 's' matches return type
- made <RocketComponent>.shiftCoordinates protected (from public)
    => references converted to <>.getLocation() calls
- Reduced functions in "Instanceable" interface.
- Fixed Motor Instancing Code
- Removed 'isCenterline()' tester method
- added 'isAfter()' tester method
- OutsideComponent interface removed.
    => was redundant with RingInstanceable.
2015-10-20 17:22:55 -04:00
Daniel_M_Williams
35b46ca44f [Bugfix] Display now updates with editing changes. 2015-10-19 11:26:11 -04:00
Daniel_M_Williams
dac67b0f71 [Bugfix] Fixed UI issues related to 'Instanceable' implementation.
- RingComponent is no longer Instanceable.
- Fixed setter settings for file loading:
    - Fixed methods references for Innstanceable-implementing classes
        - BoosterSet
        - PodSet
        - InnerTube
        - CenteringRing
        - LaunchButton
        - LaunchLug
2015-10-16 19:56:02 -04:00
Daniel_M_Williams
80c4ef5254 [Bugfix] Fixed UI issues related to 'Instanceable' implementation.
- Added set/get InstanceCount methods to BoosterSet, PodSets.
- changed order of editing tabs for BoosterSets, PodSets.
- When editing MotorMounts, fixed an incorrect model reference.
2015-10-16 19:05:32 -04:00
Daniel_M_Williams
a7b4386358 [minor] removed spurious System.err.println() calls 2015-10-16 18:27:21 -04:00
Daniel_M_Williams
1719351a63 [Bugfix] .ORK I/O Bugfixes...
- Corrected FlightConfiguration, MotorConfiguration ID issues
  - output code no longer outputs extra FlightConfigurations
  - recovery Devices no longer print out FlightConfigurations w/o specific settings
- Reverted Default Value for FlightConfigurationSet is just a member field
    - creates extraneous code when included in the map.
    - fixed corresponding display issues.
2015-10-16 18:11:27 -04:00
Daniel_M_Williams
9551ddc0cb [Bugfix] Bugfixes: Ability to Rename, Delete FlightConfigurations. 2015-10-15 12:21:43 -04:00
Daniel_M_Williams
55acf6cebf [Bugfix] Fixing Configuration Editing UI
- Default Parameter in FlightConfigurationSet<T> is now totally separate from those listed in the map.
    - note: the default option =/= the option for the default FlightConfiguration ...
    - defaultValue is now included in the map, with a dedicated static final key.
    - defaultValue may only be replaced, not removed.
- "Select Ignition" button now functions correctly
- "Reset Ignition" button functions correctly
2015-10-15 11:33:33 -04:00
Daniel_M_Williams
b3c1c5fac1 [Bugfix] Cleaning up FlightConfigurationID handling. Multiple Fixes.
-Fixed Motor Choosing UI Function
-Fixed Motor Remove UI Function
-Fixed UI display bug:  pass FlightConfigIDs instead of naked Strings.
-FlightConfigurationIDs now filter out keytext only. (spurious "key: " appended)
-Fixed extra de-select when navigating MotorSelection / FlightConfig selection tables
    - code no longer sets selected cell / config as the default item
2015-10-12 12:20:45 -04:00
Daniel_M_Williams
059c9cf0db [bugfix] Flight Configuration management bugs fixed
Removed "Rename Configuration" Button => "Reset to Default" (is now obsolete)
Re-implemented 'create new configuration' button
2015-10-09 17:56:30 -04:00
Daniel_M_Williams
0a55f59548 [Minor] Harmonized interface for instanceable components
Implemented 'Instanceable' Interface
    - MotorMount implements instanceable
        - BodyTube
        - Innertube
    -RingInstance interface
        - BoosterSet
        - PodSet
    -LineInstanceable interface [This feature is not exposed in UI)
        - LaunchLug
        - LaunchButton (Stub only, ATT)
        - RingComponent (abstract ancestor class)
-Reverted MotorMount Function names to "[is|set]MotorMount"
2015-10-06 12:02:57 -04:00
Daniel_M_Williams
1401d99528 [Major] Overhauled Configuration class to be more useful/ powerful.
-Each configuration has an fcid (FlightConfigurationId)
-FlightConfigurationID is a new type.
    - small wrapper class around String
    - provides better traceability, error detection, readability
    - the fcid is now the hashMap key for any FlightConfigurationSet
-rename Configuration => FlightConfiguration (to be more explicit about class purpose)
-combine MotorInstance =><= motorConfiguration
-Refactor ThrustCurveMotorInstance into an outer public class
-MotorId => (ren) => MotorInstanceID
-fold IgnitionConfiguration => <MotorInstance>.<IgnitionConfiguration>
-Created IgnitionEvent class
-Implemented partial checking for file version 1.8
-rename FlightConfigurationImpl => FlightConfigurationSet
-rename MotorFlightConfigurationImpl => MotorConfigurationSet

- Rockets now list all configurations
    -implemented a FlightConfigurationSet of FlightConfigurations
2015-10-05 14:32:03 -04:00
Daniel_M_Williams
34091e338e [Bugfix] fixed Configuration getActive... routines
- getActiveStages() now correctly returns only active stages
- getActiveComponents() now returns children of all active stages exactly once
- Refactored the shape generate routines in rocketfigure
    - correctly omits inactive stages
    - always includes active stages
2015-09-20 17:55:18 -04:00
Daniel_M_Williams
497fb658c7 UI now draws only active stages 2015-09-17 09:18:28 -04:00
Daniel_M_Williams
552706f6b9 Merge branch 'master' of https://github.com/openrocket/openrocket into child_staging 2015-09-16 16:09:58 -04:00
Daniel_M_Williams
6c11fb2751 [Bugfix] Refactored Configurations:
-Configuration refactor
  -stages are toggled individually
  -removed set-up-to-stage method
-MotorInstance refactor: multiple Lists -> one map<MotorId,MotorInstance>
    moved most of the fields to MotorInstance.java
2015-09-16 15:52:20 -04:00
Daniel_M_Williams
85dff39fb9 folded BasicMassCalculator into MassCalculator 2015-09-16 15:52:20 -04:00
Kevin Ruland
cec7005e56 Work around reported bug concerning TimSort and comparators violating
contract.
2015-09-12 06:37:06 -05:00
Daniel_M_Williams
54f1a4c672 added example rockets for Boosters and Pods 2015-08-29 14:45:36 -04:00
Daniel_M_Williams
ea8066f63c Fixed GUI elements & function f/Boosters/Pods
Model
  Refactored code from AxialStage, BoosterSet, PodSet => ComponentAssembly

GUI
  BoosterSet: Fixed bugs, allowed boosters and pods to be correctly located.
2015-08-27 08:54:35 -04:00
Daniel_M_Williams
0c01123551 refactored Stages (Axial & Booster) now load correctly. 2015-08-25 22:38:13 -04:00
Daniel_M_Williams
c8a3d675d8 messy commit: refactored Stage => AxialStage, BoosterSet, PodSet 2015-08-25 09:57:23 -04:00
Daniel_M_Williams
c1c882eb00 cleaned up gui components in StageConfig 2015-08-24 10:53:50 -04:00
Daniel_M_Williams
29430218d5 Fixed example files, added descriptions 2015-08-24 10:52:43 -04:00
Daniel_M_Williams
d2793249a0 added example files for boosters and pods 2015-08-23 20:36:51 -04:00
Daniel_M_Williams
231fd1ffa5 Enforced minimum instance count of 2 for booster stages 2015-08-22 10:37:28 -04:00
Daniel_M_Williams
29ec764b61 fixed some visual display bugs improper auto-zoom. 2015-08-19 20:44:12 -04:00
Daniel_M_Williams
719db29a31 fixed shock-cord display 2015-08-14 18:04:09 -04:00
Daniel_M_Williams
1d879c2281 bugfix: motors now display correctly on clusters and booster clusters. 2015-08-14 12:12:18 -04:00
Daniel_M_Williams
0fbdc33188 Fixed numerous display bugs-- including stage placement, engine instancing. 2015-08-12 14:02:24 -04:00
Daniel_M_Williams
6f039a992b changing internal positioning back to top-top 2015-08-01 14:57:10 -04:00
Daniel_M_Williams
c1d9ff5d41 [Bugfix] Fins on Outside stages display correctly. 2015-07-25 11:45:10 -04:00
Daniel_M_Williams
b547084156 [cosmetic] deleted extra debug code, corrected indentation 2015-07-24 17:13:03 -04:00
Daniel_M_Williams
5f42a10c20 [Major Refactor] Parallel stages are children of centerline stages 2015-07-24 16:44:10 -04:00
Daniel_M_Williams
2f42594acb fixed many display issues relating to refactoring of RocketComponent axialOffset code. 2015-07-21 14:16:13 -04:00
Daniel_M_Williams
3b1de9c291 Gui now correctly initializes chosen relTo stage pulldown (minor) 2015-07-01 19:35:06 -04:00
Daniel_M_Williams
8755777924 implemented loading of stage parameters (and fixed stage xml writing 2015-07-01 19:20:19 -04:00
Daniel_M_Williams
177b24a667 implemented gui elements for locating a stage relative to another stage. 2015-06-30 17:57:14 -04:00
Daniel_M_Williams
d5de1cbac4 added save-to-ork code, removed stage rotation parameter. 2015-06-28 19:42:18 -04:00
Daniel_M_Williams
8b4c1c386b removed gui code for stage instance rotation. Meaning is ambiguous. 2015-06-27 16:57:49 -04:00
Daniel_M_Williams
2729c426b2 removed spurious debug println 2015-06-25 19:39:30 -04:00
Daniel_M_Williams
02cc32eb6e fixed more nosecone display issues 2015-06-25 19:31:36 -04:00
Daniel_M_Williams
df5b213d44 fixed conical nosecane display issue while instanced (i.e. off-axis) 2015-06-25 18:41:28 -04:00
Daniel_M_Williams
ee21c7ea0c parallel stage config: bugfixes and text correction. RelativeTo option still NYI 2015-06-25 17:34:25 -04:00
Daniel_M_Williams
0945961fc4 bugfix commits - fixed rearview display bug, implemented component.getPositionVector() 2015-06-25 17:12:27 -04:00
Daniel_M_Williams
56dec21824 [Large] Refactored RocketFigure drawing code to enable moving components by offset 2015-06-25 11:22:58 -04:00
Daniel_M_Williams
5e96288896 commented out dead code. private class FigureTypeAction is never used. 2015-06-23 13:13:44 -04:00
Daniel_M_Williams
6f4cba68ae refactored RocketFigure to use RocketPanel.VIEW_TYPE enum instead of unchecked ints 2015-06-23 13:12:48 -04:00
Daniel_M_Williams
8e268a9a25 added gui and model elements for stage multiplicity 2015-06-22 16:10:13 -04:00