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

Merge branch 'master' of git://github.com/FreeCAD/FreeCAD

Browse Source
This commit is contained in:
wmayer 2015-07-21 00:05:57 +02:00
commit de636242b3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,7 +240,7 @@ class ComponentTaskPanel:
if it: if it:
mod = None mod = None
for a in self.attribs: for a in self.attribs:
if it == getattr(self,"tree"+a): if it.text(0) == getattr(self,"tree"+a).text(0):
mod = a mod = a
for o in FreeCADGui.Selection.getSelection(): for o in FreeCADGui.Selection.getSelection():
addToComponent(self.obj,o,mod) addToComponent(self.obj,o,mod)

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

@ -592,7 +592,7 @@ def getMovableChildren(objectslist,recursive=False):
children = obj.OutList children = obj.OutList
if hasattr(obj,"Proxy"): if hasattr(obj,"Proxy"):
if obj.Proxy: if obj.Proxy:
if hasattr(obj.Proxy,"getSiblings"): if hasattr(obj.Proxy,"getSiblings") and not(getType(obj) in ["Window"]):
children.extend(obj.Proxy.getSiblings(obj)) children.extend(obj.Proxy.getSiblings(obj))
for child in children: for child in children:
if hasattr(child,"MoveWithHost"): if hasattr(child,"MoveWithHost"):

3
src/Mod/Draft/importDXF.py
View File

@ -1320,7 +1320,8 @@ def processdxf(document,filename,getShapes=False):
newob.ViewObject.FontSize = draftui.fontsize newob.ViewObject.FontSize = draftui.fontsize
else: else:
st = rawValue(dim,3) st = rawValue(dim,3)
newob.ViewObject.FontSize = float(getdimheight(st))*TEXTSCALING size = getdimheight(st) or 1
newob.ViewObject.FontSize = float(size)*TEXTSCALING
else: else:
FreeCAD.Console.PrintMessage("skipping dimensions...\n") FreeCAD.Console.PrintMessage("skipping dimensions...\n")

11
src/Tools/SubWCRev.py
View File

@ -156,7 +156,7 @@ class GitControl(VersionControl):
match = re.match('ssh://\S+?@(\S+)',url) match = re.match('ssh://\S+?@(\S+)',url)
if match is not None: if match is not None:
url = 'git://%s' % match.group(1) url = 'git://%s' % match.group(1)
entryscore=(url=='git://git.code.sf.net/p/free-cad/code',\ entryscore=(url == "git://github.com/FreeCAD/FreeCAD.git",\
'github.com' in url,branch==self.branch,\ 'github.com' in url,branch==self.branch,\
branch=='master', '@' not in url) branch=='master', '@' not in url)
#used for sorting the list #used for sorting the list
@ -178,8 +178,8 @@ the second part, seperated by " +"reflects the number of commits that are
different form the master repository""" different form the master repository"""
#referencecommit="f119e740c87918b103140b66b2316ae96f136b0e" #referencecommit="f119e740c87918b103140b66b2316ae96f136b0e"
#referencerevision=4138 #referencerevision=4138
referencecommit="49646282910aeef73db44943b88df06f0957422c" referencecommit="6b3d7b17a749e03bcbf2cf79bbbb903137298c44"
referencerevision=4244 referencerevision=5235
result = None result = None
countallfh=os.popen("git rev-list --count %s..HEAD" % \ countallfh=os.popen("git rev-list --count %s..HEAD" % \
@ -251,9 +251,8 @@ merged."""
remote='origin' #used to determine the url remote='origin' #used to determine the url
self.geturl() self.geturl()
origin = None #remote for the blessed master origin = None #remote for the blessed master
for fetchurl in ("git.code.sf.net/p/free-cad/code",\ for fetchurl in ("git@github.com:FreeCAD/FreeCAD.git",\
"git@github.com:FreeCAD/FreeCAD_sf_master.git",\ "https://github.com/FreeCAD/FreeCAD.git"):
"https://github.com/FreeCAD/FreeCAD_sf_master.git"):
for key,url in self.remotes.iteritems(): for key,url in self.remotes.iteritems():
if fetchurl in url: if fetchurl in url:
origin = key origin = key