Merge branch 'master' of github.com:daid/Cura
commit
5ae8e44022
|
@ -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()
|
||||
|
||||
|
|
|
@ -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('<I', f.read(4))[0]
|
||||
for idx in xrange(0, faceCount):
|
||||
data = struct.unpack("<ffffffffffffH", f.read(50))
|
||||
|
|
Loading…
Reference in New Issue