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

1054 Commits

Author SHA1 Message Date
soupwizard
98635d7c9b Merge remote-tracking branch 'upstream/master' 2013-06-08 18:15:16 -07:00
Jeff Davis
911ad653fa Merge pull request #101 from dneelyep/openrocket-dev 
Added a dialog box warning when users try to run a simulation with no simulations selected.
 2013-06-08 17:23:09 -07:00
Daniel
cd255e1828 Added a dialog box that displays when no simulations are selected. 2013-06-08 12:34:47 -04:00
kruland2607
b5a191eb8d Added presets for LocPrecision contributed by Doug. 2013-06-07 06:38:24 -05:00
soupwizard
d57b132b51 Added tests for OR file versions. Added test rockets for each version number that is implemented. 2013-06-05 20:10:25 -07:00
kruland2607
7d30bcb67b I like it better when the close button copies the SimulationOptions. 
Only SimulationOptions needs to be a little bit smarter about when to
fire the change event.
 2013-06-05 21:20:50 -05:00
kruland2607
4cfc65fbe2 Make the simulation edit dialog operate a little more friendly. When 
the Run Simulation button is pressed, the simulations are executed and
the edit dialog changes to support plotting (when not in multi-edit
mode).  The edit dialog will not close in any case.  When the user
presses close, the dialog is closed.  The close button no longer copies
the changed simulation conditions to the other selected simulations.
 2013-06-05 15:49:09 -05:00
kruland2607
4b9fb6b2fc Open the SimulationEditDialog in the correct mode based on button press 
only try to infer it when double clicking.
 2013-06-04 10:06:31 -05:00
kruland2607
be62cc243e When creating a simulation use the DefaultSimulationOptionFactory. 2013-06-04 10:05:18 -05:00
soupwizard
845780a2bc Fixed unittest failure in LogLevelTest. Added config dir with logback 
config file that set logging to stdout and level to Error.  Modified
unittest target used by travis-ci to use new logback config file to
reduce clutter in unittest output.  Commented out superfluous
System.println's from various unit tests to also reduce clutter.
 2013-06-03 17:55:32 -07: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
f70454792d Create a simulation when a flight configuration is copied or created. 2013-05-31 06:35:07 -05:00
kruland2607
c53a7e4c05 Consolidated the SimulationEditDialog and SimulationPlotExportDialog 
into a single dialog which uses CardLayout to switch between contents.
The new SimulationEditDialog is pretty smart about when it can support
the plot view and continues to support multi-edit.  Double-click in the
SimulationPanel is a little smarter - it opens either the dialog in plot
mode when appropriate.  Fixed but in SimulationPanel where the status
icon was not updated after running a simulation when plot button is
pressed.
 2013-05-30 15:46:47 -05:00
kruland2607
02f3f48f3a Added buttons to the edit and plot dialogs to switch to the other one. 2013-05-27 16:54:09 -05:00
kruland2607
9a43a01663 Don't display warning dialog when simulation ends. 2013-05-24 14:57:32 -05:00
kruland2607
ff39e0ea63 Don't dismiss the plot/export dialog when the plot is displayed. 2013-05-24 14:38:56 -05:00
kruland2607
4716030d1b Explicitly create the plot with a parent window so the configuration 
window can be dismissed automatically.
 2013-05-23 16:19:56 -05:00
kruland2607
9107566b38 Fix bug where plotted series were not labelled correctly in the legend. 2013-05-23 16:18:38 -05:00
kruland2607
f19044f08d Make exceptions show up in plots. Use the exception text in the 
warnings.
 2013-05-23 12:08:03 -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
add194acf0 Merge pull request #94 from kruland2607/startup 
slf4j and startup
 2013-05-18 18:55:39 -07:00
kruland2607
f1aee31b5f Final refactoring. Changed names of a few startup classes. Move 
ComponentPresetEditor and RocksimComponentFileTranslator to utils.  Made
all the injected classes in GuiModule Singleton scope.
 2013-05-18 20:56:44 -05:00
plaa
f7f45fdeeb Merge pull request #95 from kruland2607/l10n-update 
Updated Italian translations.
 2013-05-18 01:00:25 -07:00
