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

662 Commits

Author SHA1 Message Date
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
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
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
soupwizard
8f4d626a9a fix github issue #84 "The CP & CG markers appear in the 2d rear view." 2013-04-28 20:50:49 -07:00
kruland2607
d2822b5fc6 Added two localization keys - appearance tab, and rocket panel, view 
type.
 2013-04-28 18:15:38 -05:00
kruland2607
793c7dd3bb Prevent NPEs by disabling the Export menu item when no decals are on the 
model.  Also have the Edit button in AppearancePanel be enabled only by
the addition of an image on the AppearanceBuilder.
 2013-04-27 20:59:36 -05:00
kruland2607
8baf9e6676 Load the components in the foreground thread so they are completely 
loaded before trying to read an ork file from the command line.
 2013-04-26 21:28:21 -05:00
kruland2607
1e2c64b6f0 Fixed major problem with preset serialized database. They need to have 
a translator set correctly or else the material types will not match and
presets used in models will be cleared when the document is loaded.
 2013-04-25 21:51:43 -05:00
kruland2607
f0228aa878 Removed last FIXME after manually verifying all calls to the method. 2013-04-25 13:58:34 -05:00
Bill Kuker
b05e882cd5 Merge pull request #73 from bkuker/master-imagesrink 
Shrink images in examples and textures
 2013-04-25 05:39:29 -07:00
bkuker
3e57b36ffb Reduce built-in image sizes 2013-04-24 15:06:34 -04: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
173108c1a8 Allow setAppearance to accept a null Appearance parameter without 
throwing NPE.
 2013-04-22 09:23:45 -05:00
kruland2607
c1ad923d93 Fix initialization in constructors so all constructors initialize the 
motorConfigurations and ignitionConfiguration.  This fixes unit tests.
 2013-04-21 21:45:13 -05:00
kruland2607
50e37d747f Added footnotes for configurable parameters. 2013-04-16 21:54:45 -05:00
Sampo Niskanen
c55ad71fd5 Update copyright year 2013-04-16 22:55:01 +03: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
15c1cffde6 Display language names in the preference drop down in both the localized 
and unlocalized form.  This makes switching for non-native speakers
easier.
 2013-04-16 14:10:24 -05:00
kruland2607
8f9dc93705 Merge in l10n changes. 2013-04-16 13:53:17 -05:00
kruland2607
44e0274ab2 When importing from RockSim, ignore texture specs which are empty. 2013-04-14 18:39:06 -05:00
kruland2607
8d90c8aae4 When importing from RockSim, don't complain about spill holes in 
parachutes when the hole has radius 0.
 2013-04-14 18:44:29 -05:00
kruland2607
c9c75248cf Added extra help message about configuring the default editor in 
preferences.
 2013-04-08 16:47:59 -05:00
kruland2607
1d3d860864 Correct casts used in reset action on radial position tab. 2013-04-08 16:08:13 -05:00
kruland2607
abb2a7c22a Removed some printlns. 2013-04-08 16:07:16 -05:00
kruland2607
52772674d2 Fixed issue with 3d view now updating when an edited texture is saved. 
The Configuration object did not propagate the underlying Texture
Changed ComponentChangeEvent object.  Modified RocketPanel to listen to
the Rocket object for Texture changes, and to the Configuration object
for other changes which update the "extras" (cg, stability, etc) and the
Figure.
 2013-04-07 20:46:39 -05:00
kruland2607
faac6d2537 commented out extraneous println. 2013-04-07 20:46:38 -05:00
bkuker
0477c3edfd Fix for issue #45, set the appearance on the freeform finset when 
chaning a finset to freeform.
 2013-04-07 09:29:50 -04:00
bkuker
6f72662ea8 get motor from MotorMount with non-deprecated method 2013-04-05 14:17:35 -04:00
bkuker
d7b46d6058 Pretty confident I should be clearing textures on dispose() 2013-04-05 13:56:04 -04:00
bkuker
381cab468c Fix the order of init() calls to fix brightness problem on paint vs 
texture.
Clean up the setType method, but it is still not great.
 2013-04-05 13:55:48 -04:00
kruland2607
9b96dabb16 Dirty fix for problem switching to 3d rendering the first time. 2013-04-04 10:44:28 -05:00
bkuker
b20076f248 Fix flash of paint without decals when switching between default and 
custom appearance
 2013-03-31 11:45:01 -04:00
bkuker
9fd739b4a8 Draw inside surface of transition offset by transition thickness. 
Note the offset is perpendicular to the axis of the rocket, not normal
to the transition surface, so it is not a perfect render, but closer to
correct than before.
 2013-03-30 10:37:55 -04:00
bkuker
c9652d851c Render edges of a transition with thickness 2013-03-30 09:39:51 -04:00
bkuker
4ff3b02916 Do not render shoulders if zero length 2013-03-30 09:19:14 -04:00
kruland2607
ec8248fd10 Implemented optimization for FlightConfigurableParameters. Added back 
support optimization of deployment delay, deployment altitude, and
ignition delay.  GeneralOptimizationDialog was changed to remove the
sorting or the optimization variables.  It was catestrophically broken
even after previous attempts to fix it.  Note: the change to
GeneralOptimizationDialog accidentally slipped into the previous commit.
 2013-03-29 00:39:49 -05:00
kruland2607
e254ff0e94 Make the appearance dialog work better when switching between default 
texture and custom.  Also ensure that default texture names do not
appear in the texture drop down.
 2013-03-29 00:18:40 -05:00
kruland2607
fe8cc22f6b Have Simulation.duplicateSimulation copy the configuration id as well. 2013-03-27 22:12:54 -05:00
kruland2607
ea3aeedf1b Make SimulationOptions.copyFrom prefer matches based on exact match of 
the configuration id.
 2013-03-27 22:12:09 -05:00