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

Merge branch 'master' into archstairs_connections_flight_landing

Browse Source
This commit is contained in:
three_d
2021-02-05 22:44:48 +01:00
committed by GitHub
parent d0bcdaa605 9318c4c1f2
commit c2f333f2a9
321 changed files with 20534 additions and 28368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Arch/ArchBuildingPart.py
View File

@@ -323,8 +323,8 @@ class BuildingPart(ArchIFC.IfcProduct):
def __init__(self,obj):
obj.Proxy = self
obj.addExtension('App::GroupExtensionPython', self)
#obj.addExtension('App::OriginGroupExtensionPython', self)
obj.addExtension('App::GroupExtensionPython')
#obj.addExtension('App::OriginGroupExtensionPython')
self.setProperties(obj)
def setProperties(self,obj):
@@ -488,8 +488,8 @@ class ViewProviderBuildingPart:
def __init__(self,vobj):
vobj.addExtension("Gui::ViewProviderGroupExtensionPython", self)
#vobj.addExtension("Gui::ViewProviderGeoFeatureGroupExtensionPython", self)
vobj.addExtension("Gui::ViewProviderGroupExtensionPython")
#vobj.addExtension("Gui::ViewProviderGeoFeatureGroupExtensionPython")
vobj.Proxy = self
self.setProperties(vobj)
vobj.ShapeColor = ArchCommands.getDefaultColor("Helpers")

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

@@ -29,7 +29,7 @@ if FreeCAD.GuiUp:
import draftguitools.gui_trackers as DraftTrackers
else:
# \cond
def translate(ctxt,txt):
def translate(ctxt,txt,utf8_decode=False):
return txt
def QT_TRANSLATE_NOOP(ctxt,txt):
return txt

4
src/Mod/Arch/ArchProject.py
View File

@@ -158,7 +158,7 @@ class _Project(ArchIFC.IfcContext):
ArchIFC.IfcContext.setProperties(self, obj)
pl = obj.PropertiesList
if not hasattr(obj,"Group"):
obj.addExtension("App::GroupExtensionPython", self)
obj.addExtension("App::GroupExtensionPython")
self.Type = "Project"
def onDocumentRestored(self, obj):
@@ -185,7 +185,7 @@ class _ViewProviderProject(ArchIFCView.IfcContextView):
def __init__(self,vobj):
vobj.Proxy = self
vobj.addExtension("Gui::ViewProviderGroupExtensionPython", self)
vobj.addExtension("Gui::ViewProviderGroupExtensionPython")
def getIcon(self):
"""Return the path to the appropriate icon.

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

@@ -220,7 +220,7 @@ class _ArchSchedule:
prop = args[0].upper()
fval = args[1].upper()
if prop == "TYPE":
prop == "IFCTYPE"
prop = "IFCTYPE"
if inv:
if prop in props:
csprop = o.PropertiesList[props.index(prop)]

4
src/Mod/Arch/ArchSite.py
View File

@@ -631,7 +631,7 @@ class _Site(ArchIFC.IfcProduct):
if not "OriginOffset" in pl:
obj.addProperty("App::PropertyVector","OriginOffset","Site",QT_TRANSLATE_NOOP("App::Property","An optional offset between the model (0,0,0) origin and the point indicated by the geocoordinates"))
if not hasattr(obj,"Group"):
obj.addExtension("App::GroupExtensionPython", self)
obj.addExtension("App::GroupExtensionPython")
if not "IfcType" in pl:
obj.addProperty("App::PropertyEnumeration","IfcType","IFC",QT_TRANSLATE_NOOP("App::Property","The type of this object"))
obj.IfcType = ArchIFC.IfcTypes
@@ -819,7 +819,7 @@ class _ViewProviderSite:
def __init__(self,vobj):
vobj.Proxy = self
vobj.addExtension("Gui::ViewProviderGroupExtensionPython", self)
vobj.addExtension("Gui::ViewProviderGroupExtensionPython")
self.setProperties(vobj)
def setProperties(self,vobj):