diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp index 13013f3691..31f4b34b3e 100644 --- a/src/App/PropertyExpressionEngine.cpp +++ b/src/App/PropertyExpressionEngine.cpp @@ -399,7 +399,7 @@ void PropertyExpressionEngine::setValue(const ObjectIdentifier & path, boost::sh ExpressionMap::iterator it = expressions.find(usePath); if(it != expressions.end() && expr == it->second.expression) return; - + if (expr) { std::string error = validateExpression(usePath, expr); @@ -565,7 +565,7 @@ std::vector PropertyExpressionEngine::computeEvaluationOr } /** - * @brief Compute and update values of all registered experssions. + * @brief Compute and update values of all registered expressions. * @return StdReturn on success. */ @@ -864,9 +864,9 @@ void PropertyExpressionEngine::renameExpressions(const std::mapfirst); - + hasSetValue(); } diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h index c07dbf1752..9cf8f39398 100644 --- a/src/App/PropertyExpressionEngine.h +++ b/src/App/PropertyExpressionEngine.h @@ -51,7 +51,7 @@ class AppExport PropertyExpressionEngine : public App::Property, private App::At public: typedef boost::function expr)> ValidatorFunc; - + /** * @brief The ExpressionInfo struct encapsulates an expression and a comment. */ @@ -123,9 +123,9 @@ public: void slotObjectRenamed(const App::DocumentObject & obj); void slotObjectDeleted(const DocumentObject &obj); - - ///signal called when a expression was changed - boost::signal expressionChanged; + + ///signal called when an expression was changed + boost::signal expressionChanged; void onDocumentRestored(); diff --git a/src/Mod/Arch/Arch.py b/src/Mod/Arch/Arch.py index fa0c509852..a5770527ea 100644 --- a/src/Mod/Arch/Arch.py +++ b/src/Mod/Arch/Arch.py @@ -21,7 +21,7 @@ #* * #*************************************************************************** -__title__="FreeCAD Arch API" +__title__= "FreeCAD Arch API" __author__ = "Yorik van Havre" __url__ = "http://www.freecadweb.org" @@ -30,7 +30,7 @@ __url__ = "http://www.freecadweb.org" # \brief Architecture and BIM tools # # This module provides tools specialized in Building Information Modeling (BIM). -# such as convenience tools to build walls, windows or structures, and +# such as convenience tools to build walls, windows or structures, and # IFC import/export capabilities. '''The Arch module provides tools specialized in BIM modeling.''' diff --git a/src/Mod/Arch/ArchPrecast.py b/src/Mod/Arch/ArchPrecast.py index 8bc044e5f3..9d686809a0 100644 --- a/src/Mod/Arch/ArchPrecast.py +++ b/src/Mod/Arch/ArchPrecast.py @@ -20,7 +20,7 @@ #* * #*************************************************************************** -__title__="FreeCAD Precast concrete module" +__title__= "FreeCAD Precast concrete module" __author__ = "Yorik van Havre" __url__ = "http://www.freecadweb.org" @@ -1380,7 +1380,7 @@ class _DentsTaskPanel: def makePrecast(precasttype=None,length=0,width=0,height=0,slabtype="",chamfer=0,dentlength=0,dentwidth=0,dentheight=0,dents=[],base=0,holenumber=0,holemajor=0,holeminor=0,holespacing=0,groovenumber=0,groovedepth=0,grooveheight=0,groovespacing=0,risernumber=0,downlength=0,riser=0,tread=0): - "creates one of the precast objects in the current document" + "Creates one of the precast objects in the current document" if precasttype == "Beam": obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","Beam") @@ -1449,4 +1449,3 @@ def makePrecast(precasttype=None,length=0,width=0,height=0,slabtype="",chamfer=0 if FreeCAD.GuiUp: _ViewProviderPrecast(obj.ViewObject) return obj - diff --git a/src/Mod/Arch/ArchProfile.py b/src/Mod/Arch/ArchProfile.py index a5b6a4c3ba..b6d9adfcb1 100644 --- a/src/Mod/Arch/ArchProfile.py +++ b/src/Mod/Arch/ArchProfile.py @@ -21,6 +21,18 @@ #* * #*************************************************************************** +__title__= "FreeCAD Profile" +__author__ = "Yorik van Havre" +__url__ = "http://www.freecadweb.org" + +## @package ArchProfile +# \ingroup ARCH +# \brief Profile tools for ArchStructure +# +# This module provides tools to build base profiles +# for Arch Structure elements + + import FreeCAD, Draft, os from FreeCAD import Vector import csv @@ -38,16 +50,6 @@ else: return txt # \endcond -## @package ArchProfile -# \ingroup ARCH -# \brief Profile tools for ArchStructure -# -# This module provides tools to build base profiles -# for Arch Structure elements - -__title__="FreeCAD Profile" -__author__ = "Yorik van Havre" -__url__ = "http://www.freecadweb.org" # Presets in the form: Class, Name, Profile type, [profile data] # Search for profiles.csv in data/Mod/Arch/Presets and in the same folder as this file diff --git a/src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py b/src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py index d67b2ca602..5f6d097f48 100644 --- a/src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py +++ b/src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py @@ -68,7 +68,7 @@ class _PropertyEditor(object): pass class _PropertyEnumEditor(_PropertyEditor): - '''Editor for enumation values - uses a combo box.''' + '''Editor for enumeration values - uses a combo box.''' def widget(self, parent): PathLog.track(self.prop.name, self.prop.getEnumValues()) @@ -194,4 +194,3 @@ def Editor(prop): if factory: return factory(prop) return None - diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 2b03b439af..505d347523 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -1151,11 +1151,12 @@ int SketchObject::transferConstraints(int fromGeoId, PointPos fromPosId, int toG if(vals[i]->Type == Sketcher::Tangent || vals[i]->Type == Sketcher::Perpendicular){ constNew->Type = Sketcher::Coincident; } - // with respect to angle constraints, if it is a DeepSOIC style angle constraint (segment+segment+point), then no problem arises - // as the segments are PosId=none. In this case there is not call to this function. + // With respect to angle constraints, if it is a DeepSOIC style angle constraint (segment+segment+point), + // then no problem arises as the segments are PosId=none. In this case there is no call to this function. // - // However, other angle constraints are problematic because they are created on segments, but internally operate on vertices, PosId=start - // such constraint may not be succesfully transfered on deletion of the segments. + // However, other angle constraints are problematic because they are created on segments, but internally + // operate on vertices, PosId=start + // Such constraint may not be successfully transferred on deletion of the segments. else if(vals[i]->Type == Sketcher::Angle) { continue; } diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index 90e7c98168..5e6ca74139 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -473,14 +473,14 @@ def handle(): Start.tempfolder = tempfolder # make sure we are always returning unicode - # HTML should be a str-object and therefor: + # HTML should be a str-object and therefore: # - for py2 HTML is a bytes object and has to be decoded to unicode # - for py3 HTML is already a unicode object and the next 2 lines can be removed - # once py2-support is removed. + # once py2-support is removed. if isinstance(HTML, bytes): HTML = HTML.decode("utf8") - + return HTML