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

+ fixed remaining filename issues in Arch

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5319 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
yorikvanhavre 2011-12-17 13:07:38 +00:00
parent 52d65e2085
commit 2cf72ff194
10 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Arch/ArchAxis.py
View File

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import FreeCAD,FreeCADGui,Part,Draft,Component,math
import FreeCAD,FreeCADGui,Part,Draft,ArchComponent,math
from draftlibs import fcgeo,fcvec
from FreeCAD import Vector
from PyQt4 import QtCore
@ -61,7 +61,7 @@ class _CommandAxis:
makeAxis(5,1)
FreeCAD.ActiveDocument.commitTransaction()
class _Axis(Component.Component):
class _Axis(ArchComponent.Component):
"The Axis object"
def __init__(self,obj):
obj.addProperty("App::PropertyFloatList","Distances","Base", "The intervals between axes")
@ -96,7 +96,7 @@ class _Axis(Component.Component):
obj.Shape = Part.Compound(geoms)
obj.Placement = pl
class _ViewProviderAxis(Component.ViewProviderComponent):
class _ViewProviderAxis(ArchComponent.ViewProviderComponent):
"A View Provider for the Axis object"
def __init__(self,vobj):

10
src/Mod/Arch/ArchBuilding.py
View File

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import Cell,FreeCAD,FreeCADGui,Draft,Commands
import ArchCell,FreeCAD,FreeCADGui,Draft,ArchCommands
from PyQt4 import QtCore
__title__="FreeCAD Building"
@ -66,16 +66,16 @@ class _CommandBuilding:
FreeCAD.ActiveDocument.commitTransaction()
FreeCAD.ActiveDocument.recompute()
class _Building(Cell._Cell):
class _Building(ArchCell._Cell):
"The Building object"
def __init__(self,obj):
Cell._Cell.__init__(self,obj)
ArchCell._Cell.__init__(self,obj)
self.Type = "Building"
class _ViewProviderBuilding(Cell._ViewProviderCell):
class _ViewProviderBuilding(ArchCell._ViewProviderCell):
"A View Provider for the Building object"
def __init__(self,vobj):
Cell._ViewProviderCell.__init__(self,vobj)
ArchCell._ViewProviderCell.__init__(self,vobj)
def getIcon(self):
return ":/icons/Arch_Building_Tree.svg"