kruland2607
7e2f0966e5 Updated Italian translations. 2013-05-13 21:49:01 -05:00
kruland2607
15ecef0bd7 Repackage a bunch of stuff. Rework the GuiModule so it stands alone. 2013-05-13 09:46:56 -05:00
kruland2607
ae7b2b3af1 Startup cleanup. Moved the entire swing application startup into a 
single class.  Created BasicApplication as a simple way to initialize
little applications.  Pulled the dependency on WatcherService out from
DecalImage.
 2013-05-12 20:26:22 -05:00
kruland2607
d1ea73a455 Do all logback configuration in java so we can have stand alone 
applications use a different configuration.  Removed unneeded methods.
 2013-05-11 18:00:34 -05:00
kruland2607
65eeb0833b Button up some details. Only issue messages to console when 
-Dopenrocket.debug is defined.  Fixed the jar to include the slf4j and
logback jars.  Fixed source attachement for logback-core jar.
 2013-05-10 23:50:35 -05:00
kruland2607
9bb6a4933b Added STDERR log level and appropriate infrastructure to capture 
System.err.println().  This is reported in the debug dialog and in bug
reports.
 2013-05-10 12:56:42 -05:00
kruland2607
bd3c68131a Removed horrible static initialization of logging system and instead 
rely on magic - the fact we are using logback classic and the logger is
named "buffer".
 2013-05-10 10:39:35 -05:00
kruland2607
8c8b51fe24 Quiet JarInJarStarter unless openrocket.debug is set. 2013-05-10 10:33:17 -05:00
Sampo Niskanen
7fa1886837 Update technical documentation 2013-05-10 10:40:56 +03:00
Sampo Niskanen
be80579fd1 Merge branch 'doc-lower-stage' 2013-05-10 10:31:46 +03:00
kruland2607
96689c69e2 Use slf4j for all logging within the application. 2013-05-09 21:34:19 -05:00
kruland2607
487917b9c4 Merge remote-tracking branch 'bkuker/slf-client' into startup 
Conflicts:
	core/.classpath
	core/src/net/sf/openrocket/database/Database.java
	core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java
	core/src/net/sf/openrocket/document/OpenRocketDocument.java
	core/src/net/sf/openrocket/document/Simulation.java
	core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java
	core/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java
	core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java
	core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
	core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
	core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java
	core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
	core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.java
	core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
	core/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java
	core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java
	core/src/net/sf/openrocket/gui/util/OpenFileWorker.java
	core/src/net/sf/openrocket/motor/ThrustCurveMotor.java
	core/src/net/sf/openrocket/rocketcomponent/Rocket.java
	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
	core/src/net/sf/openrocket/simulation/SimulationOptions.java
	core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java
	core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java
	core/src/net/sf/openrocket/startup/ConcurrentLoadingThrustCurveMotorSetDatabase.java
	core/src/net/sf/openrocket/util/AbstractChangeSource.java
	core/src/net/sf/openrocket/util/Coordinate.java
 2013-05-08 15:14:55 -05:00
Sampo Niskanen
3f433c3b41 Change version number to 13.05dev 2013-05-04 21:27:45 +03:00
Sampo Niskanen
763f8dd753 Change source repository to point to GitHub 2013-05-04 21:19:17 +03:00
Sampo Niskanen
6b00c0a1e1 Version 13.05 2013-05-04 21:11:35 +03:00
Sampo Niskanen
d5e981af7e Fix failing unit test 2013-05-04 21:11:03 +03:00
Sampo Niskanen
bb916d1889 Fix "ant dist" build script 2013-05-04 21:10:39 +03:00
kruland2607
c00a451704 Update the preset usage example. It has lost it's presets because it 
had been edited with a developer version of OR quite some time ago when
presets were broken.
 2013-05-03 12:06:00 -05:00
kruland2607
bf6de6db66 Update the file name in the chooser to match the selected decal name. 2013-05-02 09:35:50 -05:00
kruland2607
77b78c4cb8 Windspeed units wasn't being saved in the preferences. 2013-05-01 14:37:46 -05:00
Bill Kuker
871f30a942 Merge pull request #89 from bkuker/master-issue81 
Remove the fancy fin-edge rendering
 2013-04-30 14:15:58 -07:00
bkuker
3cad3405ff Remove the fancy fin-edge rendering, it can't deal with the real world 
well enough yet.
 2013-04-30 17:12:41 -04:00
Sampo Niskanen
6f2ee27eec Add space before/after footnote marker 2013-04-30 20:29:53 +03:00
kruland2607
3ab8616e0c Bump to beta3 2013-04-29 12:59:56 -05: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