Browse files

a few changes in fill lines spacing

  • Loading branch information...
1 parent 76986f1 commit 4e20ca155e8b3bc2c8a0860fd44d4e9cbd510099 @ahmetcemturan committed Sep 11, 2012
Showing with 6 additions and 4 deletions.
  1. +6 −4 skeinforge_application/skeinforge_plugins/craft_plugins/fill.py
View
10 skeinforge_application/skeinforge_plugins/craft_plugins/fill.py
@@ -881,7 +881,9 @@ def addFill(self, layerIndex):
extraShells = self.repository.extraShellsBase.value
if rotatedLayer.rotation != None:
extraShells = extraShellsBridgeLayer
- self.fillInset = self.infillWidth * self.repository.infillPerimeterOverlap.value * 0.9 #*euclidean.globalQuarterPi # self.scaledBridgeWidthMultiplier * self.repository.infillPerimeterOverlap.value # self.bridgeWidthMultiplier
+# self.fillInset = self.infillWidth * self.repository.infillPerimeterOverlap.value * 0.9 #*euclidean.globalQuarterPi # self.scaledBridgeWidthMultiplier * self.repository.infillPerimeterOverlap.value # self.bridgeWidthMultiplier
+# self.fillInset = self.layerHeight * self.repository.infillPerimeterOverlap.value * euclidean.globalQuarterPi #*euclidean.globalQuarterPi # self.scaledBridgeWidthMultiplier * self.repository.infillPerimeterOverlap.value # self.bridgeWidthMultiplier
+ self.fillInset = self.repository.infillPerimeterOverlap.value * (self.layerHeight * euclidean.globalQuarterPi + (self.edgeWidth-self.layerHeight))
self.distanceFeedRate.addLine('(<bridgeRotation> %s )' % layerRotation)
self.distanceFeedRate.addLine('(<rotation> %s )' % layerRotation)
# aroundInset = 0.24321 * self.infillWidth
@@ -1263,8 +1265,8 @@ def parseInitialization(self):
elif firstWord == '(<crafting>)':
self.distanceFeedRate.addLine(line)
return
- elif firstWord == '(<infillWidth>':
- self.infillWidth = float(splitLine[1])
+# elif firstWord == '(<infillWidth>':
+# self.infillWidth = float(splitLine[1])
# self.infillWidth = self.repository.infillWidthOverThickness.value * euclidean.globalQuarterPi * self.edgeWidth
elif firstWord == '(<layerHeight>':
self.layerHeight = float(splitLine[1])
@@ -1285,7 +1287,7 @@ def parseInitialization(self):
elif firstWord == '(<edgeWidth>':
self.edgeWidth = float(splitLine[1])
threadSequenceString = ' '.join( self.threadSequence )
- self.infillWidth = self.repository.infillWidthOverThickness.value * self.edgeWidth * euclidean.globalQuarterPi
+ self.infillWidth = self.repository.infillWidthOverThickness.value * (self.layerHeight * euclidean.globalQuarterPi + (self.edgeWidth-self.layerHeight))
self.distanceFeedRate.addTagBracketedLine('threadSequenceString', threadSequenceString )
elif firstWord == '(</extruderInitialization>)':
self.distanceFeedRate.addTagBracketedProcedure('fill')

0 comments on commit 4e20ca1

Please sign in to comment.