Cleaning startup messages from Draft and Arch

src/Mod/Arch/InitGui.py

@@ -145,15 +145,7 @@ FreeCADGui.addWorkbench(ArchWorkbench)
 FreeCAD.addImportType("Industry Foundation Classes (*.ifc)","importIFC")
 FreeCAD.addExportType("Wavefront OBJ - Arch module (*.obj)","importOBJ")
 FreeCAD.addExportType("WebGL file (*.html)","importWebGL")
-
-# 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")
 
+

src/Mod/Arch/importDAE.py

@@ -37,14 +37,15 @@ def checkCollada():
     try:
         import collada
     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
     else:
         return True
     
 def open(filename):
     "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]
     doc = FreeCAD.newDocument(docname)
     doc.Label = decode(docname)
@@ -54,7 +55,8 @@ def open(filename):
 
 def insert(filename,docname):
     "called when freecad wants to import a file"
-    if not checkCollada(): return
+    if not checkCollada(): 
+        return
     try:
         doc = FreeCAD.getDocument(docname)
     except:

src/Mod/Draft/Draft.py

@@ -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 += obj.LabelText[i]+'</tspan>\n'
         svg += '</text>\n'
-        print svg
+        #print svg
 
     elif getType(obj) == "Axis":
         "returns the SVG representation of an Arch Axis system"

src/Mod/Draft/DraftGui.py

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

src/Mod/Draft/DraftSnap.py

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

src/Mod/Draft/DraftTools.py

@@ -1700,7 +1700,7 @@ class Dimension(Creator):
                     if (not self.node) and (not self.support):
                         self.support = getSupport(arg)
                     if hasMod(arg,MODALT) and (len(self.node)<3):
-                        print "snapped: ",self.info
+                        #print "snapped: ",self.info
                         if self.info:
                             ob = self.doc.getObject(self.info['Object'])
                             if 'Edge' in self.info['Component']:
@@ -1735,7 +1735,7 @@ class Dimension(Creator):
                                                                    self.node[3],
                                                                    True,True)
                                         if c:
-                                            print "centers:",c
+                                            #print "centers:",c
                                             self.center = c[0]
                                             self.arctrack.setCenter(self.center)
                                             self.arctrack.on()
@@ -1842,8 +1842,8 @@ class ShapeString(Creator):
                          'ss.Support='+sup])
         except Exception as e:
             msg("Draft_ShapeString: error delaying commit", "error")
-            print type(e)
+            #print type(e)
-            print e.args
+            #print e.args
         self.finish()
 
     def action(self,arg):
@@ -2373,7 +2373,7 @@ class Offset(Modifier):
                 occmode = self.ui.occOffset.isChecked()
                 if hasMod(arg,MODALT) or self.ui.isCopy.isChecked(): copymode = True
                 if self.npts:
-                    print "offset:npts=",self.npts
+                    #print "offset:npts=",self.npts
                     self.commit(translate("draft","Offset"),
                                 ['import Draft',
                                  '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")
             dist = math.degrees(-ang2)
             # 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.setStartAngle(-ang1)
             ghost.setCenter(center)
@@ -2767,8 +2767,8 @@ class Trimex(Modifier):
                     self.obj.Z1 = p[0].z
             elif Draft.getType(self.obj) == "Circle":
                 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])
                 self.obj.FirstAngle = angles[0]
                 self.obj.LastAngle = angles[1]
@@ -3505,7 +3505,7 @@ class Shape2DView():
             for e in s.SubElementNames:
                 if "Face" in e:
                     faces.append(int(e[4:])-1)
-        print objs,faces
+        #print objs,faces
         if len(objs) == 1:
             if faces:
                 Draft.makeShape2DView(objs[0],facenumbers=faces)

src/Mod/Draft/InitGui.py

@@ -181,13 +181,5 @@ App.addImportType("Common airfoil data (*.dat)","importAirfoilDAT")
 App.addExportType("Autodesk DXF (*.dxf)","importDXF")
 App.addExportType("Flattened SVG (*.svg)","importSVG")
 App.addExportType("Open CAD Format (*.oca)","importOCA")
-
-# add DWG support
-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")))
-

src/Mod/Draft/WorkingPlane.py

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

src/Mod/Draft/importDWG.py

@@ -78,13 +78,15 @@ def getTeighaConverter():
     if teigha:
         if os.path.exists(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
     
 def convertToDxf(dwgfilename):
     "converts a DWG file to DXF"
     import os,tempfile
     teigha = getTeighaConverter()
+    if teigha:
         indir = os.path.dirname(dwgfilename)
         outdir = tempfile.mkdtemp()
         basename = os.path.basename(dwgfilename)
@@ -104,6 +106,7 @@ def convertToDwg(dxffilename,dwgfilename):
     "converts a DXF file to DWG"
     import os
     teigha = getTeighaConverter()
+    if teigha:
         indir = os.path.dirname(dxffilename)
         outdir = os.path.dirname(dwgfilename)
         basename = os.path.basename(dxffilename)
@@ -111,3 +114,5 @@ def convertToDwg(dxffilename,dwgfilename):
         print "converting " + cmdline
         os.system(cmdline)
         return dwgfilename
+    return None
+