q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix when there is no object loaded, remove debug print.

master
Daid 2012-09-25 12:24:47 +02:00
parent 183304d975
commit edba844794
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
View File

@ -242,7 +242,6 @@ class DimensionSkein:
distance -= 10.0 distance -= 10.0
e = self.getExtrusionDistanceString(10.0, splitLine) e = self.getExtrusionDistanceString(10.0, splitLine)
extra += self.distanceFeedRate.getLinearGcodeMovementWithFeedRate(self.feedRateMinute, self.oldLocation.dropAxis(), self.oldLocation.z) + e + '\n' extra += self.distanceFeedRate.getLinearGcodeMovementWithFeedRate(self.feedRateMinute, self.oldLocation.dropAxis(), self.oldLocation.z) + e + '\n'
print extra, line, distance
line = extra + line line = extra + line
self.oldLocation = location self.oldLocation = location
else: else:

2
Cura/gui/preview3d.py
View File

@ -429,6 +429,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
self.objColor[3] = profile.getPreferenceColour('model_colour3') self.objColor[3] = profile.getPreferenceColour('model_colour3')
def OnMouseMotion(self,e): def OnMouseMotion(self,e):
if self.parent.objectsMaxV != None:
size = (self.parent.objectsMaxV - self.parent.objectsMinV) size = (self.parent.objectsMaxV - self.parent.objectsMinV)
sizeXY = math.sqrt((size[0] * size[0]) + (size[1] * size[1])) sizeXY = math.sqrt((size[0] * size[0]) + (size[1] * size[1]))
@ -701,6 +702,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
glTranslate(self.parent.machineCenter.x, self.parent.machineCenter.y, 0) glTranslate(self.parent.machineCenter.x, self.parent.machineCenter.y, 0)
#Draw the rotate circle #Draw the rotate circle
if self.parent.objectsMaxV != None:
glDisable(GL_LIGHTING) glDisable(GL_LIGHTING)
glDisable(GL_CULL_FACE) glDisable(GL_CULL_FACE)
glEnable(GL_BLEND) glEnable(GL_BLEND)