From 087a1c1056d56e7bef0ce3bc6e367441fa0e3a9f Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Thu, 6 Jul 2017 14:44:13 -0300
Subject: [PATCH] Draft: Extended WPProxy tool

---
 src/Mod/Draft/Draft.py      | 25 ++++++++++++++-----------
 src/Mod/Draft/DraftTools.py | 24 ++++++++++++++----------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index cb4bc51ab1..f6181b1c12 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -6233,18 +6233,21 @@ class ViewProviderWorkingPlaneProxy:
         
     def writeCamera(self):
         if hasattr(self,"Object"):
+            from pivy import coin
             n = FreeCADGui.ActiveDocument.ActiveView.getCameraNode()
-            FreeCAD.Console.PrintMessage(QT_TRANSLATE_NOOP("Draft","Writing camera position")+"\n")
-            print FreeCADGui.ActiveDocument.ActiveView.getCamera()
-            cdata = list(n.position.getValue().getValue())
-            cdata.extend(list(n.orientation.getValue().getValue()))
-            cdata.append(n.nearDistance.getValue())
-            cdata.append(n.farDistance.getValue())
-            cdata.append(n.aspectRatio.getValue())
-            cdata.append(n.focalDistance.getValue())
-            cdata.append(n.height.getValue())
-            self.Object.ViewObject.ViewData = cdata
-            print self.Object.ViewObject.ViewData
+            if isinstance(n,coin.SoOrthographicCamera):
+                FreeCAD.Console.PrintMessage(QT_TRANSLATE_NOOP("Draft","Writing camera position")+"\n")
+                #print FreeCADGui.ActiveDocument.ActiveView.getCamera()
+                cdata = list(n.position.getValue().getValue())
+                cdata.extend(list(n.orientation.getValue().getValue()))
+                cdata.append(n.nearDistance.getValue())
+                cdata.append(n.farDistance.getValue())
+                cdata.append(n.aspectRatio.getValue())
+                cdata.append(n.focalDistance.getValue())
+                cdata.append(n.height.getValue())
+                self.Object.ViewObject.ViewData = cdata
+            else:
+                FreeCAD.Console.PrintWarning(QT_TRANSLATE_NOOP("Draft","Only orthographic views are supported")+"\n")
             
     def writeState(self):
         if hasattr(self,"Object"):
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 37219add45..72e9df182d 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -340,22 +340,26 @@ class SelectPlane(DraftTool):
                                 if len(sel.Object.ViewObject.ViewData) == 12:
                                     d = sel.Object.ViewObject.ViewData
                                     c = FreeCADGui.ActiveDocument.ActiveView.getCameraNode()
-                                    c.position.setValue([d[0],d[1],d[2]])
-                                    c.orientation.setValue([d[3],d[4],d[5],d[6]])
-                                    c.nearDistance.setValue(d[7])
-                                    c.farDistance.setValue(d[8])
-                                    c.aspectRatio.setValue(d[9])
-                                    c.focalDistance.setValue(d[10])
-                                    c.height.setValue(d[11])
+                                    from pivy import coin
+                                    if isinstance(c,coin.SoOrthographicCamera):
+                                        c.position.setValue([d[0],d[1],d[2]])
+                                        c.orientation.setValue([d[3],d[4],d[5],d[6]])
+                                        c.nearDistance.setValue(d[7])
+                                        c.farDistance.setValue(d[8])
+                                        c.aspectRatio.setValue(d[9])
+                                        c.focalDistance.setValue(d[10])
+                                        c.height.setValue(d[11])
+                                    else:
+                                        FreeCAD.Console.PrintWarning(translate("Draft","Only orthographic views are supported")+"\n")
                     if hasattr(sel.Object.ViewObject,"RestoreState"):
                         if sel.Object.ViewObject.RestoreState:
                             if hasattr(sel.Object.ViewObject,"VisibilityMap"):
                                 if sel.Object.ViewObject.VisibilityMap:
                                     for k,v in sel.Object.ViewObject.VisibilityMap.items():
-                                        print k,v
-                                        o = FreeCAD.ActiveDocument.getObject(k)
+                                        o = FreeCADGui.ActiveDocument.getObject(k)
                                         if o:
-                                            o.ViewObject.Visibility = bool(v)
+                                            if o.Visibility != (v == "True"):
+                                                FreeCADGui.doCommand("FreeCADGui.ActiveDocument.getObject(\""+k+"\").Visibility = "+v)
                     self.display(plane.axis)
                     self.finish()
                     return