diff --git a/src/Mod/Arch/OfflineRenderingUtils.py b/src/Mod/Arch/OfflineRenderingUtils.py index 0d8479e37e..e98e808048 100755 --- a/src/Mod/Arch/OfflineRenderingUtils.py +++ b/src/Mod/Arch/OfflineRenderingUtils.py @@ -52,7 +52,7 @@ doc = FreeCAD.open(freecadFile) # only the STEP exporter accepts per-face colors. The others would consider the first color in the per-face colors list as # the object color, which might be not what we want, so it's best to turn it off here. -colors = OfflineRenderingUtils.getColors(freecadFile,nodiffuse=True) +colors = OfflineRenderingUtils.getColors(freecadFile,nodiffuse=True) # get the camera data from the file (used in some functions below) @@ -290,7 +290,7 @@ def render(outputfile,scene=None,camera=None,zoom=False,width=400,height=300,bac objects. The outputfile must be a file path to save a png image.""" # On Linux, the X server must have indirect rendering enabled in order to be able to do offline - # PNG rendering. Unfortunatley, this is turned off by default on most recent distros. The easiest + # PNG rendering. Unfortunately, this is turned off by default on most recent distros. The easiest # way I found is to edit (or create if inexistant) /etc/X11/xorg.conf and add this: # # Section "ServerFlags" @@ -511,7 +511,7 @@ def getUnsigned(color): # 0->1 float colors, convert to 0->255 color = (color[0]*255.0,color[1]*255.0,color[2]*255.0) - # ensure evertything is int otherwise bit ops below dont work + # ensure everything is int otherwise bit ops below don't work color = (int(color[0]),int(color[1]),int(color[2])) # https://forum.freecadweb.org/viewtopic.php?t=19074 @@ -574,7 +574,7 @@ def buildGuiDocumentFromColors(document,colors,camera=None): # although the zipfile module has a writestr() function that should allow us to write the # string above directly to the zip file, I couldn't manage to make it work.. So we rather # use a temp file here, which works. - + #print(guidoc) tempxml = tempfile.mkstemp(suffix=".xml")[-1] @@ -698,7 +698,7 @@ def buildGuiDocumentFromGuiData(document,guidata): def getViewProviderClass(obj): - """getViewProviderClass(obj): tries to identify the associated view provider for a + """getViewProviderClass(obj): tries to identify the associated view provider for a given python object. Returns a (modulename,classname) tuple if found, or None""" if not hasattr(obj,"Proxy"): diff --git a/src/Mod/Path/PathScripts/PathAreaOp.py b/src/Mod/Path/PathScripts/PathAreaOp.py index 2560c47445..f90aa9c85a 100644 --- a/src/Mod/Path/PathScripts/PathAreaOp.py +++ b/src/Mod/Path/PathScripts/PathAreaOp.py @@ -351,7 +351,7 @@ class ObjectOp(PathOp.ObjectOp): (self.xRotRad, self.yRotRad, self.zRotRad) = opHeights[0] # pylint: disable=attribute-defined-outside-init (self.clrOfset, self.safOfst) = opHeights[1] # pylint: disable=attribute-defined-outside-init - # Set clearnance and safe heights based upon rotation radii + # Set clearance and safe heights based upon rotation radii if obj.EnableRotation == 'A(x)': strDep = self.xRotRad elif obj.EnableRotation == 'B(y)': diff --git a/src/Mod/Path/PathScripts/PathCircularHoleBase.py b/src/Mod/Path/PathScripts/PathCircularHoleBase.py index f288d09038..c14b255cfc 100644 --- a/src/Mod/Path/PathScripts/PathCircularHoleBase.py +++ b/src/Mod/Path/PathScripts/PathCircularHoleBase.py @@ -216,7 +216,7 @@ class ObjectOp(PathOp.ObjectOp): PathLog.debug("Exec. opHeights[0]: " + str(opHeights[0])) PathLog.debug("Exec. opHeights[1]: " + str(opHeights[1])) - # Set clearnance and safe heights based upon rotation radii + # Set clearance and safe heights based upon rotation radii if obj.EnableRotation == 'A(x)': strDep = self.xRotRad elif obj.EnableRotation == 'B(y)': @@ -228,7 +228,7 @@ class ObjectOp(PathOp.ObjectOp): obj.ClearanceHeight.Value = strDep + clrOfset obj.SafeHeight.Value = strDep + safOfst - # Create visual axises when debugging. + # Create visual axes when debugging. if PathLog.getLevel(PathLog.thisModule()) == 4: self.visualAxis() @@ -255,7 +255,7 @@ class ObjectOp(PathOp.ObjectOp): if rtn is True: (clnBase, angle, clnStock, tag) = self.applyRotationalAnalysis(obj, base, angle, axis, subCount) # Verify faces are correctly oriented - InverseAngle might be necessary - PathLog.debug("Verifing {} orientation: running faceRotationAnalysis() again.".format(sub)) + PathLog.debug("Verifying {} orientation: running faceRotationAnalysis() again.".format(sub)) faceIA = getattr(clnBase.Shape, sub) (norm, surf) = self.getFaceNormAndSurf(faceIA) (rtn, praAngle, praAxis, praInfo) = self.faceRotationAnalysis(obj, norm, surf) # pylint: disable=unused-variable @@ -269,7 +269,7 @@ class ObjectOp(PathOp.ObjectOp): if len(subsList) == 1: msg += translate("Path", "Consider toggling the 'InverseAngle' property and recomputing.") else: - msg += translate("Path", "Consider transfering '{}' to independent operation.".format(sub)) + msg += translate("Path", "Consider transferring '{}' to independent operation.".format(sub)) PathLog.warning(msg) # title = translate("Path", 'Rotation Warning') # self.guiMessage(title, msg, False) diff --git a/src/Mod/TechDraw/Templates/zh_CN/landscape/README b/src/Mod/TechDraw/Templates/zh_CN/landscape/README index d2c2765f3a..568bb6aaa2 100644 --- a/src/Mod/TechDraw/Templates/zh_CN/landscape/README +++ b/src/Mod/TechDraw/Templates/zh_CN/landscape/README @@ -1,15 +1,14 @@ -============ English Contents ================ +=============== English Contents ================ Author: LiFeng Date: 2nd, July 2019 15:41:50 (GMT+08) version: 0.001 -The files are to bring drawing rules into compliance with the people's republic of China national standard. This verion only supply A serial page size. please use font-family:HYSWLongFangSong -The file will be used for FreeCAD project TechDraw Mod for PRC users. +These files are to bring drawing rules into compliance with the People's Republic of China national standard. +This version only supplies serial page size 'A'. Please use font-family:HYSWLongFangSong +The file will be used for the FreeCAD project TechDraw Workbench PRC users. - - -=============== Chinese Contents =============== +=============== Chinese Contents ================ 作者：李峰 日期：2019年7月2日 15:41:50 (GMT+08) 版本：0.001 diff --git a/src/Mod/TechDraw/Templates/zh_CN/landscpae/README b/src/Mod/TechDraw/Templates/zh_CN/landscpae/README index e439aad271..568bb6aaa2 100644 --- a/src/Mod/TechDraw/Templates/zh_CN/landscpae/README +++ b/src/Mod/TechDraw/Templates/zh_CN/landscpae/README @@ -1,15 +1,14 @@ -============ English Contents ================ +=============== English Contents ================ Author: LiFeng -Date: 2nd, July 2019 15:41:50 (GMT+08) +Date: 2nd, July 2019 15:41:50 (GMT+08) version: 0.001 -The files are to bring drawing rules into compliance with the people's republic of China national standard. This verion only supply A serial page size. please use font-family:HYSWLongFangSong -The file will be used for FreeCAD project TechDraw Mod for PRC users. +These files are to bring drawing rules into compliance with the People's Republic of China national standard. +This version only supplies serial page size 'A'. Please use font-family:HYSWLongFangSong +The file will be used for the FreeCAD project TechDraw Workbench PRC users. - - -=============== Chinese Contents =============== +=============== Chinese Contents ================ 作者：李峰 日期：2019年7月2日 15:41:50 (GMT+08) 版本：0.001