Commit 896808b4 authored by sumpfralle's avatar sumpfralle

calculate bounds depending on relevant models


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1150 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent ceddbba3
...@@ -442,14 +442,20 @@ class BoundsDict(dict): ...@@ -442,14 +442,20 @@ class BoundsDict(dict):
"Models": [], "Models": [],
}) })
def get_absolute_limits(self): def get_absolute_limits(self, tool=None, models=None):
default = (None, None, None), (None, None, None) default = (None, None, None), (None, None, None)
get_low_value = lambda axis: self["BoundaryLow%s" % "XYZ"[axis]] get_low_value = lambda axis: self["BoundaryLow%s" % "XYZ"[axis]]
get_high_value = lambda axis: self["BoundaryHigh%s" % "XYZ"[axis]] get_high_value = lambda axis: self["BoundaryHigh%s" % "XYZ"[axis]]
if self["TypeRelativeMargin"]: if self["TypeRelativeMargin"]:
# use the currently selected models or all visible ones # choose the appropriate set of models
models = self["Models"] if self["Models"]:
if not models: # configured models always take precedence
models = self["Models"]
elif models:
# use the supplied models (e.g. for toolpath calculation)
pass
else:
# use all visible models -> for live visualization
models = self.core.get("models").get_visible() models = self.core.get("models").get_visible()
low_model, high_model = pycam.Geometry.Model.get_combined_bounds( low_model, high_model = pycam.Geometry.Model.get_combined_bounds(
models) models)
...@@ -472,5 +478,17 @@ class BoundsDict(dict): ...@@ -472,5 +478,17 @@ class BoundsDict(dict):
for axis in range(3): for axis in range(3):
low.append(get_low_value(axis)) low.append(get_low_value(axis))
high.append(get_high_value(axis)) high.append(get_high_value(axis))
tool_limit = _BOUNDARY_MODES[self["ToolLimit"]]
# apply inside/along/outside
if tool_limit != "along":
tool_radius = tool["parameters"]["radius"]
if tool_limit == "inside":
offset = -tool_radius
else:
offset = tool_radius
# apply offset only for x and y
for index in range(2):
low[index] -= offset
high[index] += offset
return low, high return low, high
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment