Skip to content

P
pyMKcam
Commit 59cc0712 authored by sumpfralle's avatar sumpfralle
Browse files
Options

added support for almost arbitrary grid placement 


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@535 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent 75587fab
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 9 deletions
src/pycam/Gui/Project.py
View file @ 59cc0712
......@@ -229,6 +229,8 @@ class ProjectGui:
self.process_list = []
self.bounds_list = []
self.task_list = []
self.grid_adjustments_x = []
self.grid_adjustments_y = []
self._last_unit = None
# add some dummies - to be implemented later ...
self.settings.add_item("model", lambda: self.model)
......@@ -325,10 +327,51 @@ class ProjectGui:
self.update_support_grid_controls)
self.settings.add_item("support_grid_offset_y",
grid_offset_y.get_value, grid_offset_y.set_value)
# manual grid adjustments
self.grid_adjustment_axis_x = self.gui.get_object("SupportGridPositionManualAxisX")
self.grid_adjustment_axis_x.connect("toggled",
self.switch_support_grid_manual_selector)
self.gui.get_object("SupportGridPositionManualResetOne").connect(
"clicked", self.reset_support_grid_manual, False)
self.gui.get_object("SupportGridPositionManualResetAll").connect(
"clicked", self.reset_support_grid_manual, True)
self.grid_adjustment_model = self.gui.get_object(
"SupportGridPositionManualList")
self.grid_adjustment_selector = self.gui.get_object(
"SupportGridPositionManualSelector")
self.grid_adjustment_selector.connect("changed",
self.switch_support_grid_manual_selector)
self.grid_adjustment_value = self.gui.get_object(
"SupportGridPositionManualAdjustment")
self.grid_adjustment_value_control = self.gui.get_object(
"SupportGridPositionManualShiftControl")
self.grid_adjustment_value_control.connect("move-slider",
self.update_support_grid_manual_adjust)
self.grid_adjustment_value_control.connect("change-value",
self.update_support_grid_manual_adjust)
def get_set_grid_adjustment_value(value=None):
if self.grid_adjustment_axis_x.get_active():
adjustments = self.grid_adjustments_x
else:
adjustments = self.grid_adjustments_y
index = self.grid_adjustment_selector.get_active()
if value is None:
if 0 <= index < len(adjustments):
return adjustments[index]
else:
return 0
else:
while len(adjustments) <= index:
adjustments.append(0)
adjustments[index] = value
self.settings.add_item("support_grid_adjustment_value",
get_set_grid_adjustment_value, get_set_grid_adjustment_value)
# support grid defaults
grid_distance_square.set_active(True)
self.settings.set("support_grid_distance_x", 5.0)
self.settings.set("support_grid_thickness", 0.5)
self.settings.set("support_grid_height", 0.5)
self.grid_adjustment_axis_x_last = True
# visual and general settings
for name, objname in (("show_model", "ShowModelCheckBox"),
("show_support_grid", "ShowSupportGridCheckBox"),
......@@ -622,6 +665,8 @@ class ProjectGui:
# We let "distance_y" track the value of "distance_x".
self.settings.set("support_grid_distance_y",
self.settings.get("support_grid_distance_x"))
self.update_support_grid_manual_model()
self.switch_support_grid_manual_selector()
else:
details_box.hide()
self.update_support_grid_model()
......@@ -648,11 +693,98 @@ class ProjectGui:
s.get("support_grid_thickness"),
s.get("support_grid_height"),
offset_x=s.get("support_grid_offset_x"),
offset_y=s.get("support_grid_offset_y"))
offset_y=s.get("support_grid_offset_y"),
adjustments_x=self.grid_adjustments_x,
adjustments_y=self.grid_adjustments_y)
else:
support_grid = None
s.set("support_grid", support_grid)
def switch_support_grid_manual_selector(self, widget=None):
old_axis_was_x = self.grid_adjustment_axis_x_last
self.grid_adjustment_axis_x_last = \
self.grid_adjustment_axis_x.get_active()
if self.grid_adjustment_axis_x.get_active():
# x axis is selected
if not old_axis_was_x:
self.update_support_grid_manual_model()
half_distance = self.settings.get("support_grid_distance_x")
else:
# y axis
if old_axis_was_x:
self.update_support_grid_manual_model()
half_distance = self.settings.get("support_grid_distance_y")
half_distance /= 2.0
self.grid_adjustment_value.set_lower(-half_distance)
self.grid_adjustment_value.set_upper(half_distance)
if self.grid_adjustment_value.get_value() \
!= self.settings.get("support_grid_adjustment_value"):
self.grid_adjustment_value.set_value(self.settings.get(
"support_grid_adjustment_value"))
self.grid_adjustment_value_control.set_sensitive(
self.grid_adjustment_selector.get_active() >= 0)
def update_support_grid_manual_adjust(self, widget=None, data1=None,
data2=None):
new_value = self.grid_adjustment_value.get_value()
self.settings.set("support_grid_adjustment_value", new_value)
tree_iter = self.grid_adjustment_selector.get_active_iter()
value_string = "(%+.1f)" % new_value
self.grid_adjustment_model.set(tree_iter, 1, value_string)
self.update_support_grid_model()
self.update_view()
def reset_support_grid_manual(self, widget=None, reset_all=False):
if reset_all:
self.grid_adjustments_x = []
self.grid_adjustments_y = []
else:
self.settings.set("support_grid_adjustment_value", 0)
self.update_support_grid_manual_model()
self.switch_support_grid_manual_selector()
self.update_support_grid_model()
self.update_view()
def update_support_grid_manual_model(self):
old_index = self.grid_adjustment_selector.get_active()
model = self.grid_adjustment_model
model.clear()
s = self.settings
base_x, base_y = pycam.Toolpath.SupportGrid.get_support_grid_locations(
s.get("minx"), s.get("maxx"), s.get("miny"), s.get("maxy"),
s.get("support_grid_distance_x"),
s.get("support_grid_distance_y"),
offset_x=s.get("support_grid_offset_x"),
offset_y=s.get("support_grid_offset_y"),
adjustments_x=self.grid_adjustments_x,
adjustments_y=self.grid_adjustments_y)
# fill the adjustment lists
while len(self.grid_adjustments_x) < len(base_x):
self.grid_adjustments_x.append(0)
while len(self.grid_adjustments_y) < len(base_y):
self.grid_adjustments_y.append(0)
# select the currently active list
if self.grid_adjustment_axis_x.get_active():
base = base_x
adjustments = self.grid_adjustments_x
else:
base = base_y
adjustments = self.grid_adjustments_y
# generate the model content
for index, base_value in enumerate(base):
position = "%.2f%s" % (base_value, s.get("unit"))
if (0 <= index < len(adjustments)) and (adjustments[index] != 0):
diff = "(%+.1f)" % adjustments[index]
else:
diff = ""
model.append((position, diff))
if old_index < len(base):
self.grid_adjustment_selector.set_active(old_index)
else:
self.grid_adjustment_selector.set_active(-1)
@gui_activity_guard
def adjust_bounds(self, widget, axis, change):
bounds = self.settings.get("current_bounds")
......@@ -2242,8 +2374,10 @@ class ProjectGui:
self.settings.get("support_grid_distance_y"),
self.settings.get("support_grid_thickness"),
self.settings.get("support_grid_height"),
self.settings.get("support_grid_offset_x"),
self.settings.get("support_grid_offset_y"))
offset_x=self.settings.get("support_grid_offset_x"),
offset_y=self.settings.get("support_grid_offset_y"),
adjustments_x=self.grid_adjustments_x,
adjustments_y=self.grid_adjustments_y)
# calculation backend: ODE / None
if self.settings.get("enable_ode"):
......
src/pycam/Gui/Settings.py
View file @ 59cc0712
......@@ -626,13 +626,16 @@ class ToolpathSettings:
return self.tool_settings
def set_support_grid(self, distance_x, distance_y, thickness, height,
offset_x=0.0, offset_y=0.0):
offset_x=0.0, offset_y=0.0, adjustments_x=None,
adjustments_y=None):
self.support_grid["distance_x"] = distance_x
self.support_grid["distance_y"] = distance_y
self.support_grid["offset_x"] = offset_x
self.support_grid["offset_y"] = offset_y
self.support_grid["thickness"] = thickness
self.support_grid["height"] = height
self.support_grid["adjustments_x"] = adjustments_x
self.support_grid["adjustments_y"] = adjustments_y
def get_support_grid(self):
if self.support_grid:
......
src/pycam/Gui/gtk-interface/pycam-project.ui
View file @ 59cc0712
......@@ -189,6 +189,20 @@
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="SupportGridPositionManualList">
<columns>
<!-- column-name base -->
<column type="gchararray"/>
<!-- column-name change -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">17.3mm (-2.0)</col>
<col id="1" translatable="yes">-2.0</col>
</row>
</data>
</object>
<object class="GtkWindow" id="ProjectWindow">
<property name="title" translatable="yes">PyCAM</property>
<property name="destroy_with_parent">True</property>
......@@ -1197,7 +1211,7 @@
<child type="label">
<object class="GtkLabel" id="GridPositionExpanderLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Position</property>
<property name="label" translatable="yes">Position offset</property>
</object>
</child>
</object>
......@@ -1205,6 +1219,179 @@
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkExpander" id="GridManualShiftExpander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox24">
<property name="visible">True</property>
<property name="spacing">3</property>
<child>
<object class="GtkRadioButton" id="SupportGridPositionManualAxisX">
<property name="label" translatable="yes">x</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="padding">10</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="SupportGridPositionManualAxisY">
<property name="label" translatable="yes">y</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">SupportGridPositionManualAxisX</property>
</object>
<packing>
<property name="expand">False</property>
<property name="padding">10</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkVSeparator" id="vseparator7">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="GridPositionManualSelectionLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Grid item:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="SupportGridPositionManualSelector">
<property name="visible">True</property>
<property name="model">SupportGridPositionManualList</property>
<child>
<object class="GtkCellRendererText" id="SupportGridManualSelectorBase"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="SupportGridManualSelectorChange"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox28">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHScale" id="SupportGridPositionManualShiftControl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">SupportGridPositionManualAdjustment</property>
<property name="digits">2</property>
<property name="value_pos">right</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox25">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="SupportGridPositionManualResetAll">
<property name="label" translatable="yes">Reset all items</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkArrow" id="arrow1">
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="arrow_type">up</property>
<property name="shadow_type">etched-in</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="SupportGridPositionManualResetOne">
<property name="label" translatable="yes">Reset this item</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="GridManualShiftExpanderLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Manual position adjustment</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
......@@ -5655,4 +5842,9 @@ Any selected group of dimensions will be scaled accordingly.</property>
<action-widget response="0">LogWindowClose</action-widget>
</action-widgets>
</object>
<object class="GtkAdjustment" id="SupportGridPositionManualAdjustment">
<property name="lower">-100</property>
<property name="upper">100</property>
<property name="step_increment">10</property>
</object>
</interface>
src/pycam/Toolpath/Generator.py
View file @ 59cc0712
......@@ -47,7 +47,8 @@ def generate_toolpath_from_settings(model, tp_settings, callback=None):
process["material_allowance"], process["safety_height"],
process["overlap"], process["step_down"], process["engrave_offset"],
grid["distance_x"], grid["distance_y"], grid["thickness"],
grid["height"], grid["offset_x"], grid["offset_y"], backend,
grid["height"], grid["offset_x"], grid["offset_y"],
grid["adjustments_x"], grid["adjustments_y"], backend,
callback)
def generate_toolpath(model, tool_settings=None,
......@@ -100,6 +101,10 @@ def generate_toolpath(model, tool_settings=None,
@value support_grid_offset_x: shift the support grid by this value along x
@type support_grid_offset_y: float
@value support_grid_offset_y: shift the support grid by this value along y
@type support_grid_adjustments_x: list(float)
@value support_grid_adjustments_x: manual adjustment of each x-grid bar
@type support_grid_adjustments_y: list(float)
@value support_grid_adjustments_y: manual adjustment of each y-grid bar
@type calculation_backend: str | None
@value calculation_backend: any member of the CALCULATION_BACKENDS set
The default is the triangular collision detection.
......@@ -150,7 +155,9 @@ def generate_toolpath(model, tool_settings=None,
minx, maxx, miny, maxy, minz, support_grid_distance_x,
support_grid_distance_y, support_grid_thickness,
support_grid_height, offset_x=support_grid_offset_x,
offset_y=support_grid_offset_y)
offset_y=support_grid_offset_y,
support_grid_adjustments_x=support_grid_adjustments_x,
support_grid_adjustments_y=support_grid_adjustments_y)
trimesh_model += support_grid_model
# Adapt the contour_model to the engraving offset. This offset is
# considered to be part of the material_allowance.
......
src/pycam/Toolpath/SupportGrid.py
View file @ 59cc0712
......@@ -67,8 +67,8 @@ def _add_cuboid_to_model(minx, maxx, miny, maxy, minz, maxz):
model.append(t)
return model
def get_support_grid(minx, maxx, miny, maxy, z_plane, dist_x, dist_y, thickness,
height, offset_x=0.0, offset_y=0.0):
def get_support_grid_locations(minx, maxx, miny, maxy, dist_x, dist_y,
offset_x=0.0, offset_y=0.0, adjustments_x=None, adjustments_y=None):
def get_lines(center, dist, min_value, max_value):
""" generate a list of positions starting from the middle going up and
and down
......@@ -92,6 +92,19 @@ def get_support_grid(minx, maxx, miny, maxy, z_plane, dist_x, dist_y, thickness,
center_y = (maxy + miny) / 2.0 + offset_y
lines_x = get_lines(center_x, dist_x, minx, maxx)
lines_y = get_lines(center_y, dist_y, miny, maxy)
if adjustments_x:
for index in range(min(len(lines_x), len(adjustments_x))):
lines_x[index] += adjustments_x[index]
if adjustments_y:
for index in range(min(len(lines_y), len(adjustments_y))):
lines_y[index] += adjustments_y[index]
return lines_x, lines_y
def get_support_grid(minx, maxx, miny, maxy, z_plane, dist_x, dist_y, thickness,
height, offset_x=0.0, offset_y=0.0, adjustments_x=None,
adjustments_y=None):
lines_x, lines_y = get_support_grid_locations(minx, maxx, miny, maxy, dist_x,
dist_y, offset_x, offset_y, adjustments_x, adjustments_y)
# create all x grid lines
grid_model = Model()
# helper variables
......
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