suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draft: fixing bugs in previous commit

Browse Source
This commit is contained in:
Yorik van Havre 2014-09-15 15:56:07 -03:00
parent 1100d2d0bd
commit 0446f60277
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mod/Draft/Draft.py
View File

@ -93,10 +93,10 @@ arrowtypes = ["Dot","Circle","Arrow"]
def stringencodecoin(str): def stringencodecoin(str):
"""Encode a unicode object to be used as a string in coin""" """Encode a unicode object to be used as a string in coin"""
try: try:
from pivy import coin from pivy import coin
coin4 = coin.COIN_MAJOR_VERSION >= 4 coin4 = coin.COIN_MAJOR_VERSION >= 4
except ImportError, AttributeError: except ImportError, AttributeError:
coin4 = False coin4 = False
if coin4: if coin4:
return str.encode('utf-8') return str.encode('utf-8')
else: else:
@ -893,7 +893,7 @@ def makeText(stringslist,point=Vector(0,0,0),screen=False):
if not isinstance(stringslist,list): stringslist = [stringslist] if not isinstance(stringslist,list): stringslist = [stringslist]
textbuffer = [] textbuffer = []
for l in stringslist: for l in stringslist:
textbuffer.append(stringencodecoin(l.decode("utf8")) textbuffer.append(stringencodecoin(l.decode("utf8")))
obj=FreeCAD.ActiveDocument.addObject("App::Annotation","Text") obj=FreeCAD.ActiveDocument.addObject("App::Annotation","Text")
obj.LabelText=textbuffer obj.LabelText=textbuffer
obj.Position=point obj.Position=point
@ -3373,8 +3373,7 @@ class _ViewProviderDimension(_ViewProviderDraft):
if obj.ViewObject.Override: if obj.ViewObject.Override:
self.string = obj.ViewObject.Override.replace("$dim",\ self.string = obj.ViewObject.Override.replace("$dim",\
self.string) self.string)
self.text.string = self.text3d.string = \ self.text.string = self.text3d.string = stringencodecoin(self.string)
textbuffer.append(stringencodecoin(self.string)
# set the distance property # set the distance property
if round(obj.Distance.Value,precision()) != round(l,precision()): if round(obj.Distance.Value,precision()) != round(l,precision()):
obj.Distance = l obj.Distance = l
@ -3484,10 +3483,10 @@ class _ViewProviderDimension(_ViewProviderDraft):
/* XPM */ /* XPM */
static char * dim_xpm[] = { static char * dim_xpm[] = {
"16 16 4 1", "16 16 4 1",
" c None", " c None",
". c #000000", ". c #000000",
"+ c #FFFF00", "+ c #FFFF00",
"@ c #FFFFFF", "@ c #FFFFFF",
" ", " ",
" ", " ",
" . . ", " . . ",
@ -3656,10 +3655,9 @@ class _ViewProviderAngularDimension(_ViewProviderDraft):
else: else:
self.string = DraftGui.displayExternal(a,getParam("dimPrecision",2),'Angle',su) self.string = DraftGui.displayExternal(a,getParam("dimPrecision",2),'Angle',su)
if obj.ViewObject.Override: if obj.ViewObject.Override:
self.string = obj.ViewObject.Override.replace("$dim",\ self.string = obj.ViewObject.Override.replace("$dim",\
self.string) self.string)
self.text.string = self.text3d.string = \ self.text.string = self.text3d.string = stringencodecoin(self.string)
textbuffer.append(stringencodecoin(self.string)
# check display mode # check display mode
try: try:
@ -3821,10 +3819,10 @@ class _ViewProviderAngularDimension(_ViewProviderDraft):
/* XPM */ /* XPM */
static char * dim_xpm[] = { static char * dim_xpm[] = {
"16 16 4 1", "16 16 4 1",
" c None", " c None",
". c #000000", ". c #000000",
"+ c #FFFF00", "+ c #FFFF00",
"@ c #FFFFFF", "@ c #FFFFFF",
" ", " ",
" ", " ",
" . . ", " . . ",