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

Managed situations when no tank volume can be found

Browse Source
This commit is contained in:
Jose Luis Cercós Pita 2013-05-20 09:29:18 -04:00
parent f9e1c43285
commit 2b38876e40
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Ship/TankInstance.py
View File

@ -735,9 +735,12 @@ def tankWeight(obj, angles=Vector(0.0,0.0,0.0), cor=Vector(0.0,0.0,0.0)):
z = z0 + dz
dx = bbox.XMax-bbox.XMin
dy = bbox.YMax-bbox.YMin
box = Part.makeBox(3.0*(dx), 3.0*(dy), (z1-z0)+dz, Vector(bbox.XMin-dx, bbox.YMin-dy, bbox.ZMin-(z1-z0)))
fluid = s.common(box)
vol = fluid.Volume
try:
box = Part.makeBox(3.0*(dx), 3.0*(dy), (z1-z0)+dz, Vector(bbox.XMin-dx, bbox.YMin-dy, bbox.ZMin-(z1-z0)))
fluid = s.common(box)
vol = fluid.Volume
except:
vol = 0.0
W[0] = W[0] + vol*obj.Density
# Compute fluid solid in rotated position (non linear rotation
# are ussually computed as Roll -> Pitch -> Yaw).
@ -755,9 +758,12 @@ def tankWeight(obj, angles=Vector(0.0,0.0,0.0), cor=Vector(0.0,0.0,0.0)):
while(abs(vol - v) > Error):
z = z + (vol - v) / (dx*dy)
dz = z - z0
box = Part.makeBox(3.0*(dx), 3.0*(dy), (z1-z0)+dz, Vector(bbox.XMin-dx, bbox.YMin-dy, bbox.ZMin-(z1-z0)))
fluid = s.common(box)
v = fluid.Volume
try:
box = Part.makeBox(3.0*(dx), 3.0*(dy), (z1-z0)+dz, Vector(bbox.XMin-dx, bbox.YMin-dy, bbox.ZMin-(z1-z0)))
fluid = s.common(box)
v = fluid.Volume
except:
v = 0.0
if(abs(vol - v) / (dx*dy) <= 0.000001):
break
# Add fluid moments