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

Cleaning startup messages from Draft and Arch

Browse Source
This commit is contained in:
Yorik van Havre 2013-08-25 13:43:54 -03:00
parent 348fcefb92
commit 38f0f73fbe
9 changed files with 53 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Arch/InitGui.py
View File

@ -145,15 +145,7 @@ FreeCADGui.addWorkbench(ArchWorkbench)
FreeCAD.addImportType("Industry Foundation Classes (*.ifc)","importIFC") FreeCAD.addImportType("Industry Foundation Classes (*.ifc)","importIFC")
FreeCAD.addExportType("Wavefront OBJ - Arch module (*.obj)","importOBJ") FreeCAD.addExportType("Wavefront OBJ - Arch module (*.obj)","importOBJ")
FreeCAD.addExportType("WebGL file (*.html)","importWebGL") FreeCAD.addExportType("WebGL file (*.html)","importWebGL")
FreeCAD.addImportType("Collada (*.dae)","importDAE")
FreeCAD.addExportType("Collada (*.dae)","importDAE")
# check for pycollada
import imp
try:
imp.find_module("collada")
except:
from DraftTools import translate
FreeCAD.Console.PrintMessage(str(translate("arch","pycollada not found, collada support will be disabled.\n")))
else:
FreeCAD.addImportType("Collada (*.dae)","importDAE")
FreeCAD.addExportType("Collada (*.dae)","importDAE")

8
src/Mod/Arch/importDAE.py
View File

@ -37,14 +37,15 @@ def checkCollada():
try: try:
import collada import collada
except: except:
FreeCAD.Console.PrintError(str(translate("Arch","pycollada not found, no collada support.\n"))) FreeCAD.Console.PrintError(str(translate("Arch","pycollada not found, collada support is disabled.\n")))
return False return False
else: else:
return True return True
def open(filename): def open(filename):
"called when freecad wants to open a file" "called when freecad wants to open a file"
if not checkCollada(): return if not checkCollada():
return
docname = os.path.splitext(os.path.basename(filename))[0] docname = os.path.splitext(os.path.basename(filename))[0]
doc = FreeCAD.newDocument(docname) doc = FreeCAD.newDocument(docname)
doc.Label = decode(docname) doc.Label = decode(docname)
@ -54,7 +55,8 @@ def open(filename):
def insert(filename,docname): def insert(filename,docname):
"called when freecad wants to import a file" "called when freecad wants to import a file"
if not checkCollada(): return if not checkCollada():
return
try: try:
doc = FreeCAD.getDocument(docname) doc = FreeCAD.getDocument(docname)
except: except:

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

