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

Merge pull request #1748 from luzpaz/typos

Browse Source 
Fix various typos
This commit is contained in:
Sibo Van Gool 2022-10-15 23:41:57 +02:00 committed by GitHub
commit 4509b831ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/build.xml
View File

@ -60,7 +60,7 @@
<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="1.8" target="1.8"/>
</target>
<!-- Executible Eclipse-Jar-In-Jar style JAR -->
<!-- Executable Eclipse-Jar-In-Jar style JAR -->
<target name="jar" depends="build" description="Create the OpenRocket Core">
<mkdir dir="${jar.dir}" />
<jar destfile="${jar.file}" basedir="${dist.dir}">

4
core/doc/techdoc/chapter-conclusion.tex
View File

@ -10,7 +10,7 @@ pyrotechnics. At its best, it works as an inspiration for youngsters
to study engineering and sciences.
This thesis work provides one of the computer-age tools for everybody
intrested in model rocket design. Providing everybody free access to
interested in model rocket design. Providing everybody free access to
a full-fledged rocket simulator allows many more hobbyists to
experiment with different kinds of rocket designs and become more
involved in the sport. The most enthusiastic rocketeers may dive
@ -44,7 +44,7 @@ insight into the effects of roll during flight.
The external listener classes that can be attached to the simulator
allow huge potential for custom extensions. For example testing the
active roll reduction controller that will be included in the
successor project of Haisunäätä would have been exceedingly difficult
successor project of Haisun<EFBFBD><EFBFBD>t<EFBFBD> would have been exceedingly difficult
without such support. By interfacing the actual controller with a
simulated flight environment it was possible to discover various bugs
in the controller software that would otherwise have gone undetected.

2
core/resources/datafiles/tours/creating_design/creating_design.tour
View File

@ -113,7 +113,7 @@ mass. The <em>packed length</em>, <em>diameter</em> and
<em>position</em> affect the packed size and location of the
parachute.
<p>The <em>Deploys at</em> propery can be used to affect when the
<p>The <em>Deploys at</em> property can be used to affect when the
parachute deploys. The <em>First ejection charge of this stage</em>
option will deploy the parachute when the ejection charge is fired, as
is typical in small model rockets.

2
core/src/net/sf/openrocket/appearance/AppearanceBuilder.java
View File

