Merge branch 'master' of github.com:FreeCAD/FreeCAD into TD-DetailWork

FreeCAD · Apr 20, 2020 · b4758bd · b4758bd
2 parents 19e171c + e8e67e8
commit b4758bd
Show file tree

Hide file tree

Showing 31 changed files with 3,194 additions and 1,596 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -6,7 +6,7 @@ open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
+liberapay: FreeCAD
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: ['https://www.patreon.com/yorikvanhavre', 'https://www.patreon.com/kkremitzki', 'https://www.patreon.com/thundereal']
diff --git a/src/Mod/Arch/importOBJ.py b/src/Mod/Arch/importOBJ.py
@@ -72,14 +72,23 @@ def getIndices(obj,shape,offsetv,offsetvn):
             try:
                 if not isinstance(e.Curve,Part.LineSegment):
                     if not curves:
-                        myshape = obj.Shape.copy(False)
-                        myshape.Placement=obj.getGlobalPlacement()
+                        if obj.isDerivedFrom("App::Link"):
+                            myshape = obj.LinkedObject.Shape.copy(False)
+                            myshape.Placement=obj.LinkPlacement
+                        else:
+                            myshape = obj.Shape.copy(False)
+                            myshape.Placement=obj.getGlobalPlacement()
                         mesh=MeshPart.meshFromShape(Shape=myshape, LinearDeflection=0.1, AngularDeflection=0.7, Relative=True)
                         FreeCAD.Console.PrintWarning(translate("Arch","Found a shape containing curves, triangulating")+"\n")
                         break
             except: # unimplemented curve type
-                myshape = obj.Shape.copy(False)
-                myshape.Placement=obj.getGlobalPlacement()
+                if obj.isDerivedFrom("App::Link"):
+                  if obj.Shape:
+                      myshape = obj.Shape.copy(False)
+                      myshape.Placement=obj.LinkPlacement
+                  else:
+                      myshape = obj.Shape.copy(False)
+                      myshape.Placement=obj.getGlobalPlacement()
                 mesh=MeshPart.meshFromShape(Shape=myshape, LinearDeflection=0.1, AngularDeflection=0.7, Relative=True)
                 FreeCAD.Console.PrintWarning(translate("Arch","Found a shape containing curves, triangulating")+"\n")
                 break
@@ -157,7 +166,7 @@ def export(exportList,filename,colors=None):
     materials = []
     outfile.write("mtllib " + os.path.basename(filenamemtl) + "\n")
     for obj in objectslist:
-        if obj.isDerivedFrom("Part::Feature") or obj.isDerivedFrom("Mesh::Feature"):
+        if obj.isDerivedFrom("Part::Feature") or obj.isDerivedFrom("Mesh::Feature") or obj.isDerivedFrom("App::Link"):
             hires = None
             if FreeCAD.GuiUp:
                 visible = obj.ViewObject.isVisible()

diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
@@ -1893,8 +1893,7 @@ def getXPM(self,iconname,size=16):
         return str(a)
 
     def togglesnap(self):
-        if hasattr(FreeCADGui,"Snapper"):
-            FreeCADGui.Snapper.toggle()
+        FreeCADGui.doCommand('FreeCADGui.runCommand("Draft_Snap_Lock")')
 
     def togglenearsnap(self):
         if hasattr(FreeCADGui,"Snapper"):

diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py
@@ -116,6 +116,7 @@ def QT_TRANSLATE_NOOP(context, text):
         if hasattr(FreeCADGui, "draftToolBar"):
             if not hasattr(FreeCADGui.draftToolBar, "loadedPreferences"):
                 FreeCADGui.addPreferencePage(":/ui/preferences-draft.ui", QT_TRANSLATE_NOOP("Draft", "Draft"))
+                FreeCADGui.addPreferencePage(":/ui/preferences-draftinterface.ui", QT_TRANSLATE_NOOP("Draft", "Draft"))
                 FreeCADGui.addPreferencePage(":/ui/preferences-draftsnap.ui", QT_TRANSLATE_NOOP("Draft", "Draft"))
                 FreeCADGui.addPreferencePage(":/ui/preferences-draftvisual.ui", QT_TRANSLATE_NOOP("Draft", "Draft"))
                 FreeCADGui.addPreferencePage(":/ui/preferences-drafttexts.ui", QT_TRANSLATE_NOOP("Draft", "Draft"))
@@ -140,7 +141,7 @@ def Deactivated(self):
         if hasattr(FreeCADGui, "Snapper"):
             FreeCADGui.Snapper.hide()
         import draftutils.init_draft_statusbar as dsb
-        dsb.hide_draft_statusbar()           
+        dsb.hide_draft_statusbar()
         FreeCAD.Console.PrintLog("Draft workbench deactivated.\n")
 
     def ContextMenu(self, recipient):

diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc
@@ -153,6 +153,7 @@
         <file>translations/Draft_zh-CN.qm</file>
         <file>translations/Draft_zh-TW.qm</file>
         <file>ui/preferences-draft.ui</file>
+        <file>ui/preferences-draftinterface.ui</file>
         <file>ui/preferences-draftsnap.ui</file>
         <file>ui/preferences-drafttexts.ui</file>
         <file>ui/preferences-draftvisual.ui</file>