@ -1559,7 +1559,7 @@ def getSVG(obj,scale=1,linewidth=0.35,fontsize=12,fillstyle="shape color",direct
svg += '<tspan x="0" dy="'+str(obj.ViewObject.LineSpacing/2)+'">' svg += '<tspan x="0" dy="'+str(obj.ViewObject.LineSpacing/2)+'">'
svg += obj.LabelText[i]+'</tspan>\n' svg += obj.LabelText[i]+'</tspan>\n'
svg += '</text>\n' svg += '</text>\n'
print svg #print svg
elif getType(obj) == "Axis": elif getType(obj) == "Axis":
"returns the SVG representation of an Arch Axis system" "returns the SVG representation of an Arch Axis system"

8
src/Mod/Draft/DraftGui.py
View File

@ -978,13 +978,13 @@ class DraftToolBar:
last = self.sourceCmd.node[0] last = self.sourceCmd.node[0]
else: else:
last = self.sourceCmd.node[-1] last = self.sourceCmd.node[-1]
print "last:",last #print "last:",last
v = FreeCAD.Vector(numx,numy,numz) v = FreeCAD.Vector(numx,numy,numz)
print "orig:",v #print "orig:",v
if FreeCAD.DraftWorkingPlane: if FreeCAD.DraftWorkingPlane:
v = FreeCAD.Vector(numx,numy,numz) v = FreeCAD.Vector(numx,numy,numz)
v = FreeCAD.DraftWorkingPlane.getGlobalRot(v) v = FreeCAD.DraftWorkingPlane.getGlobalRot(v)
print "rotated:",v #print "rotated:",v
numx = last.x + v.x numx = last.x + v.x
numy = last.y + v.y numy = last.y + v.y
numz = last.z + v.z numz = last.z + v.z
@ -1418,7 +1418,7 @@ class DraftToolBar:
def changeEvent(self, event): def changeEvent(self, event):
if event.type() == QtCore.QEvent.LanguageChange: if event.type() == QtCore.QEvent.LanguageChange:
print "Language changed!" #print "Language changed!"
self.ui.retranslateUi(self) self.ui.retranslateUi(self)
def Activated(self): def Activated(self):

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

@ -1054,5 +1054,5 @@ if not hasattr(FreeCADGui,"Snapper"):
if not hasattr(FreeCAD,"DraftWorkingPlane"): if not hasattr(FreeCAD,"DraftWorkingPlane"):
import WorkingPlane, Draft_rc import WorkingPlane, Draft_rc
FreeCAD.DraftWorkingPlane = WorkingPlane.plane() FreeCAD.DraftWorkingPlane = WorkingPlane.plane()
print FreeCAD.DraftWorkingPlane #print FreeCAD.DraftWorkingPlane
FreeCADGui.addIconPath(":/icons") FreeCADGui.addIconPath(":/icons")

20
src/Mod/Draft/DraftTools.py
View File

@ -1700,7 +1700,7 @@ class Dimension(Creator):
if (not self.node) and (not self.support): if (not self.node) and (not self.support):
self.support = getSupport(arg) self.support = getSupport(arg)
if hasMod(arg,MODALT) and (len(self.node)<3): if hasMod(arg,MODALT) and (len(self.node)<3):
print "snapped: ",self.info #print "snapped: ",self.info
if self.info: if self.info:
ob = self.doc.getObject(self.info['Object']) ob = self.doc.getObject(self.info['Object'])
if 'Edge' in self.info['Component']: if 'Edge' in self.info['Component']:
@ -1735,7 +1735,7 @@ class Dimension(Creator):
self.node[3], self.node[3],
True,True) True,True)
if c: if c:
print "centers:",c #print "centers:",c
self.center = c[0] self.center = c[0]
self.arctrack.setCenter(self.center) self.arctrack.setCenter(self.center)
self.arctrack.on() self.arctrack.on()
@ -1813,7 +1813,7 @@ class ShapeString(Creator):
def createObject(self): def createObject(self):
"creates object in the current doc" "creates object in the current doc"
# print "debug: D_T ShapeString.createObject type(self.SString): " str(type(self.SString)) #print "debug: D_T ShapeString.createObject type(self.SString): " str(type(self.SString))
# temporary code # temporary code
#import platform #import platform
#if not (platform.system() == 'Linux'): #if not (platform.system() == 'Linux'):
@ -1842,8 +1842,8 @@ class ShapeString(Creator):
'ss.Support='+sup]) 'ss.Support='+sup])
except Exception as e: except Exception as e:
msg("Draft_ShapeString: error delaying commit", "error") msg("Draft_ShapeString: error delaying commit", "error")
print type(e) #print type(e)
print e.args #print e.args
self.finish() self.finish()
def action(self,arg): def action(self,arg):
@ -2373,7 +2373,7 @@ class Offset(Modifier):
occmode = self.ui.occOffset.isChecked() occmode = self.ui.occOffset.isChecked()
if hasMod(arg,MODALT) or self.ui.isCopy.isChecked(): copymode = True if hasMod(arg,MODALT) or self.ui.isCopy.isChecked(): copymode = True
if self.npts: if self.npts:
print "offset:npts=",self.npts #print "offset:npts=",self.npts
self.commit(translate("draft","Offset"), self.commit(translate("draft","Offset"),
['import Draft', ['import Draft',
'Draft.offset(FreeCAD.ActiveDocument.'+self.sel.Name+','+DraftVecUtils.toString(self.ntps)+',copy='+str(copymode)+')']) 'Draft.offset(FreeCAD.ActiveDocument.'+self.sel.Name+','+DraftVecUtils.toString(self.ntps)+',copy='+str(copymode)+')'])
@ -2676,7 +2676,7 @@ class Trimex(Modifier):
self.ui.labelRadius.setText("Angle") self.ui.labelRadius.setText("Angle")
dist = math.degrees(-ang2) dist = math.degrees(-ang2)
# if ang1 > ang2: ang1,ang2 = ang2,ang1 # if ang1 > ang2: ang1,ang2 = ang2,ang1
print "last calculated:",math.degrees(-ang1),math.degrees(-ang2) #print "last calculated:",math.degrees(-ang1),math.degrees(-ang2)
ghost.setEndAngle(-ang2) ghost.setEndAngle(-ang2)
ghost.setStartAngle(-ang1) ghost.setStartAngle(-ang1)
ghost.setCenter(center) ghost.setCenter(center)
@ -2767,8 +2767,8 @@ class Trimex(Modifier):
self.obj.Z1 = p[0].z self.obj.Z1 = p[0].z
elif Draft.getType(self.obj) == "Circle": elif Draft.getType(self.obj) == "Circle":
angles = self.ghost[0].getAngles() angles = self.ghost[0].getAngles()
print "original",self.obj.FirstAngle," ",self.obj.LastAngle #print "original",self.obj.FirstAngle," ",self.obj.LastAngle
print "new",angles #print "new",angles
if angles[0] > angles[1]: angles = (angles[1],angles[0]) if angles[0] > angles[1]: angles = (angles[1],angles[0])
self.obj.FirstAngle = angles[0] self.obj.FirstAngle = angles[0]
self.obj.LastAngle = angles[1] self.obj.LastAngle = angles[1]
@ -3505,7 +3505,7 @@ class Shape2DView():
for e in s.SubElementNames: for e in s.SubElementNames:
if "Face" in e: if "Face" in e:
faces.append(int(e[4:])-1) faces.append(int(e[4:])-1)
print objs,faces #print objs,faces
if len(objs) == 1: if len(objs) == 1:
if faces: if faces:
Draft.makeShape2DView(objs[0],facenumbers=faces) Draft.makeShape2DView(objs[0],facenumbers=faces)

