Arch now works in console mode - fixes #1362

FreeCAD · Jan 26, 2014 · 69cc7ec · 69cc7ec
1 parent ce8efb1
commit 69cc7ec
Show file tree

Hide file tree

Showing 17 changed files with 179 additions and 92 deletions.
diff --git a/src/Mod/Arch/Arch.py b/src/Mod/Arch/Arch.py
@@ -25,9 +25,10 @@
 __author__ = "Yorik van Havre"
 __url__ = "http://www.freecadweb.org"
 
-import FreeCADGui
-
-FreeCADGui.updateLocale()
+import FreeCAD
+if FreeCAD.GuiUp:
+	import FreeCADGui
+	FreeCADGui.updateLocale()
 
 from ArchWall import *
 from ArchFloor import *
@@ -42,4 +43,4 @@
 from ArchSpace import *
 from ArchStairs import *
 from ArchRebar import *
-from ArchFrame import *
+from ArchFrame import *
diff --git a/src/Mod/Arch/ArchAxis.py b/src/Mod/Arch/ArchAxis.py
@@ -21,11 +21,16 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Draft,math,DraftVecUtils,ArchCommands
+import FreeCAD,Draft,math,DraftVecUtils,ArchCommands
 from FreeCAD import Vector
-from PySide import QtCore, QtGui
-from pivy import coin
-from DraftTools import translate
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+    from pivy import coin
+else:
+    def translate(ctxt,txt):
+        return txt
 
 __title__="FreeCAD Axis System"
 __author__ = "Yorik van Havre"
@@ -415,5 +420,6 @@ def retranslateUi(self, TaskPanel):
         self.tree.setHeaderLabels([QtGui.QApplication.translate("Arch", "Axis", None, QtGui.QApplication.UnicodeUTF8),
                                    QtGui.QApplication.translate("Arch", "Distance", None, QtGui.QApplication.UnicodeUTF8),
                                    QtGui.QApplication.translate("Arch", "Angle", None, QtGui.QApplication.UnicodeUTF8)])
-
-FreeCADGui.addCommand('Arch_Axis',_CommandAxis())
+
+if FreeCAD.GuiUp:          
+    FreeCADGui.addCommand('Arch_Axis',_CommandAxis())
diff --git a/src/Mod/Arch/ArchBuilding.py b/src/Mod/Arch/ArchBuilding.py
@@ -21,9 +21,14 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Draft,ArchCommands,ArchFloor
-from PySide import QtCore
-from DraftTools import translate
+import FreeCAD,Draft,ArchCommands,ArchFloor
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 __title__="FreeCAD Building"
 __author__ = "Yorik van Havre"
@@ -89,4 +94,5 @@ def getIcon(self):
         import Arch_rc
         return ":/icons/Arch_Building_Tree.svg"
 
-FreeCADGui.addCommand('Arch_Building',_CommandBuilding())
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Arch_Building',_CommandBuilding())
diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py
@@ -21,10 +21,15 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Draft,ArchComponent,DraftVecUtils
+import FreeCAD,Draft,ArchComponent,DraftVecUtils
 from FreeCAD import Vector
-from PySide import QtCore
-from DraftTools import translate
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtGui,QtCore
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 __title__="FreeCAD Arch Commands"
 __author__ = "Yorik van Havre"
@@ -944,13 +949,13 @@ def Activated(self):
         FreeCAD.ActiveDocument.commitTransaction()
         FreeCAD.ActiveDocument.recompute()
 
