From: Daid Date: Thu, 17 May 2012 07:52:38 +0000 (+0200) Subject: Add dwindle to progress bar options. Fixed indentation in fill.py X-Git-Tag: RC4~8 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cedda983e8bc8b2ddbcf9b1acd2d7ce824f22669;p=cura.git Add dwindle to progress bar options. Fixed indentation in fill.py --- diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py index 28e79b7e..7353ad10 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py @@ -1274,7 +1274,7 @@ class FillSkein: elif firstWord == '()': self.distanceFeedRate.addTagBracketedProcedure('fill') self.distanceFeedRate.addLine(line) - + def parseLine( self, lineIndex ): 'Parse a gcode line and add it to the fill skein.' line = self.lines[lineIndex] @@ -1314,7 +1314,7 @@ class FillSkein: self.gridInset = 1.2 * self.infillWidth self.gridRadius = self.infillWidth / self.infillSolidity self.gridXStepSize = 2.0 * self.gridRadius - self.offsetMultiplier = self.gridRadius + self.offsetMultiplier = self.gridRadius if self.repository.infillPatternGridHexagonal.value: self.gridXStepSize = 4.0 / 3.0 * self.gridRadius self.offsetMultiplier = 1.5 * self.gridXStepSize diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py index 4bc302a0..7c2ca547 100644 --- a/Cura/util/sliceRun.py +++ b/Cura/util/sliceRun.py @@ -18,6 +18,7 @@ sliceStepTimeFactor = { 'skirt': 19.3436040878, 'skin': 1.0, 'joris': 1.0, + 'dwindle': 1.0, 'comb': 23.7805759907, 'cool': 27.148763895, 'dimension': 90.4914340973