chiark / gitweb /
Fix typo
[cura.git] / Cura / cura.py
index 542970227be462c8a8db2ec957a65d6a920b4694..c631a02ff3255bb598daab70bd3574c12ad190ce 100644 (file)
@@ -24,13 +24,13 @@ def main():
        parser.add_option("-s", "--slice", action="store_true", dest="slice",
                help="Slice the given files instead of opening them in Cura")
        parser.add_option("-o", "--output", action="store", type="string", dest="output",
-               help="Directory or file to write sliced files to")
+               help="path to write sliced file to")
 
        (options, args) = parser.parse_args()
 
        profile.loadPreferences(profile.getPreferencePath())
        if options.profile is not None:
-               profile.loadProfileFromString(options.profile)
+               profile.setProfileFromString(options.profile)
        elif options.profileini is not None:
                profile.loadProfile(options.profileini)
        else:
@@ -45,15 +45,17 @@ def main():
                from Cura.util import meshLoader
                import shutil
 
-               def commandlineProgessCallback(progress, ready):
+               def commandlineProgressCallback(progress, ready):
                        if progress >= 0 and not ready:
                                print 'Preparing: %d%%' % (progress * 100)
                scene = objectScene.Scene()
-               slicer = sliceEngine.Slicer(commandlineProgessCallback)
+               scene.updateMachineDimensions()
+               slicer = sliceEngine.Slicer(commandlineProgressCallback)
                for m in meshLoader.loadMeshes(args[0]):
                        scene.add(m)
                slicer.runSlicer(scene)
                slicer.wait()
+               profile.replaceGCodeTagsFromSlicer(slicer.getGCodeFilename(), slicer)
 
                if options.output:
                        shutil.copyfile(slicer.getGCodeFilename(), options.output)