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

401 Commits

Author SHA1 Message Date
Sampo Niskanen
a6c2092379 Move TestScriptingUtil to test/ directory 2015-01-10 17:50:11 +02:00
Sampo Niskanen
a1f6782195 Disable untrusted scripts on loading files 2015-01-06 19:25:13 +02:00
Sampo Niskanen
a39a3fce15 Add support for multiple scripting languages 2014-12-27 23:50:54 +02:00
Sampo Niskanen
82af205e3e Merge remote-tracking branch 'upstream/master' into feature/simulationextensions 
Conflicts:
	core/src/net/sf/openrocket/simulation/SimulationStatus.java
 2014-12-23 21:01:48 +02:00
Daniel_M_Williams
67e741a2df [Fix][Cont] Added Unit test for RSE-load negative mass bug. 
- Added Test case in TestMotorLoader.java
  - Added Test load file 'test3.rse' which would previously raise an IOException on load.
  - Added this test case to the 'testGeneralMotorLoader' method as well.
  - Adjusted the digest string so that 'test3.rse' will pass the unit tests.
  - TestMotorLoader currently passes 5/5 unit tests.
 2014-10-29 14:55:32 -06:00
Doug Pedrick
c2e79ba50e Added support for Rocksim SubAssembly file elements (import only). 2014-08-30 21:08:13 -05:00
Sampo Niskanen
b6e3a57b47 Implement simulation extensions 
Squashed commit of the following:

commit 058f603c23accbcdbe9110645f19164da7d57c85
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Sat Apr 12 10:52:21 2014 +0300

    Implmenent simulation extensions

commit a1ca913c7d7793a9209a5f98235336270db6ce10
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Fri Apr 11 19:45:12 2014 +0300

    WIP

commit 916f0bc8961360c0906b413485ca4e3700033740
Author: Sampo Niskanen <sampo.niskanen@iki.fi>
Date:   Tue Apr 1 20:23:25 2014 +0300

    WIP
 2014-04-12 10:54:17 +03:00
kruland
b39cd8a016 Fix for Issue #175. Use a larger number to test equality of fin point y 
positions to reduce numerical stability in computation of chord lengths.
 2014-01-17 20:36:46 -06:00
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
Sampo Niskanen
10dbc856ee Remove unnecessary FIXMEs 2013-09-08 22:20:38 +03:00
soupwizard
df85d0ee53 Added unittests saving and loading rockets to/from tmp in various file versions. 
Added @Ignore  and FIXME to failing LogLevelBufferLoggerTest
Fixed failing unitest IntegrationTest.java
Added test rockets for the various file versions of .ork
Changed TestMutex.java to write  messages to log saying that certain exceptions
that appear in log during unittests are ok because the test can't catch them.
 2013-06-08 19:09:36 -07: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
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
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
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
96689c69e2 Use slf4j for all logging within the application. 2013-05-09 21:34:19 -05:00
Sampo Niskanen
d5e981af7e Fix failing unit test 2013-05-04 21:11:03 +03:00
kruland2607
b5610b0926 Fix the expectations in the PresetTests to account for changes in the 
DebugTranslator for material names.
 2013-04-25 11:16:31 -05:00
kruland2607
6caca93421 Renamed BaseApplicationAbstractTest to AbstractBaseApplication so it 
wouldn't get executed by the unittest target.
 2013-04-24 14:17:37 -05:00
kruland2607
3dec7ec154 Merge pull request #67 from soupwizard/master 
Update travis-ci config, fix non-ascii char in FinRenderer, Add new unit tests for Configuration.java.
 2013-04-24 07:11:09 -07:00
kruland2607
8a31d358d4 Set Spill hole in rocksimTestRocket3.rkt to 1.0 so the loader will 
generate the warning.  I had changed generation of the SpillHole warning
to only be issued if the diameter is > 0.
 2013-04-24 09:04:58 -05:00
soupwizard
448d2e606c Update travis-ci config file run unittests. Add new unittest ConfigurationTest.java. Fix FinRenderer.java to not have non-ascii character in a comment. 2013-04-23 14:26:46 -07:00
kruland2607
1f109acf41 Fix PluginTest by creating the PluginModule as a child of the 
ApplicationModule.  Unfortunately, ApplicationModule requires a
preference provider to be set.
 2013-04-22 15:32:29 -05:00
kruland2607
f899b9fb2e Fixed RocksimDocumentDTOTest by having RocksimTestBase extend 
BaseApplicationAbstractTest to create a more complete Application
object.
 2013-04-22 09:14:15 -05:00
kruland2607
2738f30489 Added BaseApplicationAbstractTest base class which will use Guice to 
create the application framework.  It is roughly equivalent to the first
step of bootstrapping with ApplicationModule.  Modified unit tests which
require a more complete application framework.
 2013-04-22 09:09:11 -05:00
