Commit 7e219c5d authored by sumpfralle's avatar sumpfralle

fixed imports


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@357 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent ac3dd85c
...@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License ...@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with PyCAM. If not, see <http://www.gnu.org/licenses/>. along with PyCAM. If not, see <http://www.gnu.org/licenses/>.
""" """
import pycam.PathGenerators from pycam.PathGenerators import DropCutter, PushCutter
import pycam.PathProcessors import pycam.PathProcessors
import pycam.Cutters import pycam.Cutters
import pycam.Toolpath.SupportGrid import pycam.Toolpath.SupportGrid
...@@ -142,8 +142,7 @@ def _get_pathgenerator_instance(model, cutter, pathgenerator, pathprocessor, ...@@ -142,8 +142,7 @@ def _get_pathgenerator_instance(model, cutter, pathgenerator, pathprocessor,
processor = pycam.PathProcessors.PathAccumulator() processor = pycam.PathProcessors.PathAccumulator()
else: else:
return "Invalid postprocessor (%s) for 'DropCutter': only 'ZigZagCutter' or 'PathAccumulator' are allowed" % str(pathprocessor) return "Invalid postprocessor (%s) for 'DropCutter': only 'ZigZagCutter' or 'PathAccumulator' are allowed" % str(pathprocessor)
return pycam.PathGenerators.DropCutter(cutter, return DropCutter.DropCutter(cutter, model, processor, physics=physics,
model, processor, physics=physics,
safety_height=safety_height) safety_height=safety_height)
elif pathgenerator == "PushCutter": elif pathgenerator == "PushCutter":
if pathprocessor == "PathAccumulator": if pathprocessor == "PathAccumulator":
...@@ -158,8 +157,7 @@ def _get_pathgenerator_instance(model, cutter, pathgenerator, pathprocessor, ...@@ -158,8 +157,7 @@ def _get_pathgenerator_instance(model, cutter, pathgenerator, pathprocessor,
processor = pycam.PathProcessors.ContourCutter() processor = pycam.PathProcessors.ContourCutter()
else: else:
return "Invalid postprocessor (%s) for 'PushCutter' - it should be one of these: %s" % (processor, PATH_POSTPROCESSORS) return "Invalid postprocessor (%s) for 'PushCutter' - it should be one of these: %s" % (processor, PATH_POSTPROCESSORS)
return pycam.PathGenerators.PushCutter(cutter, return PushCutter.PushCutter(cutter, model, processor, physics=physics)
model, processor, physics=physics)
else: else:
return "Invalid path generator (%s): not one of %s" % (pathgenerator, PATH_GENERATORS) return "Invalid path generator (%s): not one of %s" % (pathgenerator, PATH_GENERATORS)
......
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