6
src/Mod/Arch/ArchCell.py
View File

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import FreeCAD,FreeCADGui,Part,Draft,Component,Commands
import FreeCAD,FreeCADGui,Part,Draft,ArchComponent,ArchCommands
from FreeCAD import Vector
from PyQt4 import QtCore
@ -68,7 +68,7 @@ class _CommandCell:
FreeCAD.ActiveDocument.commitTransaction()
FreeCAD.ActiveDocument.recompute()
class _Cell(Component.Component):
class _Cell(ArchComponent.Component):
"The Cell object"
def __init__(self,obj):
obj.addProperty("App::PropertyLinkList","Components","Base",
@ -114,7 +114,7 @@ class _Cell(Component.Component):
obj.Shape = baseShape
obj.Placement = pl
class _ViewProviderCell(Component.ViewProviderComponent):
class _ViewProviderCell(ArchComponent.ViewProviderComponent):
"A View Provider for the Cell object"
def __init__(self,vobj):
Component.ViewProviderComponent.__init__(self,vobj)

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

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import FreeCAD,FreeCADGui,Part,Draft,MeshPart,Component
import FreeCAD,FreeCADGui,Part,Draft,MeshPart,ArchComponent
from draftlibs import fcgeo,fcvec
from FreeCAD import Vector
from PyQt4 import QtCore

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

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import Cell,FreeCAD,FreeCADGui,Draft,Commands
import ArchCell,FreeCAD,FreeCADGui,Draft,ArchCommands
from PyQt4 import QtCore
__title__="FreeCAD Arch Floor"
@ -47,7 +47,7 @@ class _CommandFloor:
def GetResources(self):
return {'Pixmap' : 'Arch_Floor',
'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_Floor","Floor"),
'Accel': "F, R",
'Accel': "F, L",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Floor","Creates a floor object including selected objects")}
def Activated(self):
@ -67,18 +67,18 @@ class _CommandFloor:
FreeCAD.ActiveDocument.commitTransaction()
FreeCAD.ActiveDocument.recompute()
class _Floor(Cell._Cell):
class _Floor(ArchCell._Cell):
"The Cell object"
def __init__(self,obj):
Cell._Cell.__init__(self,obj)
ArchCell._Cell.__init__(self,obj)
obj.addProperty("App::PropertyLength","Height","Base",
"The height of this floor")
self.Type = "Floor"
class _ViewProviderFloor(Cell._ViewProviderCell):
class _ViewProviderFloor(ArchCell._ViewProviderCell):
"A View Provider for the Cell object"
def __init__(self,vobj):
Cell._ViewProviderCell.__init__(self,vobj)
ArchCell._ViewProviderCell.__init__(self,vobj)
def getIcon(self):
return ":/icons/Arch_Floor_Tree.svg"

5
src/Mod/Arch/ArchSectionPlane.py
View File

@ -1,4 +1,4 @@
import FreeCAD,FreeCADGui,Part,Component,WorkingPlane,Drawing,math
import FreeCAD,FreeCADGui,Part,ArchComponent,WorkingPlane,Drawing,math
from FreeCAD import Vector
from PyQt4 import QtCore
from pivy import coin
@ -9,6 +9,7 @@ class _CommandSectionPlane:
"the Arch SectionPlane command definition"
def GetResources(self):
return {'Pixmap' : 'Arch_SectionPlane',
'Accel': "S, P",
'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_SectionPlane","Section Plane"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_SectionPlane","Adds a section plane object to the document")}
@ -59,7 +60,7 @@ class _SectionPlane:
def getNormal(self):
return self.Object.Shape.Faces[0].normalAt(0,0)
class _ViewProviderSectionPlane(Component.ViewProviderComponent):
class _ViewProviderSectionPlane(ArchComponent.ViewProviderComponent):
"A View Provider for Section Planes"
def __init__(self,vobj):
vobj.addProperty("App::PropertyLength","DisplaySize","Base",

10
src/Mod/Arch/ArchSite.py
View File

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import Cell,FreeCAD,FreeCADGui,Draft,Commands
import ArchCell,FreeCAD,FreeCADGui,Draft,ArchCommands
from PyQt4 import QtCore
__title__="FreeCAD Site"
@ -64,10 +64,10 @@ class _CommandSite:
FreeCAD.ActiveDocument.commitTransaction()
FreeCAD.ActiveDocument.recompute()
class _Site(Cell._Cell):
class _Site(ArchCell._Cell):
"The Site object"
def __init__(self,obj):
Cell._Cell.__init__(self,obj)
ArchCell._Cell.__init__(self,obj)
self.Type = "Site"
def execute(self,obj):
@ -76,10 +76,10 @@ class _Site(Cell._Cell):
def onChanged(self,obj,prop):
pass
class _ViewProviderSite(Cell._ViewProviderCell):
class _ViewProviderSite(ArchCell._ViewProviderCell):
"A View Provider for the Site object"
def __init__(self,vobj):
Cell._ViewProviderCell.__init__(self,vobj)
ArchCell._ViewProviderCell.__init__(self,vobj)
def getIcon(self):
return ":/icons/Arch_Site_Tree.svg"

10
src/Mod/Arch/ArchStructure.py
View File

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import FreeCAD,FreeCADGui,Part,Draft,Component
import FreeCAD,FreeCADGui,Part,Draft,ArchComponent
from draftlibs import fcgeo,fcvec
from FreeCAD import Vector
from PyQt4 import QtCore
@ -74,10 +74,10 @@ class _CommandStructure:
else:
makeStructure()
class _Structure(Component.Component):
class _Structure(ArchComponent.Component):
"The Structure object"
def __init__(self,obj):
Component.Component.__init__(self,obj)
ArchComponent.Component.__init__(self,obj)
obj.addProperty("App::PropertyLength","Length","Base",
"The length of this element, if not based on a profile")
obj.addProperty("App::PropertyLength","Width","Base",
@ -159,11 +159,11 @@ class _Structure(Component.Component):
obj.Shape = base
if not fcgeo.isNull(pl): obj.Placement = pl
class _ViewProviderStructure(Component.ViewProviderComponent):
class _ViewProviderStructure(ArchComponent.ViewProviderComponent):
"A View Provider for the Structure object"
def __init__(self,vobj):
Component.ViewProviderComponent.__init__(self,vobj)
ArchComponent.ViewProviderComponent.__init__(self,vobj)
def getIcon(self):
return ":/icons/Arch_Structure_Tree.svg"

10
src/Mod/Arch/ArchWall.py
View File

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import FreeCAD,FreeCADGui,Part,Draft,Component
import FreeCAD,FreeCADGui,Part,Draft,ArchComponent
from draftlibs import fcgeo,fcvec
from FreeCAD import Vector
from PyQt4 import QtCore
@ -67,10 +67,10 @@ class _CommandWall:
else:
wall = makeWall()
class _Wall(Component.Component):
class _Wall(ArchComponent.Component):
"The Wall object"
def __init__(self,obj):
Component.Component.__init__(self,obj)
ArchComponent.Component.__init__(self,obj)
obj.addProperty("App::PropertyLength","Width","Base",
"The width of this wall. Not used if this wall is based on a face")
obj.addProperty("App::PropertyLength","Height","Base",
@ -180,11 +180,11 @@ class _Wall(Component.Component):
if not fcgeo.isNull(pl):
obj.Placement = pl
class _ViewProviderWall(Component.ViewProviderComponent):
class _ViewProviderWall(ArchComponent.ViewProviderComponent):
"A View Provider for the Wall object"
def __init__(self,vobj):
Component.ViewProviderComponent.__init__(self,vobj)
ArchComponent.ViewProviderComponent.__init__(self,vobj)
def getIcon(self):
return ":/icons/Arch_Wall_Tree.svg"

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

@ -21,7 +21,7 @@
#* *
#***************************************************************************
import FreeCAD,FreeCADGui,Part,Draft,Component
import FreeCAD,FreeCADGui,Part,Draft,ArchComponent
from draftlibs import fcgeo,fcvec
from FreeCAD import Vector
from PyQt4 import QtCore
@ -51,7 +51,7 @@ class _CommandWindow:
def GetResources(self):
return {'Pixmap' : 'Arch_Window',
'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_Window","Window"),
'Accel': "W, A",
'Accel': "W, I",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Window","Creates a window object from scratch or from a selected object (wire, rectangle or sketch)")}
def Activated(self):
@ -65,10 +65,10 @@ class _CommandWindow:
makeWindow(rect)
FreeCAD.ActiveDocument.commitTransaction()
class _Window(Component.Component):
class _Window(ArchComponent.Component):
"The Window object"
def __init__(self,obj):
Component.Component.__init__(self,obj)
ArchComponent.Component.__init__(self,obj)
obj.addProperty("App::PropertyFloat","Thickness","Base",
"the thickness to be associated with the wire of the Base object")
#obj.addProperty("App::PropertyLink","Support","Base",
@ -107,11 +107,11 @@ class _Window(Component.Component):
obj.Placement = pl
self.Subvolume.Placement = pl
class _ViewProviderWindow(Component.ViewProviderComponent):
class _ViewProviderWindow(ArchComponent.ViewProviderComponent):
"A View Provider for the Window object"
def __init__(self,vobj):
Component.ViewProviderComponent.__init__(self,vobj)
ArchComponent.ViewProviderComponent.__init__(self,vobj)
def getIcon(self):
return ":/icons/Arch_Window_Tree.svg"