Skip to content

Commit 4c45eb2

Browse files
authored
Merge pull request #837 from luzpaz/typos
Typo fixes
2 parents 9b65709 + a7f62f2 commit 4c45eb2

File tree

15 files changed

+49
-49
lines changed

15 files changed

+49
-49
lines changed

.github/ISSUE_TEMPLATE/modelling-question.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ are appreciated.
1818
If you want to discuss something in a more casual environment, we have other options under [Getting help in the README.md](https://github.com/CadQuery/cadquery#getting-help). There are also additional examples in the [cadquery-contrib repository](https://github.com/CadQuery/cadquery-contrib).
1919
-->
2020

21-
<!-- We are all volunteers here, you can help us help you by making this question quick to answer. Minimal examples, trimmed of all unreleated code are appreciated. It also helps if you provide code that can be cut and pasted into CQ-Editor. ie. instead of:
21+
<!-- We are all volunteers here, you can help us help you by making this question quick to answer. Minimal examples, trimmed of all unrelated code are appreciated. It also helps if you provide code that can be cut and pasted into CQ-Editor. ie. instead of:
2222
2323
> I have a box, how to I fillet a top corner?
2424

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CadQuery is often compared to [OpenSCAD](http://www.openscad.org/). Like OpenSCA
2525
* Create parametric models that can be very easily customized by end users.
2626
* Output high quality (loss-less) CAD formats like STEP and DXF in addition to STL, VRML and AMF.
2727
* Provide a non-proprietary, plain text model format that can be edited and executed with only a web browser.
28-
* Offer advanced modeling capabilities such as fillets, curvelinear extrudes, parametric curves and lofts.
28+
* Offer advanced modeling capabilities such as fillets, curvilinear extrudes, parametric curves and lofts.
2929
* Build nested assemblies out of individual parts and other assemblies.
3030

3131
### Why this fork
@@ -175,7 +175,7 @@ If you are going to contribute code, make sure to follow this steps:
175175
start working on your changes
176176
- Create a conda development environment with something like:
177177
- `conda env create -n cq-dev -f environment.yml`
178-
- Activate the new conda enviornment:
178+
- Activate the new conda environment:
179179
- `conda activate cq-dev`
180180
- If desired, install the master branch of cq-editor (Note; a release version may not be compatible with the master branch of cadquery):
181181
- `conda install -c cadquery -c conda-forge cq-editor=master`

cadquery/assembly.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
PATH_DELIM = "/"
2828

29-
# enitity selector grammar definiiton
29+
# entity selector grammar definiiton
3030
def _define_grammar():
3131

3232
from pyparsing import (
@@ -83,11 +83,11 @@ def __init__(
8383
"""
8484
Construct a constraint.
8585
86-
:param objects: object names refernced in the constraint
86+
:param objects: object names referenced in the constraint
8787
:param args: subshapes (e.g. faces or edges) of the objects
8888
:param sublocs: locations of the objects (only relevant if the objects are nested in a sub-assembly)
8989
:param kind: constraint kind
90-
:param param: optional arbitrary paramter passed to the solver
90+
:param param: optional arbitrary parameter passed to the solver
9191
"""
9292

9393
self.objects = objects
@@ -411,7 +411,7 @@ def constrain(self, *args, param=None):
411411
elif len(args) == 6:
412412
id1, s1, id2, s2, kind, param = args
413413
else:
414-
raise ValueError(f"Incompatibile arguments: {args}")
414+
raise ValueError(f"Incompatible arguments: {args}")
415415

416416
loc1, id1_top = self._subloc(id1)
417417
loc2, id2_top = self._subloc(id2)

cadquery/cq.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ def rotateAboutCenter(self: T, axisEndPoint: VectorLike, angleDegrees: float) ->
10871087
Future Enhancements:
10881088
* A version of this method that returns a transformed copy, rather than modifying
10891089
the originals
1090-
* This method doesnt expose a very good interface, because the axis of rotation
1090+
* This method doesn't expose a very good interface, because the axis of rotation
10911091
could be inconsistent between multiple objects. This is because the beginning
10921092
of the axis is variable, while the end is fixed. This is fine when operating on
10931093
one object, but is not cool for multiple.
@@ -1687,7 +1687,7 @@ def polarLineTo(
16871687
self: T, distance: float, angle: float, forConstruction: bool = False
16881688
) -> T:
16891689
"""
1690-
Make a line from the current point to the given polar co-ordinates
1690+
Make a line from the current point to the given polar coordinates
16911691
16921692
Useful if it is more convenient to specify the end location rather than
16931693
the distance and angle from the current point
@@ -1817,7 +1817,7 @@ def spline(
18171817
where a tangent constraint is specified.
18181818
:param periodic: creation of periodic curves
18191819
:param parameters: the value of the parameter at each interpolation point.
1820-
(The intepolated curve is represented as a vector-valued function of a
1820+
(The interpolated curve is represented as a vector-valued function of a
18211821
scalar parameter.)
18221822
18231823
If periodic == True, then len(parameters) must be
@@ -2767,7 +2767,7 @@ def cutEach(
27672767

27682768
return self.newObject([s])
27692769

2770-
# but parameter list is different so a simple function pointer wont work
2770+
# but parameter list is different so a simple function pointer won't work
27712771
def cboreHole(
27722772
self: T,
27732773
diameter: float,
@@ -2822,7 +2822,7 @@ def cboreHole(
28222822
return self.cutEach(lambda loc: r.moved(loc), True, clean)
28232823

28242824
# TODO: almost all code duplicated!
2825-
# but parameter list is different so a simple function pointer wont work
2825+
# but parameter list is different so a simple function pointer won't work
28262826
def cskHole(
28272827
self: T,
28282828
diameter: float,
@@ -2879,7 +2879,7 @@ def cskHole(
28792879
return self.cutEach(lambda loc: res.moved(loc), True, clean)
28802880

28812881
# TODO: almost all code duplicated!
2882-
# but parameter list is different so a simple function pointer wont work
2882+
# but parameter list is different so a simple function pointer won't work
28832883
def hole(
28842884
self: T, diameter: float, depth: Optional[float] = None, clean: bool = True,
28852885
) -> T:
@@ -3589,7 +3589,7 @@ def interpPlate(
35893589
maxSegments: int = 9,
35903590
) -> T:
35913591
"""
3592-
Returns a plate surface that is 'thickness' thick, enclosed by 'surf_edge_pts' points, and going through 'surf_pts' points. Using pushpoints directly with interpPlate and combine=True, can be very ressources intensive depending on the complexity of the shape. In this case set combine=False.
3592+
Returns a plate surface that is 'thickness' thick, enclosed by 'surf_edge_pts' points, and going through 'surf_pts' points. Using pushpoints directly with interpPlate and combine=True, can be very resources intensive depending on the complexity of the shape. In this case set combine=False.
35933593
35943594
:param surf_edges
35953595
:type 1 surf_edges: list of [x,y,z] float ordered coordinates

cadquery/occ_impl/geom.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def Center(self) -> "Vector":
163163
"""Return the vector itself
164164
165165
The center of myself is myself.
166-
Provided so that vectors, vertexes, and other shapes all support a
166+
Provided so that vectors, vertices, and other shapes all support a
167167
common interface, when Center() is requested for all objects on the
168168
stack.
169169
"""
@@ -693,7 +693,7 @@ def mirrorInPlane(self, listOfShapes, axis="X"):
693693
for w in listOfShapes:
694694
mirrored = w.transformShape(Matrix(T))
695695

696-
# attemp stitching of the wires
696+
# attempt stitching of the wires
697697
resultWires.append(mirrored)
698698

699699
return resultWires

cadquery/occ_impl/importers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ def _dxf_spline(el):
136136
knots.SetValue(i + 1, k)
137137
multiplicities.SetValue(i + 1, m)
138138

139-
# assemble wieghts if present:
139+
# assemble weights if present:
140140
if el.weights:
141141
rational = True
142142

143143
weights = OCP.TColStd.TColStd_Array1OfReal(1, len(el.weights))
144144
for i, w in enumerate(el.weights):
145145
weights.SetValue(i + 1, w)
146146

147-
# assmeble conotrol points
147+
# assemble control points
148148
pts = TColgp_Array1OfPnt(1, len(el.control_points))
149149
for i, p in enumerate(el.control_points):
150150
pts.SetValue(i + 1, gp_Pnt(*p))

cadquery/occ_impl/shapes.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
from OCP.TopExp import TopExp_Explorer # Toplogy explorer
100100

101-
# used for getting underlying geoetry -- is this equvalent to brep adaptor?
101+
# used for getting underlying geoetry -- is this equivalent to brep adaptor?
102102
from OCP.BRep import BRep_Tool, BRep_Builder
103103

104104
from OCP.TopoDS import (
@@ -420,7 +420,7 @@ def cast(
420420
}
421421

422422
t = shapetype(obj)
423-
# NB downcast is nedded to handly TopoDS_Shape types
423+
# NB downcast is needed to handly TopoDS_Shape types
424424
tr = constructor_LUT[t](downcast(obj))
425425
tr.forConstruction = forConstruction
426426

@@ -1045,7 +1045,7 @@ def split(self, *splitters: "Shape") -> "Shape":
10451045

10461046
def mesh(self, tolerance: float, angularTolerance: float = 0.1):
10471047
"""
1048-
Generate traingulation if none exists.
1048+
Generate triangulation if none exists.
10491049
"""
10501050

10511051
if not BRepTools.Triangulation_s(self.wrapped, tolerance):
@@ -1115,7 +1115,7 @@ def toVtkPolyData(
11151115

11161116
rv = shape_data.getVtkPolyData()
11171117

1118-
# convert to traingles and split edges
1118+
# convert to triangles and split edges
11191119
t_filter = vtkTriangleFilter()
11201120
t_filter.SetInputData(rv)
11211121
t_filter.Update()
@@ -1353,7 +1353,7 @@ def positionAt(
13531353
d: float,
13541354
mode: Literal["length", "parameter"] = "length",
13551355
) -> Vector:
1356-
"""Generate a postion along the underlying curve.
1356+
"""Generate a position along the underlying curve.
13571357
:param d: distance or parameter value
13581358
:param mode: position calculation mode (default: length)
13591359
:return: A Vector on the underlying curve located at the specified d value.
@@ -1567,8 +1567,8 @@ def makeSpline(
15671567
15681568
:param listOfVector: a list of Vectors that represent the points
15691569
:param tangents: tuple of Vectors specifying start and finish tangent
1570-
:param periodic: creation of peridic curves
1571-
:param parameters: the value of the parameter at each interpolation point. (The intepolated
1570+
:param periodic: creation of periodic curves
1571+
:param parameters: the value of the parameter at each interpolation point. (The interpolated
15721572
curve is represented as a vector-valued function of a scalar parameter.) If periodic ==
15731573
True, then len(parameters) must be len(intepolation points) + 1, otherwise len(parameters)
15741574
must be equal to len(interpolation points).
@@ -1899,7 +1899,7 @@ def makeHelix(
18991899
gp_Ax3(center.toPnt(), dir.toDir()), angle * DEG2RAD, radius
19001900
)
19011901

1902-
# 2. construct an semgent in the u,v domain
1902+
# 2. construct an segment in the u,v domain
19031903
if lefthand:
19041904
geom_line = Geom2d_Line(gp_Pnt2d(0.0, 0.0), gp_Dir2d(-2 * pi, pitch))
19051905
else:
@@ -2415,7 +2415,7 @@ def isInside(
24152415
object within the specified tolerance.
24162416
24172417
:param point: tuple or Vector representing 3D point to be tested
2418-
:param tolerance: tolerence for inside determination, default=1.0e-6
2418+
:param tolerance: tolerance for inside determination, default=1.0e-6
24192419
:return: bool indicating whether or not point is within solid
24202420
"""
24212421
if isinstance(point, Vector):
@@ -2765,7 +2765,7 @@ def extrudeLinearWithRotation(
27652765
straight_spine_e = Edge.makeLine(vecCenter, vecCenter.add(vecNormal))
27662766
straight_spine_w = Wire.combine([straight_spine_e,])[0].wrapped
27672767

2768-
# make an auxliliary spine
2768+
# make an auxiliary spine
27692769
pitch = 360.0 / angleDegrees * vecNormal.Length
27702770
radius = 1
27712771
aux_spine_w = Wire.makeHelix(
@@ -2783,7 +2783,7 @@ def extrudeLinearWithRotation(
27832783
for w in innerWires
27842784
]
27852785

2786-
# combine the inner solids into compund
2786+
# combine the inner solids into compound
27872787
inner_comp = Compound._makeCompound(inner_solids)
27882788

27892789
# subtract from the outer solid
@@ -2933,7 +2933,7 @@ def sweep(
29332933
:param outerWire: the outermost wire
29342934
:param innerWires: a list of inner wires
29352935
:param path: The wire to sweep the face resulting from the wires over
2936-
:param boolean makeSolid: return Solid or Shell (defualt True)
2936+
:param boolean makeSolid: return Solid or Shell (default True)
29372937
:param boolean isFrenet: Frenet mode (default False)
29382938
:param mode: additional sweep mode parameters.
29392939
:param transitionMode:
@@ -3027,7 +3027,7 @@ def dprism(
30273027
"""
30283028
Make a prismatic feature (additive or subtractive)
30293029
3030-
:param basis: face to perfrom the operation on
3030+
:param basis: face to perform the operation on
30313031
:param profiles: list of profiles
30323032
:param depth: depth of the cut or extrusion
30333033
:param thruAll: cut thruAll

cadquery/selectors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ def filterResults(self, r_left, r_right):
586586

587587
class SubtractSelector(BinarySelector):
588588
"""
589-
Difference selector. Substract results of a selector from another
589+
Difference selector. Subtract results of a selector from another
590590
selectors results.
591591
"""
592592

@@ -842,7 +842,7 @@ class StringSyntaxSelector(Selector):
842842
843843
:return: objects that match the specified selector
844844
845-
***Modfiers*** are ``('|','+','-','<','>','%')``
845+
***Modifiers*** are ``('|','+','-','<','>','%')``
846846
847847
:\|:
848848
parallel to ( same as :py:class:`ParallelDirSelector` ). Can return multiple objects.
@@ -862,7 +862,7 @@ class StringSyntaxSelector(Selector):
862862
***axisStrings*** are: ``X,Y,Z,XY,YZ,XZ`` or ``(x,y,z)`` which defines an arbitrary direction
863863
864864
It is possible to combine simple selectors together using logical operations.
865-
The following operations are suuported
865+
The following operations are supported
866866
867867
:and:
868868
Logical AND, e.g. >X and >Y

doc/apireference.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Selectors
167167
------------------------
168168

169169
Objects that filter and select CAD objects. Selectors are used to select existing geometry
170-
as a basis for futher operations.
170+
as a basis for further operations.
171171

172172
.. currentmodule:: cadquery.selectors
173173
.. autosummary::

doc/examples.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ like :py:meth:`Workplane.circle` and :py:meth:`Workplane.rect`, will operate on
193193
Polygons
194194
-------------------------
195195

196-
You can create polygons for each stack point if you would like. Useful in 3d printers whos firmware does not
196+
You can create polygons for each stack point if you would like. Useful in 3d printers whose firmware does not
197197
correct for small hole sizes.
198198

199199
.. cadquery::
@@ -739,7 +739,7 @@ Here we fillet all of the edges of a simple plate.
739739
Tagging objects
740740
----------------
741741

742-
The :py:meth:`Workplane.tag` method can be used to tag a particular object in the chain with a string, so that it can be refered to later in the chain.
742+
The :py:meth:`Workplane.tag` method can be used to tag a particular object in the chain with a string, so that it can be referred to later in the chain.
743743

744744
The :py:meth:`Workplane.workplaneFromTagged` method applies :py:meth:`Workplane.copyWorkplane` to a tagged object. For example, when extruding two different solids from a surface, after the first solid is extruded it can become difficult to reselect the original surface with CadQuery's other selectors.
745745

doc/primer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ The output is now:
387387
tags: {'base': <cadquery.cq.Workplane object at 0xaa90>}
388388
389389
Modelling operations take their wires and edges from the modelling context's pending lists. In order
390-
to use the :meth:`~cadquery.Workplane.loft` command futher down the chain, we need to push this wire
390+
to use the :meth:`~cadquery.Workplane.loft` command further down the chain, we need to push this wire
391391
to the modelling context with::
392392

393393
part = part.toPending()

doc/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ There are a couple of things to note about this line:
166166
1. The :py:meth:`cadquery.Workplane.rect` function draws a rectangle. **forConstruction=True**
167167
tells CadQuery that this rectangle will not form a part of the solid,
168168
but we are just using it to help define some other geometry.
169-
2. Unless you specifiy otherwise, a rectangle is drawn with its center on the current workplane center-- in
169+
2. Unless you specify otherwise, a rectangle is drawn with its center on the current workplane center-- in
170170
this case, the center of the top face of the block. So this rectangle will be centered on the face.
171171

172172

examples/Ex024_Sweep_With_Multiple_Sections.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
.sweep(path, multisection=True)
1616
)
1717

18-
# We can sweep thrue different shapes
18+
# We can sweep through different shapes
1919
recttocircleSweep = (
2020
cq.Workplane("YZ")
2121
.workplane(offset=-10.0)
@@ -63,7 +63,7 @@
6363

6464
# Placement of different shapes should follow the path
6565
# cylinder r=1.5 along first line
66-
# then sweep allong arc from r=1.5 to r=1.0
66+
# then sweep along arc from r=1.5 to r=1.0
6767
# then cylinder r=1.0 along last line
6868
arcSweep = (
6969
cq.Workplane("YZ")

0 commit comments

Comments
 (0)