From 57438e7b50de69df3b93d0b02585088c31af4bda Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 13 Jul 2012 23:27:57 +1000 Subject: [PATCH 1/2] Fix typo in description of ScaleToFit button --- Cura/gui/preview3d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index 887c11baeb..9adf007305 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -105,7 +105,7 @@ class previewPanel(wx.Panel): self.scale = wx.TextCtrl(self.toolbar2, -1, profile.getProfileSetting('model_scale'), size=(21*2,21)) self.toolbar2.AddControl(self.scale) self.scale.Bind(wx.EVT_TEXT, self.OnScale) - self.scaleMax = toolbarUtil.NormalButton(self.toolbar2, self.OnScaleMax, 'object-max-size.png', 'Scale object to fix machine size') + self.scaleMax = toolbarUtil.NormalButton(self.toolbar2, self.OnScaleMax, 'object-max-size.png', 'Scale object to fit machine size') self.toolbar2.AddSeparator() From 45a361c1ca6a82e10238d8b9259994256b83ec2c Mon Sep 17 00:00:00 2001 From: Martin Renold Date: Sun, 15 Jul 2012 09:47:50 +0200 Subject: [PATCH 2/2] Fix loading binary stl --- Cura/util/stl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cura/util/stl.py b/Cura/util/stl.py index f157ce3197..72b342541f 100644 --- a/Cura/util/stl.py +++ b/Cura/util/stl.py @@ -11,8 +11,8 @@ class stlModel(mesh.mesh): f = open(filename, "rb") if f.read(5).lower() == "solid": self._loadAscii(f) - if len(self.faces) < 1: - f.seek(6, os.SEEK_SET) + if not self.faces: + f.seek(5, os.SEEK_SET) self._loadBinary(f) else: self._loadBinary(f) @@ -39,7 +39,7 @@ class stlModel(mesh.mesh): def _loadBinary(self, f): #Skip the header - f.read(80-6) + f.read(80-5) faceCount = struct.unpack('