diff --git a/assembly.py b/assembly.py index 3a2eef2..22d95c0 100644 --- a/assembly.py +++ b/assembly.py @@ -2050,7 +2050,7 @@ class AsmConstraint(AsmGroup): firstChild.Proxy.infos = order self.prevOrder = used - # now for thos instances that are 'out of place', lets assign some + # now for those instances that are 'out of place', lets assign some # initial placement partGroup = self.getAssembly().getPartGroup() @@ -2347,7 +2347,7 @@ class AsmConstraint(AsmGroup): info = elements[0].Proxy.getInfo() if not isinstance(info.Part,tuple): # The first element must be an link array in order to get - # multiplied. + # multiplied. #First, check if it is a link (with element count) if getLinkProperty(info.Part,'ElementCount') is None: @@ -3759,7 +3759,7 @@ class Assembly(AsmGroup): recursive: If True, continue finding the child of the next assembly. - relativeToChild: If True, the returned subname is realtive to the child + relativeToChild: If True, the returned subname is relative to the child object found, or else, it is relative to the assembly, i.e., including the child's name @@ -4483,4 +4483,3 @@ class ViewProviderAsmPlainGroup(object): children = vobj.Object.Group + children editGroup(parent,group) editGroup(vobj.Object,children) - diff --git a/constraint.py b/constraint.py index 25314ea..3f9c6e1 100644 --- a/constraint.py +++ b/constraint.py @@ -286,7 +286,7 @@ def _c(solver,partInfo,subname,shape,requireArc=False,retAll=False): if requireArc and not isinstance(r,tuple): return 'an arc edge' return - return 'a cicular edge' + return 'a circular edge' if requireArc: key = subname+'.a' else: @@ -353,7 +353,7 @@ def _c(solver,partInfo,subname,shape,requireArc=False,retAll=False): pln = _w(solver,partInfo,subname,shape,True) r = utils.getElementCircular(shape) if not r: - raise RuntimeError('shape is not cicular') + raise RuntimeError('shape is not circular') system.NameTag = nameTag + '.r' hr = system.addDistanceV(r) if requireArc or isinstance(r,(list,tuple)): @@ -1284,7 +1284,7 @@ class PlaneCoincident(BaseCascade): _iconName = 'Assembly_ConstraintCoincidence.svg' _props = ['Multiply','Cascade','Offset','OffsetX','OffsetY'] + _AngleProps _tooltip = \ - 'Add a "{}" constraint to conincide planar faces of two or more parts.\n'\ + 'Add a "{}" constraint to coincide planar faces of two or more parts.\n'\ 'The faces are coincided at their centers with an optional distance.' @@ -1380,7 +1380,7 @@ class PointsCoincident(Base): _entityDef = (_p,_p) _workplane = True _iconName = 'Assembly_ConstraintPointCoincident.svg' - _tooltips = 'Add a "{}" constraint to conincide two points in 2D or 3D' + _tooltips = 'Add a "{}" constraint to coincide two points in 2D or 3D' class PointInPlane(BaseMulti): @@ -1665,10 +1665,10 @@ class SketchPlane(BaseSketch): # if there is any child element in this constraint, we expect the first # one to be a planar face or edge to define the work plane. The rest of - # entities must be from some draft wire or circle/arc + # entities must be from some draft wire or circle/arc # # Base.prepare() will call system.addSketchPlane() with all contained - # element below. However, the default implementation, + # element below. However, the default implementation, # SystemExtension.addSketchPlane(), only really uses the first one, # i.e. the one obtained by _wa(), i.e. a tuple of entities # (workplane,base,normal). @@ -1786,7 +1786,7 @@ class MidPoint(BaseSketch): if not func: return params = cls.getPropertyValues(obj) + cls.getEntities(obj,solver) - # temparary fix of slvs.addMidPoint(), which should have made wrkpln + # temporary fix of slvs.addMidPoint(), which should have made wrkpln # argument optional and defaults to 0 if len(params)==2: params.append(0)