Skip to content

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

added labels for the scale factor and the unit control 

added basic support for multiple toolpaths


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@174 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent 22094151
Show whitespace changes
Inline Side-by-side
Showing with 370 additions and 53 deletions
pycam/Gui/Project.py
View file @ e8367461
......@@ -307,9 +307,8 @@ class ProjectGui:
model_file_chooser.add_filter(filter)
model_file_chooser.set_filter(filter)
self.model = None
self.toolpath = None
self.toolpath = GuiCommon.ToolPathList()
self.physics = None
self.cutter = None
# add some dummies - to be implemented later ...
self.settings.add_item("model", lambda: getattr(self, "model"))
self.settings.add_item("toolpath", lambda: getattr(self, "toolpath"))
......@@ -317,7 +316,7 @@ class ProjectGui:
# TODO: replace hard-coded scale
self.settings.add_item("scale", lambda: 0.9/getattr(getattr(self, "model"), "maxsize")())
# create the unit field (the default content can't be defined via glade)
scale_box = self.gui.get_object("scale_box")
scale_box = self.gui.get_object("unit_box")
unit_field = gtk.combo_box_new_text()
unit_field.append_text("mm")
unit_field.append_text("inch")
......@@ -325,7 +324,7 @@ class ProjectGui:
unit_field.show()
scale_box.add(unit_field)
# move it to the top
scale_box.reorder_child(unit_field, 0)
scale_box.reorder_child(unit_field, 1)
def set_unit(text):
unit_field.set_active((text == "mm") and 0 or 1)
self.settings.add_item("unit", unit_field.get_active_text, set_unit)
......@@ -457,6 +456,12 @@ class ProjectGui:
self.gui.get_object("ProgressCancelButton").connect("clicked", self.cancel_progress)
# make sure that the toolpath settings are consistent
self.disable_invalid_toolpath_settings()
self.gui.get_object("toolpath_visible").connect("toggled", self.toolpath_table_event)
# speed and feedrate controls
speed_control = self.gui.get_object("SpeedControl")
self.settings.add_item("speed", speed_control.get_value, speed_control.set_value)
feedrate_control = self.gui.get_object("FeedrateControl")
self.settings.add_item("feedrate", feedrate_control.get_value, feedrate_control.set_value)
if not self.no_dialog:
self.window.show()
......@@ -489,9 +494,9 @@ class ProjectGui:
if self.view3d and self.view3d.is_visible and not self.no_dialog:
self.view3d.paint()
def update_physics(self):
def update_physics(self, cutter):
if self.settings.get("enable_ode"):
self.physics = GuiCommon.generate_physics(self.settings, self.cutter, self.physics)
self.physics = GuiCommon.generate_physics(self.settings, cutter, self.physics)
else:
self.physics = None
......@@ -522,6 +527,7 @@ class ProjectGui:
self.gui.get_object("MaterialAllowanceControl").set_sensitive(self.settings.get("enable_ode"))
# toolpath table
self.toolpath_table = self.gui.get_object("ToolPathTable")
self.toolpath_model = self.gui.get_object("ToolPathListModel")
@gui_activity_guard
def toggle_3d_view(self, widget=None, value=None):
......@@ -736,12 +742,34 @@ class ProjectGui:
if section in config_list:
self.processing_config_selection.set_active(config_list.index(section))
@gui_activity_guard
def toolpath_table_event(self, widget, path):
if isinstance(widget, gtk.CellRendererToggle):
try:
path = int(path)
except ValueError:
path = None
if (not path is None) and (path < len(self.toolpath)):
self.toolpath[path].visible = not self.toolpath[path].visible
# hide/show toolpaths according to the new setting
self.update_view()
self.update_toolpath_table()
def update_toolpath_table(self):
# show or hide the "toolpath" tab
toolpath_tab = self.gui.get_object("ToolPathTab")
if self.toolpath is None:
toolpath_tab.hide()
else:
toolpath_tab.show()
# update the TreeModel data
self.toolpath_model.clear()
# columns: name, visible, drill_size, drill_id, allowance, speed, feedrate
for tp in self.toolpath:
items = (tp.name, tp.visible, tp.drill_size,
tp.drill_id, tp.material_allowance, tp.speed, tp.feedrate)
print items
self.toolpath_model.append(items)
#print dir(self.toolpath_table)
@gui_activity_guard
......@@ -815,15 +843,15 @@ class ProjectGui:
# Otherwise some collisions are not detected.
cutter_height = 4 * max((self.settings.get("maxz") - self.settings.get("minz")), (self.model.maxz - self.model.minz))
if cuttername == "SphericalCutter":
self.cutter = pycam.Cutters.SphericalCutter(radius, height=cutter_height)
cutter = pycam.Cutters.SphericalCutter(radius, height=cutter_height)
elif cuttername == "CylindricalCutter":
self.cutter = pycam.Cutters.CylindricalCutter(radius, height=cutter_height)
cutter = pycam.Cutters.CylindricalCutter(radius, height=cutter_height)
elif cuttername == "ToroidalCutter":
toroid = self.settings.get("torus_radius")
self.cutter = pycam.Cutters.ToroidalCutter(radius, toroid, height=cutter_height)
cutter = pycam.Cutters.ToroidalCutter(radius, toroid, height=cutter_height)
self.update_progress_bar("Generating collision model")
self.update_physics()
self.update_physics(cutter)
# this offset allows to cut a model with a minimal boundary box correctly
offset = radius/2
......@@ -846,15 +874,15 @@ class ProjectGui:
self.option = pycam.PathProcessors.PathAccumulator(zigzag=True)
else:
self.option = None
self.pathgenerator = pycam.PathGenerators.DropCutter(self.cutter,
self.pathgenerator = pycam.PathGenerators.DropCutter(cutter,
self.model, self.option, physics=self.physics,
safety_height=self.settings.get("safety_height"))
dx = x_shift
dy = y_shift
if direction == "x":
self.toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, dx, dy, 0, draw_callback)
toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, dx, dy, 0, draw_callback)
elif direction == "y":
self.toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, dy, dx, 1, draw_callback)
toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, dy, dx, 1, draw_callback)
elif pathgenerator == "PushCutter":
if pathprocessor == "PathAccumulator":
......@@ -869,7 +897,7 @@ class ProjectGui:
self.option = pycam.PathProcessors.ContourCutter()
else:
self.option = None
self.pathgenerator = pycam.PathGenerators.PushCutter(self.cutter,
self.pathgenerator = pycam.PathGenerators.PushCutter(cutter,
self.model, self.option, physics=self.physics)
if pathprocessor == "ContourCutter":
dx = x_shift
......@@ -881,12 +909,17 @@ class ProjectGui:
else:
dz = utils.INFINITE
if direction == "x":
self.toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, 0, dy, dz, draw_callback)
toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, 0, dy, dz, draw_callback)
elif direction == "y":
self.toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, dy, 0, dz, draw_callback)
toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, dy, 0, dz, draw_callback)
elif direction == "xy":
self.toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, dy, dy, dz, draw_callback)
toolpath = self.pathgenerator.GenerateToolPath(minx, maxx, miny, maxy, minz, maxz, dy, dy, dz, draw_callback)
print "Time elapsed: %f" % (time.time() - start_time)
self.toolpath.add_toolpath(toolpath,
self.processing_config_selection.get_active_text(), cutter,
self.settings.get("speed"),
self.settings.get("feedrate"),
self.settings.get("material_allowance"))
self.update_toolpath_table()
self.update_view()
......@@ -941,7 +974,7 @@ class ProjectGui:
def save_toolpath(self, widget=None, data=None):
if not self.toolpath:
return
offset = float(self.gui.get_object("ToolRadiusControl").get_value())/2
offset = float(self.settings.get("tool_radius"))/2
minx = float(self.settings.get("minx"))-offset
maxx = float(self.settings.get("maxx"))+offset
miny = float(self.settings.get("miny"))-offset
......@@ -966,10 +999,10 @@ class ProjectGui:
else:
start_offset = 0.25
exporter = pycam.Exporters.SimpleGCodeExporter.ExportPathList(
filename, self.toolpath, self.settings.get("unit"),
filename, self.toolpath[0].get_path, self.settings.get("unit"),
minx, miny, maxz + start_offset,
self.gui.get_object("FeedrateControl").get_value(),
self.gui.get_object("SpeedControl").get_value(),
self.settings.get("feedrate"),
self.settings.get("speed"),
safety_height=self.settings.get("safety_height"))
fi.close()
if self.no_dialog:
......
pycam/Gui/common.py
View file @ e8367461
......@@ -2,6 +2,8 @@ import OpenGL.GL as GL
import OpenGL.GLUT as GLUT
# "ode" is imported later, if required
#import ode_objects
import random
import gtk
MODEL_TRANSFORMATIONS = {
......@@ -138,7 +140,9 @@ def draw_complete_model_view(settings):
settings.get("model").to_OpenGL()
# draw the toolpath
if settings.get("show_toolpath"):
draw_toolpath(settings.get("toolpath"))
for toolpath_obj in settings.get("toolpath"):
if toolpath_obj.visible:
draw_toolpath(toolpath_obj.get_path())
# draw the drill
if settings.get("show_drill_progress"):
draw_cutter(settings.get("cutter"))
......@@ -202,3 +206,52 @@ def is_ode_available():
except ImportError:
return False
class ToolPathList(list):
def add_toolpath(self, toolpath, name, cutter, speed, feedrate, material_allowance):
drill_id = self._get_drill_id(cutter)
self.append(ToolPathInfo(toolpath, name, drill_id, cutter, speed, feedrate, material_allowance))
def _get_drill_id(self, cutter):
used_ids = []
# check if a drill with the same dimensions was used before
for tp in self:
if tp.drill == cutter:
return tp.drill_id
else:
used_ids.append(tp.drill_id)
# find the smallest unused drill id
index = 1
while index in used_ids:
index += 1
return index
class ToolPathInfo:
def __init__(self, toolpath, name, drill_id, cutter, speed, feedrate, material_allowance):
self.toolpath = toolpath
self.name = name
self.visible = True
self.drill_id = drill_id
self.drill = cutter
self.drill_size = cutter.radius
self.speed = speed
self.feedrate = feedrate
self.material_allowance = material_allowance
self.color = None
# generate random color
self.set_color()
def get_path(self):
return self.toolpath
def set_color(self, color=None):
color_max = 65535
if color is None:
self.color = gtk.gdk.Color(random.randint(0, color_max),
random.randint(0, color_max), random.randint(0, color_max))
else:
self.color = color
pycam/Gui/gtk-interface/pycam-project.ui
View file @ e8367461
......@@ -2,6 +2,50 @@
<interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy project-wide -->
<object class="GtkListStore" id="ProcessingConfigs">
<columns>
<!-- column-name Name -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="ToolPathListModel">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
<!-- column-name visible -->
<column type="gboolean"/>
<!-- column-name drill_size -->
<column type="gfloat"/>
<!-- column-name drill_id -->
<column type="guint"/>
<!-- column-name allowance -->
<column type="gfloat"/>
<!-- column-name speed -->
<column type="gfloat"/>
<!-- column-name feedrate -->
<column type="gfloat"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Rough</col>
<col id="1">True</col>
<col id="2">12</col>
<col id="3">0</col>
<col id="4">0</col>
<col id="5">0</col>
<col id="6">0</col>
</row>
<row>
<col id="0" translatable="yes">test</col>
<col id="1">False</col>
<col id="2">0</col>
<col id="3">0</col>
<col id="4">0</col>
<col id="5">0</col>
<col id="6">0</col>
</row>
</data>
</object>
<object class="GtkWindow" id="ProjectWindow">
<property name="title" translatable="yes">PyCAM Settings</property>
<property name="destroy_with_parent">True</property>
......@@ -72,7 +116,7 @@
<property name="left_padding">12</property>
<child>
<object class="GtkButton" id="SaveModel">
<property name="label" translatable="yes">To File</property>
<property name="label" translatable="yes">Save to File</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
......@@ -411,18 +455,52 @@
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkHBox" id="unit_box">
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="UnitLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Unit:</property>
</object>
<packing>
<property name="fill">False</property>
<property name="padding">3</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator3">
<property name="visible">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="padding">10</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="ScaleFactorLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Factor:</property>
</object>
<packing>
<property name="fill">False</property>
<property name="padding">3</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="Scale factor">
<property name="visible">True</property>
......@@ -436,6 +514,11 @@
</object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
......@@ -477,6 +560,8 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="padding">4</property>
<property name="position">0</property>
</packing>
</child>
......@@ -634,6 +719,8 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="padding">4</property>
<property name="position">2</property>
</packing>
</child>
......@@ -891,6 +978,7 @@
</child>
</object>
<packing>
<property name="padding">5</property>
<property name="position">4</property>
</packing>
</child>
......@@ -2099,20 +2187,164 @@
<child>
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="top_padding">2</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<child>
<object class="GtkTreeView" id="ToolPathTable">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">GeneratedToolPaths</property>
<property name="model">ToolPathListModel</property>
<property name="hadjustment">adjustment1</property>
<property name="vadjustment">adjustment2</property>
<property name="search_column">0</property>
<child>
<object class="GtkTreeViewColumn" id="Visibility">
<property name="title">Visible</property>
<child>
<object class="GtkCellRendererToggle" id="toolpath_visible"/>
<attributes>
<attribute name="active">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="Operation">
<property name="title">Operation</property>
<child>
<object class="GtkCellRendererText" id="name"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="Drill">
<property name="title">Drill</property>
<child>
<object class="GtkCellRendererText" id="drill_id"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="drill_size"/>
<attributes>
<attribute name="text">2</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="Speed">
<property name="title">Speed</property>
<child>
<object class="GtkCellRendererText" id="speed-speed"/>
<attributes>
<attribute name="text">5</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="speed-feedrate"/>
<attributes>
<attribute name="text">6</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="Material Allowance">
<property name="title">Material Allowance</property>
<child>
<object class="GtkCellRendererText" id="allowance"/>
<attributes>
<attribute name="text">6</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
<property name="yscale">0</property>
<property name="left_padding">4</property>
<property name="right_padding">4</property>
<child>
<object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkButton" id="toolpath_up">
<property name="label">gtk-go-up</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolpath_delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolpath_down">
<property name="label">gtk-go-down</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
......@@ -2145,6 +2377,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="gtk_main_quit"/>
</object>
<packing>
<property name="expand">False</property>
......@@ -2421,12 +2654,6 @@
<property name="page_increment">10</property>
<property name="page_size">10</property>
</object>
<object class="GtkListStore" id="ProcessingConfigs">
<columns>
<!-- column-name Name -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkAdjustment" id="MaterialAllowanceValue">
<property name="upper">100</property>
<property name="step_increment">0.10000000000000001</property>
......@@ -2452,12 +2679,16 @@
<property name="page_increment">10</property>
<property name="page_size">10</property>
</object>
<object class="GtkTreeStore" id="ToolPathTableStore">
<columns>
<!-- column-name template -->
<column type="gchararray"/>
<!-- column-name drill_id -->
<column type="guint"/>
</columns>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
<property name="page_size">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
<property name="page_size">10</property>
</object>
</interface>
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