hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,372 Commits 2 Branches 43 Tags
Commit Graph

592 Commits

Author SHA1 Message Date
kruland2607
e6755e0e84 Rework the thrustcurve motor filter and information. They now share 
tabs on the MotorSelectionPanel.  Added Minimum Motor diameter to the
motor filter.
 2013-10-04 20:36:30 -05:00
kruland2607
fa7916f7b0 Localized column heading and added rocket listener to update columns. 2013-10-01 11:34:57 -05:00
kruland2607
43187b2b2c Implement Configuration tab in BasicFrame next to Design and Simulation tabs. Provides functionality to configure motors, recovery and stages. Todo - verify functionality, add listeners to the table contents change when the design is updated, add listener so the configuration is highlighed to reflect selection in RocketFigure. 2013-09-30 21:12:52 -05:00
kruland2607
572b14de13 Localize motor popup and new fields in ThrustCurveMotorSelectionPanel. 2013-09-28 22:16:31 -05:00
bkuker
de2e2e6bd5 I10n for the GL preferences 2013-09-24 16:59:59 -04:00
kruland2607
ee38ef2d3d Fix the "Simulate & Plot" button in the Simulation Dialog when multiple 
simulations are selected.  In this case, it now says "Simulate" and the
dialog closes when finished.
 2013-09-13 19:37:58 -05:00
kruland2607
7763af389e Added little l10n properties analysis tool, and fixed some obvious 
errors in cs & it localizations.
 2013-09-13 10:46:35 -05:00
kruland2607
790c618101 Updated russian translations. 2013-09-09 22:06:44 -05:00
kruland2607
e8dad716b3 Seems one of my merges blew away the SimExpPan.border.Stage. 2013-09-08 20:29:25 -05:00
kruland2607
3538a3ac9a Change the ok button text to "Plot" or "Export" based on selected tab. 2013-09-06 09:25:57 -05:00
kruland2607
0bba32fb59 Added ability to export different branches from simulations. 2013-09-05 10:14:48 -05:00
Sampo Niskanen
0114448ea8 Fine-tune SimulationEditDialog 2013-06-13 16:54:01 +03:00
kruland2607
58e5874832 Merge remote-tracking branch 'upstream/master' into sims 
Conflicts:
	core/src/net/sf/openrocket/gui/main/SimulationPanel.java
 2013-06-11 21:25:33 -05:00
kruland2607
d9c5bf6b1b Added total impulse column to motor selector dialog. When the dialog is 
first displayed, sort the data in a reasonable way.
 2013-06-03 09:59:32 -05:00
kruland2607
f0ae25615e Rework simulation ui. Added support for default flight conditions. 
Editing of flight conditions on multiple simulations.  Changed
exceptions generated in simulation to still produce data.
 2013-05-23 11:01:21 -05:00
kruland2607
0d3e779488 Update PT translations. 2013-05-19 15:13:29 -05:00
kruland2607
7e2f0966e5 Updated Italian translations. 2013-05-13 21:49:01 -05:00
Sampo Niskanen
6f2ee27eec Add space before/after footnote marker 2013-04-30 20:29:53 +03:00
kruland2607
41031a0936 Updated Spanish translations. 2013-04-29 12:59:29 -05:00
kruland2607
e8b38b7398 Updated es, fr & ru translations. 2013-04-29 09:56:21 -05:00
kruland2607
d2822b5fc6 Added two localization keys - appearance tab, and rocket panel, view 
type.
 2013-04-28 18:15:38 -05:00
kruland2607
a6a8a94986 Updated ja & pt localization files for changed keys. Updated ChangeLog 
and fileformat files.
 2013-04-17 12:50:56 -05:00
kruland2607
50e37d747f Added footnotes for configurable parameters. 2013-04-16 21:54:45 -05:00
kruland2607
701b8966a2 Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/resources/l10n/messages_fr.properties
	core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
 2013-04-16 14:28:42 -05:00
