diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index 22277cc74d..b35be2becd 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -94,6 +94,8 @@ def getDefaultColor(objectType): c = p.GetUnsigned("RebarColor",3111475967) elif objectType == "Panel": c = p.GetUnsigned("PanelColor",3416289279) + elif objectType == "Space": + c = p.GetUnsigned("defaultSpaceColor",4278190080) elif objectType == "Helpers": c = p.GetUnsigned("ColorHelpers",674321151) elif objectType == "Construction": diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py index 8d709a64bf..d5c35b0c26 100644 --- a/src/Mod/Arch/ArchSpace.py +++ b/src/Mod/Arch/ArchSpace.py @@ -471,11 +471,13 @@ class _ViewProviderSpace(ArchComponent.ViewProviderComponent): ArchComponent.ViewProviderComponent.__init__(self,vobj) self.setProperties(vobj) - vobj.Transparency = 85 - vobj.LineWidth = 1 - vobj.LineColor = (1.0,0.0,0.0,1.0) - vobj.DrawStyle = "Dotted" - vobj.DisplayMode = "Wireframe" + prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch") + vobj.Transparency = prefs.GetInt("defaultSpaceTransparency",85) + vobj.LineWidth = Draft.getParam("linewidth") + vobj.LineColor = ArchCommands.getDefaultColor("Space") + vobj.DrawStyle = ["Solid","Dashed","Dotted","Dashdot"][prefs.GetInt("defaultSpaceStyle",2)] + if prefs.GetInt("defaultSpaceTransparency",85) == 100: + vobj.DisplayMode = "Wireframe" def setProperties(self,vobj): diff --git a/src/Mod/Arch/Resources/ui/preferences-archdefaults.ui b/src/Mod/Arch/Resources/ui/preferences-archdefaults.ui index 9f4fe1a8d8..09c08af4e3 100644 --- a/src/Mod/Arch/Resources/ui/preferences-archdefaults.ui +++ b/src/Mod/Arch/Resources/ui/preferences-archdefaults.ui @@ -7,7 +7,7 @@ 0 0 522 - 711 + 851 @@ -1065,6 +1065,122 @@ + + + + Spaces + + + + + + + + Transparency: + + + + + + + 100 + + + 1 + + + 85 + + + defaultSpaceTransparency + + + Mod/Arch + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Line style: + + + + + + + 2 + + + defaultSpaceStyle + + + Mod/Arch + + + + Solid + + + + + Dashed + + + + + Dotted + + + + + Dashdot + + + + + + + + Line color + + + + + + + + 255 + 29 + 0 + + + + defaultSpaceColor + + + Mod/Arch + + + + + + + + @@ -1090,6 +1206,11 @@ QCheckBox
Gui/PrefWidgets.h
+ + Gui::PrefComboBox + QComboBox +
Gui/PrefWidgets.h
+
Gui::PrefDoubleSpinBox QDoubleSpinBox