fix filename when saving gcode

In the proposed filename, the last character was always missing.
Replace some similar string slicing/rfind with splitting.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index feee9386a60fb46cb853073e678ec3345b4ad023..883dd841bd00ba579df263df822b2f86dea9e23a 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -151,7 +151,7 @@ class SceneView(openglGui.glGuiPanel):
                gcodeFilename = None
                if len(filenames) == 1:
                        filename = filenames[0]
-                       ext = filename[filename.rfind('.'):].lower()
+                       ext = os.path.splitext(filename)[1]
                        if ext == '.g' or ext == '.gcode':
                                gcodeFilename = filename
                                mainWindow.addToModelMRU(filename)
@@ -170,7 +170,7 @@ class SceneView(openglGui.glGuiPanel):
                                        # directory: queue all included files and directories
                                        filenames.extend(os.path.join(filename, f) for f in os.listdir(filename))
                                else:
-                                       ext = filename[filename.rfind('.'):].lower()
+                                       ext = os.path.splitext(filename)[1]
                                        if ext == '.ini':
                                                profile.loadProfile(filename)
                                                mainWindow.addToProfileMRU(filename)
@@ -255,8 +255,7 @@ class SceneView(openglGui.glGuiPanel):
 
        def showSaveGCode(self):
                dlg=wx.FileDialog(self, _("Save toolpath"), os.path.dirname(profile.getPreference('lastFile')), style=wx.FD_SAVE)
-               filename = self._scene._objectList[0].getName()
-               filename = filename[:filename.rfind('.')] + '.gcode'
+               filename = self._scene._objectList[0].getName() + '.gcode'
                dlg.SetFilename(filename)
                dlg.SetWildcard('Toolpath (*.gcode)|*.gcode;*.g')
                if dlg.ShowModal() != wx.ID_OK:

diff --git a/Cura/util/mesh.py b/Cura/util/mesh.py
index 7067ed7733ff6e0b3c6a0f041f64a5876f95e714..eacc7076c3984363bf4d6eced1f74402c640cd6a 100644 (file)
--- a/Cura/util/mesh.py
+++ b/Cura/util/mesh.py
@@ -16,7 +16,7 @@ class printableObject(object):
                else:
                        self._name = os.path.basename(originFilename)
                if '.' in self._name:
-                       self._name = self._name[0:self._name.rfind('.')]
+                       self._name = os.path.splitext(self._name)[0]
                self._meshList = []
                self._position = numpy.array([0.0, 0.0])
                self._matrix = numpy.matrix([[1,0,0],[0,1,0],[0,0,1]], numpy.float64)

diff --git a/Cura/util/meshLoader.py b/Cura/util/meshLoader.py
index ff550b8329e0d138b1041ad2e2993072ecaf89e0..e85b9190e701f353ab7427468a88d4aaa2bf2017 100644 (file)
--- a/Cura/util/meshLoader.py
+++ b/Cura/util/meshLoader.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
 
+import os
+
 from Cura.util.meshLoaders import stl
 from Cura.util.meshLoaders import obj
 from Cura.util.meshLoaders import dae
@@ -27,7 +29,7 @@ def saveWildcardFilter():
 # DAE files are a mess, but they can contain scenes of objects as well as grouped meshes
 
 def loadMeshes(filename):
-       ext = filename[filename.rfind('.'):].lower()
+       ext = os.path.splitext(filename)[1].lower()
        if ext == '.stl':
                return stl.loadScene(filename)
        if ext == '.obj':
@@ -40,7 +42,7 @@ def loadMeshes(filename):
        return []
 
 def saveMeshes(filename, objects):
-       ext = filename[filename.rfind('.'):].lower()
+       ext = os.path.splitext(filename)[1].lower()
        if ext == '.stl':
                stl.saveScene(filename, objects)
                return