kruland2607
2bad65410d Ignore changes to ignition, stage separation, and motor configuration. 2013-04-21 21:42:32 -05:00
Sampo Niskanen
dd5a16802b Merge branch 'master' into kruland-integration-ui 
Conflicts:
	core/.classpath
 2013-03-21 09:16:35 +02:00
Sampo Niskanen
170ce13c05 Data model refactoring 2013-03-01 08:41:47 +02:00
kruland2607
31d6baffd4 Back out directory watcher code since we aren't using it yet. 2013-02-13 10:21:14 -06:00
Sampo Niskanen
8c0c9bb10d Plugin system 2013-01-23 08:32:09 +02:00
kruland2607
593c639a06 Rework attachment loading. Construct a DocumentLoadingContext in 
GenericLoader and pass into both OpenRocketLoader and RocksimLoader. 
the DocumentLoadingContext contains the OpenRocketDocument, MotorFinder,
and AttachmentFactory.
 2013-01-10 21:11:57 -06:00
kruland2607
48adc0b7bf Rework the AttachmentFactory and Attachments. Make the Attachment 
implementations stand on their own and be able to determine the location
of their bytes without needing a reference back to the
AttachmentFactory.  This required changing the loading semantics so the
OpenRocketDocument is created prior to beginning to read the xml file. 
Added an OpenRocketDocumentFactory to facilitate construction of
OpenRocketDocument objects.
 2013-01-09 21:28:53 -06:00
kruland2607
acba62ce59 Rework Decal byte handling code and DecalRegistry. Added interface 
DecalImage which is used by the Decal object to retrieve the bytes for
the image.  The DecalRegistry now operates as a factory and registry for
DecalImage objects.  The decal handling code in the saver is now greatly
simplified because the logical decal names are updated when constructed
by the DecalRegistry.
 2013-01-06 16:58:18 -06:00
Sampo Niskanen
ef7c384f58 Merge branch 'master' into kruland-integration 
Conflicts:
	core/build.xml
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.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/util/SaveFileWorker.java
	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
 2013-01-06 19:18:46 +02:00
Sampo Niskanen
011bcd27e2 Refactor convertStringToBytes method 2013-01-06 16:12:12 +02:00
Doug Pedrick
ffca820860 Initial file watcher code. 2012-12-19 20:22:14 -06:00
soupwizard
11c247135e fixed ~150 build warnings 2012-12-16 00:12:44 -08:00
soupwizard
dd0a9a12d9 removed unnecessary @SupressWarnings, to fix some build warnings 2012-12-11 18:15:42 -08: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
Sampo Niskanen
ff22040df0 Refactor motor serialization/loading code 2012-12-10 22:44:06 +02:00
Kevin Ruland
e9060272e4 Created a GeneralRocketSaver object which is analogous to GeneralRocketLoader. Based on the StorageOptions, it determines how to save the file using a RocksimSaver or OpenRocketSaver as appropriate. Modified RocksimSaver and OpenRocketSaver so they only operate on OutputStreams. Removed methods from RocketSaver interface which operated on File. Fixed bug in DecalRegistry where it wouldn't handle absolute filenames. Fixed bug in BasicFrame where it would display ugly stuff for the filename. 2012-10-23 16:19:37 -05:00
Bill Kuker
4fe9dc4eef Fix to provide a FileInfo to the GeneralRocketLoader 2012-10-23 16:13:49 -05:00
Kevin Ruland
05d1b91d90 Sizable commit with lots of changes to support decals in openrocket files. Added support for zip container support. Changed Decal to hold a String instead of URL. Refactored GeneralRocketLoader out of the RocketLoader hierarchy so the GeneralRocketLoader knows about files and RocketLoader only knows about streams. Changed the OpenRocket file format to 1.6 and added <appearance> and it's children for ambient light and decals. Implemented a DecalRegistry which is a member of the OpenRocketDocument. This class is used to get InputStreams for decals by their names. 2012-10-23 15:54:45 -05:00
Sampo Niskanen
811292286e Make ClassBasedTranslator compatible with Guice 2012-10-15 07:33:24 +03:00
kruland2607
ecac762940 Break up the area/cg test cases and add some documentation describing 
what they are doing.
 2012-10-07 22:20:33 -05:00
kruland2607
4d77c817d8 Merged changes fixing NaN when computing fin CG. 2012-10-07 22:18:53 -05:00
kruland2607
9c3fce4517 Added couple of simple unit tests for computing area and cg for 
Trapezoidal and Free Form FinSets.
 2012-10-07 22:18:06 -05:00
Sampo Niskanen
506dc0c9b7 Unit rounding fine-tuning 2012-09-28 19:42:11 +00:00