Merge branch 'master' of github.com:FreeCAD/FreeCAD
This commit is contained in:
@@ -806,7 +806,7 @@ class _Roof(ArchComponent.Component):
|
||||
base = self.shps.pop()
|
||||
for s in self.shps:
|
||||
base = base.fuse(s)
|
||||
base = self.processSubShapes(obj, base)
|
||||
base = self.processSubShapes(obj, base, pl)
|
||||
self.applyShape(obj, base, pl, allownosolid = True)
|
||||
|
||||
## subVolume
|
||||
@@ -819,7 +819,7 @@ class _Roof(ArchComponent.Component):
|
||||
self.sub.Placement = pl
|
||||
|
||||
elif base:
|
||||
base = self.processSubShapes(obj, base)
|
||||
base = self.processSubShapes(obj, base, pl)
|
||||
self.applyShape(obj, base, pl, allownosolid = True)
|
||||
else:
|
||||
FreeCAD.Console.PrintMessage(translate("Arch", "Unable to create a roof"))
|
||||
|
||||
@@ -74,6 +74,10 @@ Pad::Pad()
|
||||
ADD_PROPERTY_TYPE(Offset, (0.0), "Pad", App::Prop_None, "Offset from face in which pad will end");
|
||||
static const App::PropertyQuantityConstraint::Constraints signedLengthConstraint = {-DBL_MAX, DBL_MAX, 1.0};
|
||||
Offset.setConstraints(&signedLengthConstraint);
|
||||
|
||||
// Remove the constraints and keep the type to allow to accept negative values
|
||||
// https://forum.freecadweb.org/viewtopic.php?f=3&t=52075&p=448410#p447636
|
||||
Length2.setConstraints(nullptr);
|
||||
}
|
||||
|
||||
short Pad::mustExecute() const
|
||||
|
||||
@@ -71,6 +71,10 @@ Pocket::Pocket()
|
||||
ADD_PROPERTY_TYPE(Offset,(0.0),"Pocket",App::Prop_None,"Offset from face in which pocket will end");
|
||||
static const App::PropertyQuantityConstraint::Constraints signedLengthConstraint = {-DBL_MAX, DBL_MAX, 1.0};
|
||||
Offset.setConstraints ( &signedLengthConstraint );
|
||||
|
||||
// Remove the constraints and keep the type to allow to accept negative values
|
||||
// https://forum.freecadweb.org/viewtopic.php?f=3&t=52075&p=448410#p447636
|
||||
Length2.setConstraints(nullptr);
|
||||
}
|
||||
|
||||
short Pocket::mustExecute() const
|
||||
|
||||
@@ -234,9 +234,6 @@ the sketch plane's normal vector will be used</string>
|
||||
<property name="keyboardTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
@@ -104,9 +104,6 @@
|
||||
<property name="keyboardTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
Reference in New Issue
Block a user