From 19e747d770268064c350e22ab8bfa6a97e746d36 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorikvanhavre@users.sourceforge.net>
Date: Tue, 5 Jun 2012 16:33:01 -0300
Subject: [PATCH] 0000722: Deleting Draft dimensions

---
 src/Mod/Draft/Draft.py      | 36 +++++++++++++++++++++++++-----------
 src/Mod/Draft/DraftTools.py |  2 +-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index 7b1c5dc8f..49ff4ad04 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -1782,7 +1782,6 @@ class _ViewProviderDimension:
         obj.Proxy = self
         obj.FontSize=getParam("textheight")
         obj.FontName=getParam("textfont")
-        obj.DisplayMode = ["2D","3D"]
         obj.ExtLines=0.3
         obj.Override = ''
 
@@ -1825,18 +1824,19 @@ class _ViewProviderDimension:
             if hasattr(obj.ViewObject,"DisplayMode"):
                 if obj.ViewObject.DisplayMode == "3D":
                     offset = DraftVecUtils.neg(offset)
-        if hasattr(obj.ViewObject,"TextPosition"):
-            if obj.ViewObject.TextPosition == Vector(0,0,0):
-                tbase = midpoint.add(offset)
+            if hasattr(obj.ViewObject,"TextPosition"):
+                if obj.ViewObject.TextPosition == Vector(0,0,0):
+                    tbase = midpoint.add(offset)
+                else:
+                    tbase = obj.ViewObject.TextPosition
             else:
-                tbase = obj.ViewObject.TextPosition
+                tbase = midpoint.add(offset)
         else:
-            tbase = midpoint.add(offset)
+            tbase = midpoint
         rot = FreeCAD.Placement(DraftVecUtils.getPlaneRotation(u,v,norm)).Rotation.Q
         return p1,p2,p3,p4,tbase,norm,rot
 
     def attach(self, obj):
-        obj.DisplayMode = ["2D","3D"]
         self.Object = obj.Object
         p1,p2,p3,p4,tbase,norm,rot = self.calcGeom(obj.Object)
         self.color = coin.SoBaseColor()
@@ -1903,6 +1903,10 @@ class _ViewProviderDimension:
         self.onChanged(obj,"FontName")
             
     def updateData(self, obj, prop):
+        try:
+            dm = obj.ViewObject.DisplayMode
+        except:
+            dm = "2D"
         text = None
         if obj.Base and obj.LinkedVertices:
             if "Shape" in obj.Base.PropertiesList:
@@ -1936,7 +1940,7 @@ class _ViewProviderDimension:
             self.text.string = self.text3d.string = text
             self.textpos.rotation = coin.SbRotation(rot[0],rot[1],rot[2],rot[3])
             self.textpos.translation.setValue([tbase.x,tbase.y,tbase.z])
-            if obj.ViewObject.DisplayMode == "2D":
+            if dm == "2D":
                 self.coords.point.setValues([[p1.x,p1.y,p1.z],
                                              [p2.x,p2.y,p2.z],
                                              [p3.x,p3.y,p3.z],
@@ -1958,6 +1962,7 @@ class _ViewProviderDimension:
             self.coord2.point.setValue((p3.x,p3.y,p3.z))
 
     def onChanged(self, vp, prop):
+        self.Object = vp.Object
         if prop == "FontSize":
             self.font.size = vp.FontSize
             self.font3d.size = vp.FontSize*100
@@ -1969,13 +1974,20 @@ class _ViewProviderDimension:
         elif prop == "LineWidth":
             self.drawstyle.lineWidth = vp.LineWidth
         else:
+            self.drawstyle.lineWidth = vp.LineWidth
             self.updateData(vp.Object, None)
 
     def getDisplayModes(self,obj):
         return ["2D","3D"]
 
     def getDefaultDisplayMode(self):
-        return "2D"
+        if hasattr(self,"defaultmode"):
+            return self.defaultmode
+        else:
+            return "2D"
+
+    def setDisplayMode(self,mode):
+        return mode
 
     def getIcon(self):
         if self.Object.Base:
@@ -2034,10 +2046,12 @@ class _ViewProviderDimension:
                 """
 
     def __getstate__(self):
-        return None
+        return self.Object.ViewObject.DisplayMode
     
     def __setstate__(self,state):
-        return None
+        if state:
+            self.defaultmode = state
+            self.setDisplayMode(state)
 
 class _AngularDimension:
     "The AngularDimension object"
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 559e75e26..a5f52576c 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -1653,7 +1653,7 @@ class Dimension(Creator):
                     if self.dir:
                         point = self.node[0].add(DraftVecUtils.project(point.sub(self.node[0]),self.dir))
                     self.node.append(point)
-                print "node",self.node
+                #print "node",self.node
                 self.dimtrack.update(self.node)
                 if (len(self.node) == 2):
                     self.point2 = self.node[1]