Skip to content

Commit

Permalink
Merge pull request #4186 from luzpaz/typos
Browse files Browse the repository at this point in the history
Fix typos [skip ci]
  • Loading branch information
yorikvanhavre committed Dec 24, 2020
2 parents af605e4 + ff96cb3 commit 145fa6b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/Mod/Arch/importWebGL.py
Expand Up @@ -670,7 +670,7 @@ def export( exportList, filename, colors = None, camera = None ):
break
if not found: break
if not found:
FreeCAD.Console.PrintMessage("Facet to Face Mismach.\n")
FreeCAD.Console.PrintMessage("Facet to Face Mismatch.\n")
objdata['facesToFacets'] = []
break

Expand All @@ -685,7 +685,7 @@ def export( exportList, filename, colors = None, camera = None ):
break
if not found: break
if not found:
FreeCAD.Console.PrintMessage("Facet List Mismach.\n")
FreeCAD.Console.PrintMessage("Facet List Mismatch.\n")
objdata['facesToFacets'] = []
break

Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Draft/draftguitools/gui_draft2sketch.py
Expand Up @@ -24,7 +24,7 @@
# ***************************************************************************
"""Provides GUI tools to convert Draft objects to Sketches and back.
Many Draft objects will be converted to a single non-contrainted Sketch.
Many Draft objects will be converted to a single non-constrained Sketch.
However, a single sketch with disconnected traces will be converted
into several individual Draft objects.
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/Path/PathScripts/PathSlot.py
Expand Up @@ -792,7 +792,7 @@ def getRadians(self, E):
flag = 1
eCnt = len(shape.Edges)
lstE = eCnt - 1
for i in range(0, eCnt): # populate empty parrallel edge flag list
for i in range(0, eCnt): # populate empty parallel edge flag list
parallel_edge_flags.append(0)
for i in range(0, eCnt): # Cycle through edges to identify parallel pairs
if i < lstE:
Expand Down Expand Up @@ -1075,7 +1075,7 @@ def _dXdYdZ(self, E):

def _normalizeVector(self, v):
"""_normalizeVector(v)...
Returns a copy of the vector recieved with values rounded to 10 decimal places."""
Returns a copy of the vector received with values rounded to 10 decimal places."""
posTol = 0.0000000001
negTol = -1 * posTol
V = FreeCAD.Vector(v.x, v.y, v.z)
Expand Down Expand Up @@ -1220,7 +1220,7 @@ def _processFeature(self, obj, shape, sub, pNum):
def _extendArcSlot(self, p1, p2, cent, begExt, endExt):
"""_extendArcSlot(p1, p2, cent, begExt, endExt)...
This function extends an arc defined by two end points, p1 and p2, and the center.
The arc is extended along the circumferance with begExt and endExt values.
The arc is extended along the circumference with begExt and endExt values.
The function returns the new end points as tuple (n1, n2) to replace p1 and p2."""
cancel = True
n1 = p1
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Path/PathScripts/post/heidenhain_post.py
Expand Up @@ -490,8 +490,8 @@ def HEIDEN_End(ActualJob): #use Label for program name
program_id = "NEW"
return "END PGM " + program_id + " " + UNITS

#def HEIDEN_ToolDef(tool_id, tool_lenght, tool_radius): # old machines don't have tool table, need tooldef list
# return "TOOL DEF " + tool_id + " R" + "{:.3f}".format(tool_lenght) + " L" + "{:.3f}".format(tool_radius)
#def HEIDEN_ToolDef(tool_id, tool_length, tool_radius): # old machines don't have tool table, need tooldef list
# return "TOOL DEF " + tool_id + " R" + "{:.3f}".format(tool_length) + " L" + "{:.3f}".format(tool_radius)

def HEIDEN_ToolCall(tool_Params):
global MACHINE_SPINDLE_DIRECTION
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Sketcher/App/SketchObject.cpp
Expand Up @@ -2347,7 +2347,7 @@ int SketchObject::trim(int GeoId, const Base::Vector3d& point)
}
constrId++;
}
/* It is possible that the trimming entity has both a PointOnObject constrait to the trimmed entity, and a simple Tangent contstrait
/* It is possible that the trimming entity has both a PointOnObject constraint to the trimmed entity, and a simple Tangent contstrait
* to the trimmed entity. In this case we want to change to a single end-to-end tangency, i.e we want to ensure that constrType1 is
* set to Sketcher::Tangent, that the secondPos1 is captured from the PointOnObject, and also make sure that the PointOnObject constraint
* is deleted. The below loop ensures this, also in case the ordering of the constraints is first Tangent and then PointOnObject. */
Expand Down Expand Up @@ -2808,7 +2808,7 @@ int SketchObject::trim(int GeoId, const Base::Vector3d& point)
}
if (GeoId1 >= 0) {
creategeometryundopoint(); // for when geometry will change, but no new geometry will be committed.
ConstraintType constrType1 = Sketcher::PointOnObject; // So this is the fallback contraint type here.
ConstraintType constrType1 = Sketcher::PointOnObject; // So this is the fallback constraint type here.
PointPos secondPos1 = Sketcher::none;

getTransformParamsAndDeleteConstraints(GeoId, GeoId1, point1, constrType1, secondPos1);
Expand Down

0 comments on commit 145fa6b

Please sign in to comment.