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

30 Commits

Author SHA1 Message Date
kruland2607
d692288f68 Added build.xml driver in root directory. Moved a few files around to support 
unittest.
 2013-09-30 11:38:54 -05:00
kruland2607
26fb295554 Rework source structure to separate swing gui code from core code. 
Separate swing application code from core code.  Moved a bunch of sources
and libraries around.  Created new eclipse project.

Further refinements to make it build.

Update gitignore.
 2013-09-27 11:34:46 -05:00
kruland2607
3088ee08aa Merge pull request #134 from kruland2607/master 
Doh! forgot to add the new jfreechart libs.
 2013-09-04 19:43:23 -07:00
kruland2607
7285ce0f6e Doh! forgot to add the new jfreechart libs. 2013-09-04 21:43:04 -05:00
kruland2607
067031db3b Fixed problem with multiple copies of the same series in a plot. Also 
bumped up to jfreechart 1.0.15 but that might not have been necessary.
 2013-09-04 21:01:40 -05:00
bkuker
0d88fbef99 Upgraded JOGL to version 2.0.2 2013-08-18 14:27:16 -04: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
kruland2607
3212beb27c Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/.classpath
 2013-04-03 20:09:12 -05:00
Sampo Niskanen
dd5a16802b Merge branch 'master' into kruland-integration-ui 
Conflicts:
	core/.classpath
 2013-03-21 09:16:35 +02:00
bkuker
00a17eb0e2 Merge remote-tracking branch 'plaa/master' into latest-jogl 
Conflicts:
	core/.classpath
 2013-03-02 11:08:49 -05:00
bkuker
e7a7a5fbc9 JOGL 2.0-rc11 2013-01-27 15:01:15 -05:00
Sampo Niskanen
8c0c9bb10d Plugin system 2013-01-23 08:32:09 +02:00
Sampo Niskanen
5412b8255b Merge branch 'integration' of github.com:kruland2607/openrocket 
Conflicts:
	core/.classpath
	core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
	core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
 2012-12-11 08:38:59 +02:00
bkuker
ee3aae6c8b Include SLF libs, Logback libs, and Logback config 2012-10-26 14:07:01 -04:00
kruland2607
a5d87244a4 Implemented flight data branches for stage recovery. Updated jfreechart 
to 1.0.14 and jcommon to 1.0.17.  Added primitive support for plotting
all databranches.
 2012-10-23 10:57:00 -05:00
Sampo Niskanen
4670a010be Startup system using Guice and plugin loading 2012-10-14 17:51:10 +03:00
Sampo Niskanen
5622b4a2b5 Guice module for loading plugins 2012-10-10 22:12:34 +03:00
Kevin Ruland
de27df7c09 Remove the exp4j-rdg.jar file since we are including the source code in the project. 2012-08-23 02:42:30 +00:00
Kevin Ruland
3cc439e490 Removed the old exp4j-0.2.9.jar and corrected the build.xml to use the new exp4j-rdg.jar. 2012-08-08 02:38:18 +00:00
Richard Graham
a66876049c Updated custom exp4j to a java 1.5 version 2012-08-06 18:10:24 +00:00
Richard Graham
837d13adc0 Again fixing classpath and custom exp4j 2012-08-06 00:38:25 +00:00
Richard Graham
3d5ae6752a Big update to custom expression feature. 
- supports range and index subexpressions and many new operators
 - switched to my patched version of exp4j to support all this.
 - expressions belong to rocket document. Accessed from analysis menu.
 - expression importing from file
 - datatypes section defined in file for storing datatypes other than internal ones
 - flightdatatype fix to forget outdated types
 - many GUI fixes to custom expressions
 - new unitgroups supported. Auto unit detection for SI units in custom expressions.

Had to carefully merge loading/saving code with Kevins recent de-localization update. Hopefully changes to materials saving kept but switched datatype access to just using symbol as the key.

Hopefully can get the changes to exp4j upstream so we don't need to keep using this patched version.
 2012-08-05 23:59:54 +00:00
Bill Kuker
26329cedec Include OSX UI elements. 
"OrangeExtensions" jar provides stubs for compilation and linking on other OSs.
 2012-06-24 19:22:07 +00:00
Bill Kuker
8babd54f4f Update to the latest 2.0 release candidate of JOGL (Build 57). 
Move JOGL Libraries from lib/native to lib/jogl, which is less misleading.
Update .classpath and build.xml with new directory name.
 2012-06-20 00:34:02 +00:00
Bill Kuker
6695f92ab1 JOGL Based support for a 3D view of the rocket. 
Change to RocketPanel to add 3D option.
Change to build process to use a Jar-in-Jar technique, not Fat Jar, using the Eclipse projects jar-in-jar loader. (Does not require eclipse!)
 2012-06-11 20:25:41 +00:00
Sampo Niskanen
9552b2de86 Expression parser updates 2012-05-22 04:11:25 +00:00
Kevin Ruland
6de0ea7083 Initial work on BodyTube ComponentPresets. 2012-03-29 02:47:49 +00:00
Sampo Niskanen
2492a85e88 Initial plugin framework 2012-03-20 20:19:38 +00:00
Kevin Ruland
f84689f343 moving to core/ 2012-01-08 02:19:32 +00:00