-
-FreeCADGui.addCommand('Arch_Add',_CommandAdd())
-FreeCADGui.addCommand('Arch_Remove',_CommandRemove())
-FreeCADGui.addCommand('Arch_SplitMesh',_CommandSplitMesh())
-FreeCADGui.addCommand('Arch_MeshToShape',_CommandMeshToShape())
-FreeCADGui.addCommand('Arch_SelectNonSolidMeshes',_CommandSelectNonSolidMeshes())
-FreeCADGui.addCommand('Arch_RemoveShape',_CommandRemoveShape())
-FreeCADGui.addCommand('Arch_CloseHoles',_CommandCloseHoles())
-FreeCADGui.addCommand('Arch_Check',_CommandCheck())
-#FreeCADGui.addCommand('Arch_Fixture',_CommandFixture())
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Arch_Add',_CommandAdd())
+    FreeCADGui.addCommand('Arch_Remove',_CommandRemove())
+    FreeCADGui.addCommand('Arch_SplitMesh',_CommandSplitMesh())
+    FreeCADGui.addCommand('Arch_MeshToShape',_CommandMeshToShape())
+    FreeCADGui.addCommand('Arch_SelectNonSolidMeshes',_CommandSelectNonSolidMeshes())
+    FreeCADGui.addCommand('Arch_RemoveShape',_CommandRemoveShape())
+    FreeCADGui.addCommand('Arch_CloseHoles',_CommandCloseHoles())
+    FreeCADGui.addCommand('Arch_Check',_CommandCheck())
+    #FreeCADGui.addCommand('Arch_Fixture',_CommandFixture())
diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
@@ -25,10 +25,15 @@
 __author__ = "Yorik van Havre"
 __url__ = "http://www.freecadweb.org"
 
-import FreeCAD,FreeCADGui,Draft
+import FreeCAD,Draft
 from FreeCAD import Vector
-from PySide import QtGui,QtCore
-from DraftTools import translate
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtGui,QtCore
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 def addToComponent(compobject,addobject,mod=None):
     '''addToComponent(compobject,addobject,mod): adds addobject

diff --git a/src/Mod/Arch/ArchFloor.py b/src/Mod/Arch/ArchFloor.py
@@ -21,9 +21,14 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Draft,ArchCommands, DraftVecUtils
-from PySide import QtCore
-from DraftTools import translate
+import FreeCAD,Draft,ArchCommands, DraftVecUtils
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 __title__="FreeCAD Arch Floor"
 __author__ = "Yorik van Havre"
@@ -35,7 +40,8 @@ def makeFloor(objectslist=None,join=True,name=translate("Arch","Floor")):
     not be joined.'''
     obj = FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroupPython",name)
     _Floor(obj)
-    _ViewProviderFloor(obj.ViewObject)
+    if FreeCAD.GuiUp:
+        _ViewProviderFloor(obj.ViewObject)
     if objectslist:
         obj.Group = objectslist
     return obj
@@ -146,5 +152,6 @@ def __getstate__(self):
 
     def __setstate__(self,state):
         return None
-
-FreeCADGui.addCommand('Arch_Floor',_CommandFloor())
+
+if FreeCAD.GuiUp: 
+    FreeCADGui.addCommand('Arch_Floor',_CommandFloor())
diff --git a/src/Mod/Arch/ArchFrame.py b/src/Mod/Arch/ArchFrame.py
@@ -21,10 +21,15 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Draft,ArchComponent,DraftVecUtils,ArchCommands
+import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
 from FreeCAD import Vector
-from PySide import QtCore
-from DraftTools import translate
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 __title__="FreeCAD Arch Frame"
 __author__ = "Yorik van Havre"
@@ -148,5 +153,5 @@ def getIcon(self):
         import Arch_rc
         return ":/icons/Arch_Frame_Tree.svg"
 
-
-FreeCADGui.addCommand('Arch_Frame',_CommandFrame())
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Arch_Frame',_CommandFrame())
diff --git a/src/Mod/Arch/ArchRebar.py b/src/Mod/Arch/ArchRebar.py
@@ -21,10 +21,15 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Draft,ArchComponent,DraftVecUtils,ArchCommands
+import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
 from FreeCAD import Vector
-from PySide import QtCore
-from DraftTools import translate
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 __title__="FreeCAD Rebar"
 __author__ = "Yorik van Havre"
@@ -238,5 +243,5 @@ def getIcon(self):
         import Arch_rc
         return ":/icons/Arch_Rebar_Tree.svg"
 
-
-FreeCADGui.addCommand('Arch_Rebar',_CommandRebar())
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Arch_Rebar',_CommandRebar())
diff --git a/src/Mod/Arch/ArchRoof.py b/src/Mod/Arch/ArchRoof.py
@@ -21,10 +21,15 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Draft,ArchComponent, DraftVecUtils
+import FreeCAD,Draft,ArchComponent, DraftVecUtils
 from FreeCAD import Vector
