kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Misc. typos

Browse Source
This commit is contained in:
luz.paz
2018-05-13 13:52:01 -04:00
committed by luz paz
parent ac6ae007b2
commit 6e64b4f75d
29 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Arch/ArchComponent.py
View File

@@ -95,7 +95,7 @@ else:
def convertOldComponents(objs=[]):
"""converts Arch Objects with a Role property to the new IfcRole.
if no object is given, all object sof the active document are converted"""
if no object is given, all objects of the active document are converted"""
if not objs:
objs = FreeCAD.ActiveDocument.Objects
if not isinstance(objs,list):

2
src/Mod/Arch/Dice3DS/dom3ds.py
View File

@@ -1743,7 +1743,7 @@ def read_3ds_mem(membuf,check_magic=True,tight=False,recover=True):
recover=True)
buffer: is an image of the 3DS file in memory. It could be
a string, an mmaped file, or something else.
a string, a mapped file, or something else.
check_magic: If true, this function checks that the top level
chunk is the 3DS magic chunk (0x4D4D), and raises an exception

2
src/Mod/Cam/App/cutting_tools.cpp
View File

@@ -828,7 +828,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape)
//
// // outfile << projectedPoint.X() <<","<<projectedPoint.Y()<<","<<projectedPoint.Z()<<std::endl;
// //Jetzt die aktuelle Kurve als BSpline interpolieren
// //check for intersections due to wrong offseted points
// //check for intersections due to wrong offsetted points
// checkPointIntersection(finalPoints);
// std::vector<gp_Pnt> finalPointscorrected;
// finalPointscorrected.clear();

2
src/Mod/Fem/femcommands/commands.py
View File

@@ -708,7 +708,7 @@ class _CommandFemSolverZ88(CommandManager):
FreeCADGui.doCommand("FemGui.getActiveAnalysis().addObject(ObjectsFem.makeSolverZ88(FreeCAD.ActiveDocument))")
# the sting in add command will be the page name on FreeCAD wiki
# the string in add command will be the page name on FreeCAD wiki
FreeCADGui.addCommand('FEM_Analysis', _CommandFemAnalysis())
FreeCADGui.addCommand('FEM_ConstraintBodyHeatSource', _CommandFemConstraintBodyHeatSource())
FreeCADGui.addCommand('FEM_ConstraintElectrostaticPotential', _CommandFemConstraintElectrostaticPotential())

2
src/Mod/Fem/feminout/importZ88O2Results.py
View File

@@ -114,7 +114,7 @@ def import_z88_disp(filename, analysis=None, result_name_prefix=None):
def read_z88_disp(z88_disp_input):
'''
read a z88 disp file and extract the nodes and elements
z88 Displacment output file is z88o2.txt
z88 Displacement output file is z88o2.txt
works with Z88OS14
'''
nodes = {}

3
src/Mod/Fem/femtest/testtools.py
View File

@@ -96,7 +96,8 @@ def compare_files(file_name1, file_name2):
file1 = open(file_name1, 'r')
f1 = file1.readlines()
file1.close()
# workaraound for compare geos of elmer test and temporary file path (not only names change, path changes with operating system)
# workaround to compare geos of elmer test and temporary file path
# (not only names change, path changes with operating system)
lf1 = [l for l in f1 if not (l.startswith('Merge "') or l.startswith('Save "') or l.startswith('// '))]
lf1 = force_unix_line_ends(lf1)
file2 = open(file_name2, 'r')

8
src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp
View File

@@ -203,19 +203,19 @@ void LscmRelax::relax(double weight)
K_g_triplets.push_back(trip(row_pos * 2 + 1, col_pos * 2, K_m(j * 2 + 1, k * 2)));
K_g_triplets.push_back(trip(row_pos * 2 + 1, col_pos * 2 + 1, K_m(j * 2 + 1, k * 2 + 1)));
K_g_triplets.push_back(trip(row_pos * 2, col_pos * 2 + 1, K_m(j * 2, k * 2 + 1)));
// we don't have to fill all because the matrix is symetric.
// we don't have to fill all because the matrix is symmetric.
}
}
}
// FIXING SOME PINS:
// - if there are no pins (or only one pin) selected solve the system without the nullspace solution.
// - if there are some pins selected, delete all colums, rows that refer to this pins
// - if there are some pins selected, delete all columns, rows that refer to this pins
// set the diagonal element of these pins to 1 + the rhs to zero
// (? is it possible to fix in the inner of the face? for sure for fem, but lscm could have some problems)
// (we also need some extra variables to see if the pins come from user)
// fixing some points
// allthough only internal forces are applied there has to be locked
// although only internal forces are applied there has to be locked
// at least 3 degrees of freedom to stop the mesh from pure rotation and pure translation
// std::vector<long> fixed_dof;
// fixed_dof.push_back(this->triangles(0, 0) * 2); //x0
@@ -539,7 +539,7 @@ void LscmRelax::set_q_l_m()
void LscmRelax::set_fixed_pins()
{
// if less then one fixed pin is set find two by an automated algorithm and align them to y = 0
// if more then two pins are choosen find a leastsquare-plane and project the points on it
// if more then two pins are chosen find a leastsquare-plane and project the points on it
// insert the points in the flat-vertices vector
if (this->fixed_pins.size() == 0)
this->fixed_pins.push_back(0);

4
src/Mod/OpenSCAD/expandplacements.py
View File

@@ -25,8 +25,8 @@ __author__ = "Sebastian Hoogen"
__url__ = ["http://www.freecadweb.org"]
'''
This Script includes python functions to shift all placements down the
feature tree to the most baisc objects
This Script includes python functions to shift all placements down the
feature tree to the most basic objects
'''
import FreeCAD

2
src/Mod/OpenSCAD/exportCSG.py
View File

@@ -68,7 +68,7 @@ def check_multmatrix(csg,ob,x,y,z):
return 2 # center = true and no mm
else:
m = ob.Placement.toMatrix()
# adjust position for center displacments
# adjust position for center displacements
csg.write("multmatrix([["+str(m.A11)+", "+str(m.A12)+", "+str(m.A13)+",\
"+str(m.A14)+"], ["\
+str(m.A21)+", "+str(m.A22)+", "+str(m.A23)+", "+str(m.A24)+"], ["\

2
src/Mod/Path/App/Area.cpp
View File

@@ -1768,7 +1768,7 @@ TopoDS_Shape Area::getShape(int index) {
FC_TIME_INIT(t);
// do offset first, then pocket the inner most offseted shape
// do offset first, then pocket the inner most offsetted shape
std::list<shared_ptr<CArea> > areas;
makeOffset(areas,PARAM_FIELDS(AREA_MY,AREA_PARAMS_OFFSET));

6
src/Mod/Path/App/Area.h
View File

@@ -145,10 +145,10 @@ protected:
* Mainly for checking if there is any faces for auto fill*/
void addToBuild(CArea &area, const TopoDS_Shape &shape);
/** Called internally to obtain the combained children shapes */
/** Called internally to obtain the combined children shapes */
TopoDS_Shape toShape(CArea &area, short fill, int reorient=0);
/** Obtain a list of offseted areas
/** Obtain a list of offsetted areas
*
* See #AREA_PARAMS_OFFSET for description of the arguments.
*/
@@ -259,7 +259,7 @@ public:
/** Clean internal caches
*
* The combained shapes is cached internally to make other operation more
* The combined shapes is cached internally to make other operation more
* efficient, such as makeOffset() and makePocket()
*
* \arg \c deleteShapes: if true, delete all children shapes.

2
src/Mod/Path/App/ParamsHelper.h
View File

@@ -102,7 +102,7 @@
* parameters are defined, <tt>short, long, double, bool, enum, enum2</tt>.
* \enum2 type is the same as \enum with additional information to be able to
* map to a user defined C enum type. To add more types, search this file for
* keyword \a _short, and supply all relavant macros. It's quite trivial
* keyword \a _short, and supply all relevant macros. It's quite trivial
* actually.
*
* - \c arg is the argument name. It is intended to be used as function argument.

2
src/Mod/Path/PathScripts/PathDressupHoldingTags.py
View File

@@ -522,7 +522,7 @@ class PathData:
return self.baseWire is not None
def findZLimits(self, edges):
# not considering arcs and spheres in Z direction, find the highes and lowest Z values
# not considering arcs and spheres in Z direction, find the highest and lowest Z values
minZ = 99999999999
maxZ = -99999999999
for e in edges:

2
src/Mod/Sketcher/App/PropertyConstraintList.cpp
View File

@@ -151,7 +151,7 @@ void PropertyConstraintList::setValue(const Constraint* lValue)
if (renamed.size() > 0)
signalConstraintsRenamed(renamed);
/* Collect infor about removals */
/* Collect info about removals */
for (unsigned int i = start; i < _lValueList.size(); i++) {
valueMap.erase(_lValueList[i]->tag);
removed.insert(makePath(i, _lValueList[i]));

10
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -4288,7 +4288,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m
return false;
}
// we succeeded with the multiplicity modification, so aligment geometry may be invalid/inconsistent for the new bspline
// we succeeded with the multiplicity modification, so alignment geometry may be invalid/inconsistent for the new bspline
std::vector<int> delGeoId;
@@ -4344,7 +4344,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m
newConstr->InternalAlignmentIndex = prevpole[(*it)->InternalAlignmentIndex];
newcVals.push_back(newConstr);
}
else { // it is an internal aligment geometry that is no longer valid => delete it and the pole circle
else { // it is an internal alignment geometry that is no longer valid => delete it and the pole circle
delGeoId.push_back((*it)->First);
}
}
@@ -4355,7 +4355,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m
newConstr->InternalAlignmentIndex = prevknot[(*it)->InternalAlignmentIndex];
newcVals.push_back(newConstr);
}
else { // it is an internal aligment geometry that is no longer valid => delete it and the knot point
else { // it is an internal alignment geometry that is no longer valid => delete it and the knot point
delGeoId.push_back((*it)->First);
}
}
@@ -6065,8 +6065,8 @@ int SketchObject::port_reversedExternalArcs(bool justAnalyze)
///
///Arguments:
/// cstr - pointer to a constraint to be locked/unlocked
/// bForce - specifies whether to ignore tha already locked constraint or not.
/// bLock - specufies whether to lock the constraint or not (if bForce is
/// bForce - specifies whether to ignore the already locked constraint or not.
/// bLock - specifies whether to lock the constraint or not (if bForce is
/// true, the constraint gets unlocked, otherwise nothing is done at all).
///
///Return values:

2
src/Mod/Sketcher/App/SketchPyImp.cpp
View File

@@ -58,7 +58,7 @@ int SketchPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/)
return 0;
}
// +++ methodes implementer ++++++++++++++++++++++++++++++++++++++++++++++++
// +++ methods implementer ++++++++++++++++++++++++++++++++++++++++++++++++
PyObject* SketchPy::solve(PyObject *args)
{

2
src/Mod/Sketcher/App/planegcs/Constraints.cpp
View File

@@ -1564,7 +1564,7 @@ void ConstraintCurveValue::errorgrad(double *err, double *grad, double *param)
if (grad)
*grad = err_vec.dy;
} else {
assert(false/*this constraint is neighter X nor Y. Nothing to do..*/);
assert(false/*this constraint is neither X nor Y. Nothing to do..*/);
}
}

2
src/Mod/Sketcher/SketcherExample.py
View File

@@ -1,4 +1,4 @@
# Example hwo to use the basic sketcher tools
# Example how to use the basic sketcher tools
from Sketcher import *
from Part import *
from FreeCAD import *

2
src/Mod/TechDraw/App/Cube.cpp
View File

@@ -94,7 +94,7 @@ void Cube::initialize(Base::Vector3d r, Base::Vector3d rr, Base::Vector3d l, Bas
// rotate/spin the subject inside the glass cube
// effectively, rotate/spin the cube in reverse of the apparent subject movement
//TODO: there is a problem with calculaion of view rotation vector when the axis of rotation is
//TODO: there is a problem with calculation of view rotation vector when the axis of rotation is
// +/-Y. There is hack code here to handle it, but there should be a more elegant solution
// subject CW about Right