@ -523,7 +523,7 @@ public class AppearanceBuilder extends AbstractChangeSource {
}
/**
* only applies change if there is no more changes comming
* only applies change if there is no more changes coming
*/
@Override
protected void fireChangeEvent() {

2
core/src/net/sf/openrocket/database/Databases.java
View File

@ -155,7 +155,7 @@ public class Databases {
* @param type The type of material
* @param baseName the name of material
* @param density density
* @return a new onejct withe the material data
* @return a new object with the material data
*/
private static Material newMaterial(Type type, String baseName, double density) {
String name = trans.get("material", baseName);

2
core/src/net/sf/openrocket/file/GeneralRocketLoader.java
View File

@ -104,7 +104,7 @@ public class GeneralRocketLoader {
}
/**
* This method determines the type file contained in the stream then calls the appropriate loading mecahnism.
* This method determines the type file contained in the stream then calls the appropriate loading mechanism.
*
* If the stream is a gzip file, the argument is wrapped in a GzipInputStream and the rocket loaded.
*

2
core/src/net/sf/openrocket/file/openrocket/savers/AxialStageSaver.java
View File

@ -20,7 +20,7 @@ public class AxialStageSaver extends ComponentAssemblySaver {
if (c.isAfter()) {
// yes, this test is redundant. I'm merely paranoid, and attempting to future-proof it
if (c.getClass().equals(AxialStage.class)) {
// kept as simply 'stage' for backward compatability
// kept as simply 'stage' for backward compatibility
list.add("<stage>");
instance.addParams(c, list);
list.add("</stage>");

6
core/src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java
View File

@ -16,7 +16,7 @@ public class AtmosphericConditions implements Cloneable, Monitorable {
/** The standard air pressure (1.01325 bar). */
public static final double STANDARD_PRESSURE = 101325.0;
/** The standard air temperature (20 degrees Celcius). */
/** The standard air temperature (20 degrees Celsius). */
public static final double STANDARD_TEMPERATURE = 293.15;
@ -83,7 +83,7 @@ public class AtmosphericConditions implements Cloneable, Monitorable {
* Return the current speed of sound for dry air.
* <p>
* The speed of sound is calculated using the expansion around the temperature 0 C
* <code> c = 331.3 + 0.606*T </code> where T is in Celcius. The result is accurate
* <code> c = 331.3 + 0.606*T </code> where T is in Celsius. The result is accurate
* to about 0.5 m/s for temperatures between -30 and 30 C, and within 2 m/s
* for temperatures between -55 and 30 C.
*
@ -98,7 +98,7 @@ public class AtmosphericConditions implements Cloneable, Monitorable {
* Return the current kinematic viscosity of the air.
* <p>
* The effect of temperature on the viscosity of a gas can be computed using
* Sutherland's formula. In the region of -40 ... 40 degrees Celcius the effect
* Sutherland's formula. In the region of -40 ... 40 degrees Celsius the effect
* is highly linear, and thus a linear approximation is used in its stead.
* This is divided by the result of {@link #getDensity()} to achieve the
* kinematic viscosity.

2
core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java
View File

@ -222,7 +222,7 @@ public abstract class BaseComponentDTO {
} else if ("LINE".equals(type)) {
return Material.Type.LINE;
}
throw new IllegalArgumentException("Inavlid material type " + type + " specified for Component");
throw new IllegalArgumentException("Invalid material type " + type + " specified for Component");
}
}

2
core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java
View File

@ -28,7 +28,7 @@ public final class FlightConfigurationId implements Comparable<FlightConfigurati
/**
* builds the id with the given String
* @param _str te string to be made into the id
* @param _str the string to be made into the id
*/
public FlightConfigurationId(final String _str) {
UUID candidate;

2
core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java
View File

@ -215,7 +215,7 @@ public class FreeformFinSet extends FinSet {
* - non-self-intersecting fin shape (aborts set on invalid fin point)
* </p><p>
* NOTE: the fin-point axes differ from rocket axes:
* +x within the fin points foreward; +x for the rocket points aft
* +x within the fin points forward; +x for the rocket points aft
* </p><p>
* Moving of the first point in the X-axis is allowed, but this actually moves
* all of the other points the corresponding distance back, relative to the first.

2
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
View File

@ -213,7 +213,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
// }
// Check for Tumbling
// Conditions for transision are:
// Conditions for transition are:
// apogee reached (if sustainer stage)
// and is not already tumbling
// and not stable (cg > cp)

2
core/src/net/sf/openrocket/simulation/FlightDataType.java
View File

@ -251,7 +251,7 @@ public class FlightDataType implements Comparable<FlightDataType> {
* This returns an existing data type if the symbol matches that of an existing type.
*
* If the symbol matches but the unit and description information differ, then the old stored datatype
* is erased and the updated version based on the given parametes is returned.
* is erased and the updated version based on the given parameters is returned.
* The only exception is if the description or unitgroup are undefined (null or empty string). In this case
* we just get these parameters from the existing type when making the new one.
*

2
core/src/net/sf/openrocket/util/TestRockets.java
View File

@ -1594,7 +1594,7 @@ public class TestRockets {
stage2.setName("Stage2");
rocket.addChild(stage2);
// make 2st stage body tube
// make 2nd stage body tube
BodyTube bodyTube2 = new BodyTube(12, 1, 0.05);
stage2.addChild(bodyTube2);

2
core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
View File

@ -289,7 +289,7 @@ public class BarrowmanCalculatorTest {
AerodynamicCalculator calc = new BarrowmanCalculator();
FlightConfiguration configuration = rocket.getSelectedConfiguration();
assertTrue("Estes Alpha III should be continous: ", calc.isContinuous(configuration, rocket));
assertTrue("Estes Alpha III should be continuous: ", calc.isContinuous(configuration, rocket));
}
@Test

2
core/test/net/sf/openrocket/file/rocksim/importt/TubeFins1.rkt
View File

@ -27,7 +27,7 @@
<FinishMedium>0</FinishMedium>
<FinishCoatCount>1</FinishCoatCount>
<GlueType>0</GlueType>
<Comments>This is a neat design that shows off the ability of RockSim to compute the stability of Assymetrical fin arrangements.</Comments>
<Comments>This is a neat design that shows off the ability of RockSim to compute the stability of Asymmetrical fin arrangements.</Comments>
<Designer>Tim Van Milligan. Visit my web site at: www.ApogeeRockets.com</Designer>
<CPSimFlags>4</CPSimFlags>
<LastSerialNumber>29</LastSerialNumber>

2
core/test/net/sf/openrocket/file/rocksim/importt/TubeFins2.rkt
View File

@ -27,7 +27,7 @@
<FinishMedium>0</FinishMedium>
<FinishCoatCount>1</FinishCoatCount>
<GlueType>0</GlueType>
<Comments>This is a neat design that shows off the ability of RockSim to compute the stability of Assymetrical fin arrangements.</Comments>
<Comments>This is a neat design that shows off the ability of RockSim to compute the stability of Asymmetrical fin arrangements.</Comments>
<Designer>Tim Van Milligan. Visit my web site at: www.ApogeeRockets.com</Designer>
<CPSimFlags>4</CPSimFlags>
<LastSerialNumber>29</LastSerialNumber>

2
core/test/net/sf/openrocket/masscalc/MassCalculatorTest.java
View File

@ -1030,7 +1030,7 @@ public class MassCalculatorTest extends BaseTestCase {
mmt.setOverrideMass(0.213);
// cm= 0.21300000g @[1.28900000,0.07700000,0.00000000]
// Fin mass is not overriden
// Fin mass is not overridden
// cm= 0.15995232g @[1.23793939,0.07700000,0.00000000]
RigidBody boosterData = MassCalculator.calculateStructure(config);

2
core/web/html/actions/updates.php
View File

@ -74,7 +74,7 @@ header("Content-type: text/plain");
* Currently all old versions are handled manually.
* Update checking was introduced in OpenRocket 0.9.4
*
* We ignore "pre" versions, they are handled exacly like
* We ignore "pre" versions, they are handled exactly like
* their non-pre counterparts.
*/
$version = $_GET["version"];

2
core/web/htp/contact.htp
View File

@ -10,7 +10,7 @@
<h2>Mailing lists</h2>
<p>OpenRocket currently has two mailing lists for
intrested users:</p>
interested users:</p>
<dl>
<dt>

6
core/web/htp/news.htp
View File

@ -45,14 +45,14 @@
<p><span class="date">15.11.2013:</span> Version 13.11.1 is
<a href="download.html">released</a>! This release contains bug fixes
including fixing Tube Coupler configuration, various exceptions in
the flight configuration tab, updated 3d libraris (which didn't really make
the flight configuration tab, updated 3d libraries (which didn't really make
it into previous versions).</p>
<p><span class="date">8.11.2013:</span> Version 13.11 is
<a href="download.html">released</a>! This release simplifies
flight configurations by replacing the dialog with the configuration
tab. Motor filtering in the motor chooser dialog has been enhanced.
Chineese translations have been added and Russian translations updated.
Chinese translations have been added and Russian translations updated.
Updated the 3D libraries, and squashed some bugs introduced by Java 1.7.0_45-b18.</p>
<p><span class="date">6.10.2013:</span> Version 13.09.1 is
@ -104,7 +104,7 @@
<li>Support for fractional inches (1/64) for unit length</li>
<li>Added preference for windspeed units separately</li>
<li>Added "most recently used files" in File Menu</li>
<li>Improved printed accurracy in fin marking guide</li>
<li>Improved printed accuracy in fin marking guide</li>
<li>Calibration rulers added to printed templates</li>
<li>Translations in Czech and Polish, numerous updates</li>
</ul>