hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1875 from hcraigmiller/Surface-Roughness-Update

Browse Source 
Corrects polished value and adds 4 additional surfaces
This commit is contained in:
Joe Pfeiffer 2022-12-12 10:41:32 -07:00 committed by GitHub
commit 04177a99f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/resources/l10n/messages.properties
View File

@ -1516,10 +1516,14 @@ material.tubular_nylon_25_mm_1_in = Tubular nylon (25 mm, 1 in)
! ExternalComponent ! ExternalComponent
ExternalComponent.Rough = Rough ExternalComponent.Rough = Rough
ExternalComponent.Roughunfinished = Rough unfinished
ExternalComponent.Unfinished = Unfinished ExternalComponent.Unfinished = Unfinished
ExternalComponent.Regularpaint = Regular paint ExternalComponent.Regularpaint = Regular paint
ExternalComponent.Smoothpaint = Smooth paint ExternalComponent.Smoothpaint = Smooth paint
ExternalComponent.Polished = Polished ExternalComponent.Optimumpaint = Optimum paint
ExternalComponent.Polished = Aircraft sheet-metal
ExternalComponent.Finishedpolished = Finished/polished surface
ExternalComponent.Mirror = Mirror surface
! LineStyle ! LineStyle
LineStyle.Solid = Solid LineStyle.Solid = Solid

10
core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
View File

@ -22,14 +22,22 @@ public abstract class ExternalComponent extends RocketComponent {
public enum Finish { public enum Finish {
//// Rough //// Rough
ROUGH("ExternalComponent.Rough", 500e-6), ROUGH("ExternalComponent.Rough", 500e-6),
//// Rough unfinished
ROUGHUNFINISHED("ExternalComponent.Roughunfinished", 250e-6),
//// Unfinished //// Unfinished
UNFINISHED("ExternalComponent.Unfinished", 150e-6), UNFINISHED("ExternalComponent.Unfinished", 150e-6),
//// Regular paint //// Regular paint
NORMAL("ExternalComponent.Regularpaint", 60e-6), NORMAL("ExternalComponent.Regularpaint", 60e-6),
//// Smooth paint //// Smooth paint
SMOOTH("ExternalComponent.Smoothpaint", 20e-6), SMOOTH("ExternalComponent.Smoothpaint", 20e-6),
//// Optimum paint
OPTIMUM("ExternalComponent.Optimumpaint", 5e-6),
//// Polished //// Polished
POLISHED("ExternalComponent.Polished", 2e-6); POLISHED("ExternalComponent.Polished", 2e-6),
//// Optimum paint
FINISHPOLISHED("ExternalComponent.Finishedpolished", .5e-6),
//// Optimum paint
MIRROR("ExternalComponent.Mirror", 0.0e-6);
private static final Translator trans = Application.getTranslator(); private static final Translator trans = Application.getTranslator();
private final String name; private final String name;