diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 46595235d3..273fe3ad4d 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting any of the community admins or moderators at +reported by contacting any of the community admins or moderators at https://forum.freecad.org/memberlist.php?mode=team . All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is diff --git a/PRIVACY_POLICY.md b/PRIVACY_POLICY.md index eae400742b..bcc404bff2 100644 --- a/PRIVACY_POLICY.md +++ b/PRIVACY_POLICY.md @@ -1,4 +1,4 @@ -# FreeCAD Privacy Policy +# FreeCAD Privacy Policy The FreeCAD application does not collect, transmit, share or use any Personal Data. @@ -27,6 +27,6 @@ When reading the online version of the User Manual within FreeCAD, manual conten FreeCAD is Free Software and therefore may be packaged by other people, who may include additional software or modify the source code. We do not vouch for these third-party packages and cannot tell you what they contain and what they do regarding your privacy. The official packages are explicitly listed in our download page. - + - [based on the GIMP privacy policy](https://www.gimp.org/about/privacy.html) diff --git a/src/Mod/BIM/ArchBuildingPart.py b/src/Mod/BIM/ArchBuildingPart.py index 3dee6b7e6b..82ffa756e2 100644 --- a/src/Mod/BIM/ArchBuildingPart.py +++ b/src/Mod/BIM/ArchBuildingPart.py @@ -300,7 +300,7 @@ class BuildingPart(ArchIFC.IfcProduct): def execute(self,obj): "gather all the child shapes into a compound" - + pl = obj.Placement shapes,materialstable = self.getShapes(obj) if shapes: @@ -323,7 +323,7 @@ class BuildingPart(ArchIFC.IfcProduct): obj.ViewObject.Proxy.onChanged(obj.ViewObject,"AutoGroupBox") def getMovableChildren(self, obj): - + "recursively get movable children" result = [] diff --git a/src/Mod/BIM/ArchRoof.py b/src/Mod/BIM/ArchRoof.py index e9442e978b..31fb61f8f4 100644 --- a/src/Mod/BIM/ArchRoof.py +++ b/src/Mod/BIM/ArchRoof.py @@ -744,10 +744,10 @@ class _Roof(ArchComponent.Component): # Not only the solid of the base object itself be subtracted from # a Wall, but all portion of the wall above the roof solid would be # subtracted as well. - # + # # FC forum discussion : Sketch based Arch_Roof and wall substraction # - https://forum.freecad.org/viewtopic.php?t=84389 - # + # faces = [] solids = [] for f in obj.Base.Shape.Faces: # obj.Base.Shape.Solids.Faces diff --git a/src/Mod/BIM/ArchSpace.py b/src/Mod/BIM/ArchSpace.py index c43a510f37..ea1815c346 100644 --- a/src/Mod/BIM/ArchSpace.py +++ b/src/Mod/BIM/ArchSpace.py @@ -219,7 +219,7 @@ class _Space(ArchComponent.Component): if not "Boundaries" in pl: obj.addProperty("App::PropertyLinkSubList","Boundaries", "Space",QT_TRANSLATE_NOOP("App::Property","The objects that make the boundaries of this space object")) if not "Area" in pl: - obj.addProperty("App::PropertyArea", "Area", "Space",QT_TRANSLATE_NOOP("App::Property","Identical to Horizontal Area")) + obj.addProperty("App::PropertyArea", "Area", "Space",QT_TRANSLATE_NOOP("App::Property","Identical to Horizontal Area")) if not "FinishFloor" in pl: obj.addProperty("App::PropertyString", "FinishFloor", "Space",QT_TRANSLATE_NOOP("App::Property","The finishing of the floor of this space")) if not "FinishWalls" in pl: @@ -245,7 +245,7 @@ class _Space(ArchComponent.Component): obj.addProperty("App::PropertyEnumeration","Conditioning", "Space",QT_TRANSLATE_NOOP("App::Property","The type of air conditioning of this space")) obj.Conditioning = ConditioningTypes if not "Internal" in pl: - obj.addProperty("App::PropertyBool", "Internal", "Space",QT_TRANSLATE_NOOP("App::Property","Specifies if this space is internal or external")) + obj.addProperty("App::PropertyBool", "Internal", "Space",QT_TRANSLATE_NOOP("App::Property","Specifies if this space is internal or external")) obj.Internal = True if not "AreaCalculationType" in pl: obj.addProperty("App::PropertyEnumeration", "AreaCalculationType", "Space",QT_TRANSLATE_NOOP("App::Property","Defines the calculation type for the horizontal area and its perimeter length")) diff --git a/src/Mod/BIM/Resources/create_qrc.py b/src/Mod/BIM/Resources/create_qrc.py index ee864e2e93..094ababa63 100755 --- a/src/Mod/BIM/Resources/create_qrc.py +++ b/src/Mod/BIM/Resources/create_qrc.py @@ -13,4 +13,4 @@ for subdir in ["icons", "ui", "translations"]: txt += " \n\n" with open(os.path.join(cdir, "Arch.qrc"), "w") as resfile: resfile.write(txt) - + diff --git a/src/Mod/BIM/bimcommands/BimArchUtils.py b/src/Mod/BIM/bimcommands/BimArchUtils.py index e545804098..801cacc41f 100644 --- a/src/Mod/BIM/bimcommands/BimArchUtils.py +++ b/src/Mod/BIM/bimcommands/BimArchUtils.py @@ -72,7 +72,7 @@ class Arch_Add: class Arch_Remove: "the Arch Add command definition" - + def GetResources(self): return {'Pixmap' : 'Arch_Remove', 'MenuText': QT_TRANSLATE_NOOP("Arch_Remove","Remove component"), @@ -110,7 +110,7 @@ class Arch_Remove: class Arch_SplitMesh: "the Arch SplitMesh command definition" - + def GetResources(self): return {'Pixmap' : 'Arch_SplitMesh', 'MenuText': QT_TRANSLATE_NOOP("Arch_SplitMesh","Split Mesh"), @@ -138,7 +138,7 @@ class Arch_SplitMesh: class Arch_MeshToShape: "the Arch MeshToShape command definition" - + def GetResources(self): return {'Pixmap' : 'Arch_MeshToShape', 'MenuText': QT_TRANSLATE_NOOP("Arch_MeshToShape","Mesh to Shape"), @@ -302,7 +302,7 @@ class Arch_ToggleIfcBrepFlag: class Arch_Component: "the Arch Component command definition" - + def GetResources(self): return {'Pixmap' : 'Arch_Component', 'MenuText': QT_TRANSLATE_NOOP("Arch_Component","Component"), @@ -329,7 +329,7 @@ class Arch_Component: class Arch_CloneComponent: "the Arch Clone Component command definition" - + def GetResources(self): return {'Pixmap' : 'Arch_Component_Clone', 'MenuText': QT_TRANSLATE_NOOP("Arch_CloneComponent","Clone component"), @@ -356,7 +356,7 @@ class Arch_CloneComponent: class Arch_IfcSpreadsheet: "the Arch Schedule command definition" - + def GetResources(self): return {'Pixmap': 'Arch_Schedule', 'MenuText': QT_TRANSLATE_NOOP("Arch_IfcSpreadsheet","Create IFC spreadsheet..."), @@ -383,7 +383,7 @@ class Arch_IfcSpreadsheet: class Arch_ToggleSubs: "the ToggleSubs command definition" - + def GetResources(self): return {'Pixmap' : 'Arch_ToggleSubs', 'Accel' : 'Ctrl+Space', diff --git a/src/Mod/BIM/bimcommands/BimBeam.py b/src/Mod/BIM/bimcommands/BimBeam.py index 5dcc5390aa..d084bcf693 100644 --- a/src/Mod/BIM/bimcommands/BimBeam.py +++ b/src/Mod/BIM/bimcommands/BimBeam.py @@ -32,7 +32,7 @@ QT_TRANSLATE_NOOP = FreeCAD.Qt.QT_TRANSLATE_NOOP class BIM_Beam(ArchStructure._CommandStructure): - + def __init__(self): super().__init__() self.beammode = True diff --git a/src/Mod/BIM/bimcommands/BimClassification.py b/src/Mod/BIM/bimcommands/BimClassification.py index 3ddebc50c5..93843fdb07 100644 --- a/src/Mod/BIM/bimcommands/BimClassification.py +++ b/src/Mod/BIM/bimcommands/BimClassification.py @@ -629,10 +629,10 @@ class BIM_Classification: def getIcon(self,obj): """returns a QIcon for an object""" - + from PySide import QtCore, QtGui import Arch_rc - + if hasattr(obj.ViewObject, "Icon"): return obj.ViewObject.Icon elif hasattr(obj.ViewObject, "Proxy") and hasattr(obj.ViewObject.Proxy, "getIcon"): diff --git a/src/Mod/BIM/bimcommands/BimEquipment.py b/src/Mod/BIM/bimcommands/BimEquipment.py index 8625b287a1..e0bc19f7a7 100644 --- a/src/Mod/BIM/bimcommands/BimEquipment.py +++ b/src/Mod/BIM/bimcommands/BimEquipment.py @@ -91,7 +91,7 @@ class Arch_Equipment: class Arch_3Views: - + # OBSOLETE "the Arch 3Views command definition" diff --git a/src/Mod/BIM/bimcommands/BimPipe.py b/src/Mod/BIM/bimcommands/BimPipe.py index 08485cf752..82bfe2fe1c 100644 --- a/src/Mod/BIM/bimcommands/BimPipe.py +++ b/src/Mod/BIM/bimcommands/BimPipe.py @@ -108,7 +108,7 @@ class Arch_PipeConnector: FreeCADGui.doCommand("Draft.autogroup(obj)") FreeCAD.ActiveDocument.commitTransaction() FreeCAD.ActiveDocument.recompute() - + class Arch_PipeGroupCommand: diff --git a/src/Mod/BIM/bimcommands/BimProject.py b/src/Mod/BIM/bimcommands/BimProject.py index 348091fecd..3f0f5a705c 100644 --- a/src/Mod/BIM/bimcommands/BimProject.py +++ b/src/Mod/BIM/bimcommands/BimProject.py @@ -37,7 +37,7 @@ class BIM_Project: return { "Pixmap": "BIM_Project", "MenuText": QT_TRANSLATE_NOOP("BIM_Project", "Project"), - "ToolTip": QT_TRANSLATE_NOOP("BIM_Project", + "ToolTip": QT_TRANSLATE_NOOP("BIM_Project", "Create an empty NativeIFC project"), } diff --git a/src/Mod/BIM/bimcommands/BimRebar.py b/src/Mod/BIM/bimcommands/BimRebar.py index 7ded89f404..02bc0cdbee 100644 --- a/src/Mod/BIM/bimcommands/BimRebar.py +++ b/src/Mod/BIM/bimcommands/BimRebar.py @@ -94,6 +94,6 @@ class Arch_Rebar: FreeCADGui.Control.showDialog(ArchComponent.SelectionTaskPanel()) FreeCAD.ArchObserver = ArchComponent.ArchSelectionObserver(nextCommand="Arch_Rebar") FreeCADGui.Selection.addObserver(FreeCAD.ArchObserver) - + FreeCADGui.addCommand('Arch_Rebar',Arch_Rebar()) diff --git a/src/Mod/BIM/bimcommands/BimSectionPlane.py b/src/Mod/BIM/bimcommands/BimSectionPlane.py index 409b4379f8..f558da15a5 100644 --- a/src/Mod/BIM/bimcommands/BimSectionPlane.py +++ b/src/Mod/BIM/bimcommands/BimSectionPlane.py @@ -62,7 +62,7 @@ class Arch_SectionPlane: FreeCADGui.doCommand("section = Arch.makeSectionPlane("+ss+")") FreeCAD.ActiveDocument.commitTransaction() FreeCAD.ActiveDocument.recompute() - + FreeCADGui.addCommand('Arch_SectionPlane', Arch_SectionPlane()) diff --git a/src/Mod/BIM/bimcommands/BimTogglePanels.py b/src/Mod/BIM/bimcommands/BimTogglePanels.py index 2036bf24c8..b77da954fe 100644 --- a/src/Mod/BIM/bimcommands/BimTogglePanels.py +++ b/src/Mod/BIM/bimcommands/BimTogglePanels.py @@ -71,7 +71,7 @@ class BIM_TogglePanels: if togglebutton: togglebutton.setChecked(False) else: - widgets = PARAMS.GetString("HiddenWidgets", + widgets = PARAMS.GetString("HiddenWidgets", "Python console;;Report view;;Selection view;;" ) widgets = [mw.findChild(QtGui.QWidget, w) for w in widgets.split(";;") if w] diff --git a/src/Mod/BIM/bimcommands/BimTruss.py b/src/Mod/BIM/bimcommands/BimTruss.py index 09d91e4c2f..6aab7bc40b 100644 --- a/src/Mod/BIM/bimcommands/BimTruss.py +++ b/src/Mod/BIM/bimcommands/BimTruss.py @@ -79,7 +79,7 @@ class Arch_Truss: self.createTruss() def createTruss(self, basename=""): - + """Creates the truss""" FreeCADGui.Control.closeDialog() @@ -96,6 +96,6 @@ class Arch_Truss: FreeCADGui.doCommand("Draft.autogroup(obj)") FreeCAD.ActiveDocument.commitTransaction() FreeCAD.ActiveDocument.recompute() - + FreeCADGui.addCommand('Arch_Truss', Arch_Truss()) diff --git a/src/Mod/BIM/bimcommands/BimViews.py b/src/Mod/BIM/bimcommands/BimViews.py index f7fcd6b784..aa12739da4 100644 --- a/src/Mod/BIM/bimcommands/BimViews.py +++ b/src/Mod/BIM/bimcommands/BimViews.py @@ -76,7 +76,7 @@ class BIM_Views: self.dialog = FreeCADGui.PySideUic.loadUi(":/ui/dialogViews.ui") vm.setWidget(self.dialog) vm.tree = self.dialog.tree - + # set context menu self.dialog.tree.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) @@ -252,7 +252,7 @@ class BIM_Views: sortLvItems = [item[0] for item in sortLvHold] treeViewItems = treeViewItems + sortLvItems + soloProxyHold vm.tree.addTopLevelItems(treeViewItems) - + # add views ficon = QtGui.QIcon.fromTheme("folder", QtGui.QIcon(":/icons/folder.svg")) views = self.getViews() @@ -445,10 +445,10 @@ class BIM_Views: if getattr(v, "Source", None): views.append(v.Source) return views - + def getPages(self): """Returns a list of TD pages""" - return [o for o in FreeCAD.ActiveDocument.Objects if o.isDerivedFrom('TechDraw::DrawPage')] + return [o for o in FreeCAD.ActiveDocument.Objects if o.isDerivedFrom('TechDraw::DrawPage')] # These functions need to be localized outside the command class, as they are used outside this module diff --git a/src/Mod/BIM/nativeifc/ifc_openshell.py b/src/Mod/BIM/nativeifc/ifc_openshell.py index 36ffa46c6c..d98e63923d 100644 --- a/src/Mod/BIM/nativeifc/ifc_openshell.py +++ b/src/Mod/BIM/nativeifc/ifc_openshell.py @@ -164,8 +164,8 @@ class IFC_UpdateIOS: # code from https://www.geeksforgeeks.org/compare-two-version-numbers - arr1 = v1.replace("v","").split(".") - arr2 = v2.replace("v","").split(".") + arr1 = v1.replace("v","").split(".") + arr2 = v2.replace("v","").split(".") n = len(arr1) m = len(arr2) arr1 = [int(i) for i in arr1] diff --git a/src/Mod/BIM/nativeifc/ifc_selftest.py b/src/Mod/BIM/nativeifc/ifc_selftest.py index cf1b97bcd5..e32f3d4877 100644 --- a/src/Mod/BIM/nativeifc/ifc_selftest.py +++ b/src/Mod/BIM/nativeifc/ifc_selftest.py @@ -54,7 +54,7 @@ SDU = int(SINGLEDOC) # number of objects is different in singledoc """ unit tests for the NativeIFC functionality. To run the tests, either: - in terminal mode: FreeCAD -t ifc_selftest -- in the FreeCAD UI: Switch to Test Framework workbench, press "Self test" and +- in the FreeCAD UI: Switch to Test Framework workbench, press "Self test" and choose ifc_selftest in the list """ diff --git a/src/Mod/BIM/utils/convertPsets.py b/src/Mod/BIM/utils/convertPsets.py index 843f04d9f7..ca2a6e8390 100644 --- a/src/Mod/BIM/utils/convertPsets.py +++ b/src/Mod/BIM/utils/convertPsets.py @@ -20,7 +20,7 @@ # * * # *************************************************************************** -"""This script converts a xml file containing pset definitions to a csv file. +"""This script converts a xml file containing pset definitions to a csv file. Python3 only!! (py2 csv doesn't support utf8""" import xml.sax, os