kruland2607
8f9dc93705 Merge in l10n changes. 2013-04-16 13:53:17 -05:00
kruland2607
c9c75248cf Added extra help message about configuring the default editor in 
preferences.
 2013-04-08 16:47:59 -05:00
kruland2607
3212beb27c Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/.classpath
 2013-04-03 20:09:12 -05:00
kruland2607
e7189bd415 Added localization to remove FIXME. 2013-03-27 09:28:49 -05:00
Sampo Niskanen
2db59086dd Merge branch 'kruland-integration-ui' into kruland-integration 
Conflicts:
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java
 2013-03-27 08:48:17 +02:00
Sampo Niskanen
5b93c923f5 Flight configuration dialogs 2013-03-27 07:55:42 +02:00
kruland2607
8bd5098b73 Added default/override buttons to SeparationSelectionDialog. In 
SeparationSelectionDialog, IgnitionSelectionDialog, and
DeploymentSelectionDialog, added code which selects the default or
override radio buttons based on if the the configuration already
overrides the parameters.
 2013-03-27 00:28:27 -05:00
kruland2607
7db0c17c56 Added some localized messages when exporting and editing decals. 2013-03-26 22:24:21 -05:00
kruland2607
b034eccd43 Corrected FIXME for localization. 2013-03-26 16:10:26 -05:00
Sampo Niskanen
525869c3e7 Refactoring or rocket configuration description 2013-03-22 18:12:58 +02:00
Sampo Niskanen
83fcf0894e Merge branch 'kruland-integration' of github.com:plaa/openrocket into kruland-integration-ui 2013-03-17 11:13:50 +02:00
Sampo Niskanen
b2776f5e92 UI refactoring 2013-03-17 11:13:32 +02:00
kruland2607
e8b9efd1d0 Merge remote-tracking branch 'upstream/kruland-integration-ui' into 
kruland-integration

Conflicts:
	core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
 2013-03-16 18:35:31 -05:00
kruland2607
3eb96ee04d Merge branch 'tumble-recovery' into kruland-integration 
Conflicts:
	core/resources/datafiles/examples/Three-stage rocket.ork
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java

Ignored changes to Three-stage rocket.ork since that will need to be
reproduced after the cool 3d view enhancements to the example.

The BasicEventSimulationEngine conflicts were trivial and manually
resolved.
 2013-03-13 14:34:11 -05:00
Sampo Niskanen
170ce13c05 Data model refactoring 2013-03-01 08:41:47 +02:00
Sampo Niskanen
4c48ec48c9 Merge branch 'kruland-integration' of github.com:plaa/openrocket into 
kruland-integration-ui

Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/MotorHandler.java
 2013-02-23 08:51:22 +02:00
Sampo Niskanen
0e2ee6a566 Refactoring data model 2013-02-23 08:47:21 +02:00
kruland2607
f7def169ef Updated translation files from Boris du Reau. 2013-02-14 13:17:48 -06:00
kruland2607
b16917995d Change mouse button handling in simulation plot. Left click drag zooms 
area, and ctrl left click drag pans.
 2013-02-05 10:04:49 -06:00
Sampo Niskanen
d2035ce702 UI updates 2013-02-02 12:07:07 +02:00
Sampo Niskanen
b3b2303f27 Enhance flight configuration UI 2013-01-27 22:36:21 +02:00
bkuker
c1c4f99992 Trying out an "Unfinished" view... Jury is out 2013-01-10 15:36:08 -05:00
bkuker
c6bdd1ab78 Fix the clamp message 2013-01-07 16:22:48 -05:00
bkuker
e8ac5d4dea Add a sticker decal option 2013-01-03 15:24:23 -05:00
kruland2607
177d40104e Add Edit Decal dialog available from Appearance tab. Added preference 
to control which editor is opened.
 2012-12-28 23:08:31 -06:00
bkuker
86d07ca8b8 I10n for color label 2012-12-17 16:18:49 -05:00