12
src/Mod/Draft/InitGui.py
View File

@ -181,13 +181,5 @@ App.addImportType("Common airfoil data (*.dat)","importAirfoilDAT")
App.addExportType("Autodesk DXF (*.dxf)","importDXF") App.addExportType("Autodesk DXF (*.dxf)","importDXF")
App.addExportType("Flattened SVG (*.svg)","importSVG") App.addExportType("Flattened SVG (*.svg)","importSVG")
App.addExportType("Open CAD Format (*.oca)","importOCA") App.addExportType("Open CAD Format (*.oca)","importOCA")
App.addImportType("Autodesk DWG (*.dwg)","importDWG")
# add DWG support App.addExportType("Autodesk DWG (*.dwg)","importDWG")
import importDWG
if importDWG.getTeighaConverter():
App.addImportType("Autodesk DWG (*.dwg)","importDWG")
App.addExportType("Autodesk DWG (*.dwg)","importDWG")
else:
from DraftTools import translate
FreeCAD.Console.PrintMessage(str(translate("draft","Teigha File Converter not found, DWG support will be disabled.\n")))

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

@ -158,7 +158,7 @@ class plane:
v1.normalize() v1.normalize()
v2.normalize() v2.normalize()
v3.normalize() v3.normalize()
print v1,v2,v3 #print v1,v2,v3
self.u = v1 self.u = v1
self.v = v2 self.v = v2
self.axis = v3 self.axis = v3

49
src/Mod/Draft/importDWG.py
View File

@ -78,36 +78,41 @@ def getTeighaConverter():
if teigha: if teigha:
if os.path.exists(teigha): if os.path.exists(teigha):
return teigha return teigha
FreeCAD.Console.PrintError("Couldn't find Teigha File Converter executable, aborting.\n") from DraftTools import translate
FreeCAD.Console.PrintMessage(str(translate("draft","Teigha File Converter not found, DWG support is disabled.\n")))
return None return None
def convertToDxf(dwgfilename): def convertToDxf(dwgfilename):
"converts a DWG file to DXF" "converts a DWG file to DXF"
import os,tempfile import os,tempfile
teigha = getTeighaConverter() teigha = getTeighaConverter()
indir = os.path.dirname(dwgfilename) if teigha:
outdir = tempfile.mkdtemp() indir = os.path.dirname(dwgfilename)
basename = os.path.basename(dwgfilename) outdir = tempfile.mkdtemp()
cmdline = teigha + ' "' + indir + '" "' + outdir + '" "ACAD2010" "DXF" "0" "1" "' + basename + '"' basename = os.path.basename(dwgfilename)
print "Converting: " + cmdline cmdline = teigha + ' "' + indir + '" "' + outdir + '" "ACAD2010" "DXF" "0" "1" "' + basename + '"'
os.system(cmdline) print "Converting: " + cmdline
result = outdir + os.sep + os.path.splitext(basename)[0] + ".dxf" os.system(cmdline)
if os.path.exists(result): result = outdir + os.sep + os.path.splitext(basename)[0] + ".dxf"
print "Conversion successful" if os.path.exists(result):
return result print "Conversion successful"
else: return result
print "Error during DWG to DXF conversion. Try moving the DWG file to a directory path" else:
print "without spaces and non-english characters, or try saving to a lower DWG version" print "Error during DWG to DXF conversion. Try moving the DWG file to a directory path"
return None print "without spaces and non-english characters, or try saving to a lower DWG version"
return None
def convertToDwg(dxffilename,dwgfilename): def convertToDwg(dxffilename,dwgfilename):
"converts a DXF file to DWG" "converts a DXF file to DWG"
import os import os
teigha = getTeighaConverter() teigha = getTeighaConverter()
indir = os.path.dirname(dxffilename) if teigha:
outdir = os.path.dirname(dwgfilename) indir = os.path.dirname(dxffilename)
basename = os.path.basename(dxffilename) outdir = os.path.dirname(dwgfilename)
cmdline = teigha + ' "' + indir + '" "' + outdir + '" "ACAD2010" "DWG" "0" "1" "' + basename + '"' basename = os.path.basename(dxffilename)
print "converting " + cmdline cmdline = teigha + ' "' + indir + '" "' + outdir + '" "ACAD2010" "DWG" "0" "1" "' + basename + '"'
os.system(cmdline) print "converting " + cmdline
return dwgfilename os.system(cmdline)
return dwgfilename
return None