-from PySide import QtCore
-from DraftTools import translate
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 __title__="FreeCAD Roof"
 __author__ = "Yorik van Havre"
@@ -163,4 +168,5 @@ def getIcon(self):
         import Arch_rc
         return ":/icons/Arch_Roof_Tree.svg"
 
-FreeCADGui.addCommand('Arch_Roof',_CommandRoof())
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Arch_Roof',_CommandRoof())
diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py
@@ -21,11 +21,16 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,ArchComponent,WorkingPlane,math,Draft,ArchCommands,DraftVecUtils
+import FreeCAD,ArchComponent,WorkingPlane,math,Draft,ArchCommands,DraftVecUtils
 from FreeCAD import Vector
-from PySide import QtCore
-from pivy import coin
-from DraftTools import translate
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+    from pivy import coin
+else:
+    def translate(ctxt,txt):
+        return txt
 
 def makeSectionPlane(objectslist=None,name=translate("Arch","Section")):
     """makeSectionPlane([objectslist]) : Creates a Section plane objects including the
@@ -394,5 +399,6 @@ def updateSVG(self, obj):
         result += '</g>\n'
         # print "complete node:",result
         return result
-
-FreeCADGui.addCommand('Arch_SectionPlane',_CommandSectionPlane())
+
+if FreeCAD.GuiUp:                
+    FreeCADGui.addCommand('Arch_SectionPlane',_CommandSectionPlane())
diff --git a/src/Mod/Arch/ArchSite.py b/src/Mod/Arch/ArchSite.py
@@ -21,9 +21,14 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,FreeCADGui,Draft,ArchCommands,ArchFloor
-from PySide import QtCore
-from DraftTools import translate
+import FreeCAD,Draft,ArchCommands,ArchFloor
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 __title__="FreeCAD Site"
 __author__ = "Yorik van Havre"
@@ -103,5 +108,5 @@ def getIcon(self):
     def claimChildren(self):
         return self.Object.Group+[self.Object.Terrain]
 
-
-FreeCADGui.addCommand('Arch_Site',_CommandSite())
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Arch_Site',_CommandSite())
diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py
@@ -25,9 +25,14 @@
 __author__ = "Yorik van Havre"
 __url__ = "http://www.freecadweb.org"
 
-import FreeCAD,FreeCADGui,ArchComponent,ArchCommands,math,Draft
-from DraftTools import translate
-from PySide import QtCore
+import FreeCAD,ArchComponent,ArchCommands,math,Draft
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 def makeSpace(objects=None,name=translate("Arch","Space")):
     """makeSpace([objects]): Creates a space object from the given objects. Objects can be one
@@ -289,5 +294,5 @@ def onChanged(self,vobj,prop):
                 self.setAnnotation(True)
         return
 
-
-FreeCADGui.addCommand('Arch_Space',_CommandSpace())
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Arch_Space',_CommandSpace())
diff --git a/src/Mod/Arch/ArchStairs.py b/src/Mod/Arch/ArchStairs.py
@@ -25,10 +25,15 @@
 __author__ = "Yorik van Havre"
 __url__ = "http://www.freecadweb.org"
 
-import FreeCAD,FreeCADGui,ArchComponent,ArchCommands,Draft,DraftVecUtils,math
+import FreeCAD,ArchComponent,ArchCommands,Draft,DraftVecUtils,math
 from FreeCAD import Vector
-from DraftTools import translate
-from PySide import QtCore
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from PySide import QtCore, QtGui
+    from DraftTools import translate
+else:
+    def translate(ctxt,txt):
+        return txt
 
 
 def makeStairs(base=None,length=4.5,width=1,height=3,steps=17,name=translate("Arch","Stairs")):
@@ -464,5 +469,5 @@ def getIcon(self):
         import Arch_rc
         return ":/icons/Arch_Stairs_Tree.svg"
 
-
-FreeCADGui.addCommand('Arch_Stairs',_CommandStairs())
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('Arch_Stairs',_CommandStairs())