Permalink
Browse files

???

  • Loading branch information...
1 parent ef89064 commit f1b35facdcdd2c1976ce11aaf9fd07a8e1fc978e @ahmetcemturan committed Aug 26, 2011
Showing with 718 additions and 737 deletions.
  1. +2 −2 documentation/skeinforge_application.skeinforge_plugins.craft_plugins.fill.html
  2. +4 −0 fabmetheus_utilities/gcodec.py
  3. +1 −1 skeinforge_application/sfact_profiles/profiles/extrusion.csv
  4. +1 −1 skeinforge_application/skeinforge_plugins/analyze_plugins/statistic.py
  5. +3 −3 skeinforge_application/skeinforge_plugins/craft_plugins/Obsolete/feed.py
  6. +1 −1 skeinforge_application/skeinforge_plugins/craft_plugins/Obsolete/tower.py
  7. +1 −1 skeinforge_application/skeinforge_plugins/craft_plugins/carve.py
  8. +2 −2 skeinforge_application/skeinforge_plugins/craft_plugins/clip.py
  9. +1 −1 skeinforge_application/skeinforge_plugins/craft_plugins/comb.py
  10. +289 −287 skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
  11. +330 −334 skeinforge_application/skeinforge_plugins/craft_plugins/export.py
  12. +32 −45 skeinforge_application/skeinforge_plugins/craft_plugins/fill.py
  13. +9 −7 skeinforge_application/skeinforge_plugins/craft_plugins/inset.py
  14. +1 −1 skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py
  15. +1 −1 skeinforge_application/skeinforge_plugins/craft_plugins/lash.py
  16. +4 −4 skeinforge_application/skeinforge_plugins/craft_plugins/limit.py
  17. +15 −25 skeinforge_application/skeinforge_plugins/craft_plugins/raft.py
  18. +4 −4 skeinforge_application/skeinforge_plugins/craft_plugins/skin.py
  19. +1 −1 skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py
  20. +15 −15 skeinforge_application/skeinforge_plugins/craft_plugins/speed.py
  21. +1 −1 skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py
@@ -400,8 +400,8 @@
<tr><td bgcolor="#eeaa77"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
<td width="100%"><dl><dt><a name="-addAroundGridPoint"><strong>addAroundGridPoint</strong></a>(arounds, gridPoint, gridPointInsetX, gridPointInsetY, gridPoints, gridSearchRadius, isBothOrNone, isDoubleJunction, isJunctionWide, paths, pixelTable, width)</dt><dd><tt>Add&nbsp;the&nbsp;path&nbsp;around&nbsp;the&nbsp;grid&nbsp;point.</tt></dd></dl>
- <dl><dt><a name="-addLoop"><strong>addLoop</strong></a>(infillWidth, infillPaths, loop, rotationPlaneAngle)</dt><dd><tt>Add&nbsp;simplified&nbsp;path&nbsp;to&nbsp;fill.</tt></dd></dl>
- <dl><dt><a name="-addPath"><strong>addPath</strong></a>(infillWidth, infillPaths, path, rotationPlaneAngle)</dt><dd><tt>Add&nbsp;simplified&nbsp;path&nbsp;to&nbsp;fill.</tt></dd></dl>
+ <dl><dt><a name="-addLoop"><strong>addLoop</strong></a>(infillSpacing, infillPaths, loop, rotationPlaneAngle)</dt><dd><tt>Add&nbsp;simplified&nbsp;path&nbsp;to&nbsp;fill.</tt></dd></dl>
+ <dl><dt><a name="-addPath"><strong>addPath</strong></a>(infillSpacing, infillPaths, path, rotationPlaneAngle)</dt><dd><tt>Add&nbsp;simplified&nbsp;path&nbsp;to&nbsp;fill.</tt></dd></dl>
<dl><dt><a name="-addPathIndexFirstSegment"><strong>addPathIndexFirstSegment</strong></a>(gridPixel, pathIndexTable, pixelTable, segmentFirstPixel)</dt><dd><tt>Add&nbsp;the&nbsp;path&nbsp;index&nbsp;of&nbsp;the&nbsp;closest&nbsp;segment&nbsp;found&nbsp;toward&nbsp;the&nbsp;second&nbsp;segment.</tt></dd></dl>
<dl><dt><a name="-addPathIndexSecondSegment"><strong>addPathIndexSecondSegment</strong></a>(gridPixel, pathIndexTable, pixelTable, segmentSecondPixel)</dt><dd><tt>Add&nbsp;the&nbsp;path&nbsp;index&nbsp;of&nbsp;the&nbsp;closest&nbsp;segment&nbsp;found&nbsp;toward&nbsp;the&nbsp;second&nbsp;segment.</tt></dd></dl>
<dl><dt><a name="-addPointOnPath"><strong>addPointOnPath</strong></a>(path, pathIndex, pixelTable, point, pointIndex, width)</dt><dd><tt>Add&nbsp;a&nbsp;point&nbsp;to&nbsp;a&nbsp;path&nbsp;and&nbsp;the&nbsp;pixel&nbsp;table.</tt></dd></dl>
@@ -384,6 +384,10 @@ def getLineWithZ(self, line, splitLine, z):
"""Get the line with a z."""
return getLineWithValueString('Z', line, splitLine, self.getRounded(z))
+ def getLineWithE(self, line, splitLine, e):
+ """Get the line with a e."""
+ return getLineWithValueString('E', line, splitLine, self.getRounded(e))
+
def getRounded(self, number):
"""Get number rounded to the number of carried decimal places as a string."""
return euclidean.getRoundedToPlacesString(self.decimalPlacesCarried, number)
@@ -1,4 +1,4 @@
Format is tab separated extrusion settings.
_Name Value
WindowPosition 0+400
-Profile Selection: PLA
+Profile Selection: DavidEV
@@ -249,7 +249,7 @@ def getCraftedGcode(self, gcodeText, repository):
return self.output.getvalue()
def getLocationSetFeedRateToSplitLine( self, splitLine ):
- """Get location ans set feed rate to the plsit line."""
+ """Get location ans set feed rate to the split line."""
location = gcodec.getLocationFromSplitLine(self.oldLocation, splitLine)
indexOfF = gcodec.getIndexOfStartingWithSecond( "F", splitLine )
if indexOfF > 0:
@@ -92,7 +92,7 @@ def __init__(self):
self.activateFeed = settings.BooleanSetting().getFromValue('Activate Feed:', self, True)
self.mainFeed = settings.FloatSpin().getFromValue(2.0, 'Feed Rate (mm/s):', self, 50.0, 16.0)
self.maximumZDrillFeedRatePerSecond = settings.FloatSpin().getFromValue(0.02, 'Maximum Z Drill Feed Rate (mm/s):', self, 0.5, 0.1)
- self.travelFeedRatePerSecond = settings.FloatSpin().getFromValue(2.0, 'Travel Feed Rate (mm/s):', self, 50.0, 16.0)
+ self.travelFeedRate = settings.FloatSpin().getFromValue(2.0, 'Travel Feed Rate (mm/s):', self, 50.0, 16.0)
self.executeTitle = 'Feed'
def execute(self):
@@ -117,7 +117,7 @@ def getCraftedGcode(self, gcodeText, repository):
"""Parse gcode text and store the feed gcode."""
self.repository = repository
self.mainFeed = repository.mainFeed.value
- self.travelFeedRateMinute = 60.0 * self.repository.travelFeedRatePerSecond.value
+ self.travelFeedRateMinute = 60.0 * self.repository.travelFeedRate.value
self.lines = archive.getTextLines(gcodeText)
self.parseInitialization()
for line in self.lines[self.lineIndex :]:
@@ -147,7 +147,7 @@ def parseInitialization(self):
self.absolutePerimeterWidth = abs(float(splitLine[1]))
self.distanceFeedRate.addTagBracketedLine('maximumZDrillFeedRatePerSecond', self.repository.maximumZDrillFeedRatePerSecond.value)
self.distanceFeedRate.addTagBracketedLine('operatingFeedRatePerSecond', self.mainFeed)
- self.distanceFeedRate.addTagBracketedLine('travelFeedRatePerSecond', self.repository.travelFeedRatePerSecond.value)
+ self.distanceFeedRate.addTagBracketedLine('travelFeedRate', self.repository.travelFeedRate.value)
self.distanceFeedRate.addLine(line)
def parseLine(self, line):
@@ -318,7 +318,7 @@ def parseInitialization(self):
self.minimumBelow = 0.1 * float(splitLine[1])
elif firstWord == '(<extrusionWidth>':
self.extrusionWidth = float(splitLine[1])
- elif firstWord == '(<travelFeedRatePerSecond>':
+ elif firstWord == '(<travelFeedRate>':
self.travelFeedRateMinute = 60.0 * float(splitLine[1])
self.distanceFeedRate.addLine(line)
@@ -202,7 +202,7 @@ def getCarvedSVG(self, carving, fileName, repository):
return ''
extrusionHeight = carving.getCarveLayerThickness()
decimalPlacesCarried = euclidean.getDecimalPlacesCarried(repository.extraDecimalPlaces.value, extrusionHeight)
- extrusionWidth = repository.extrusionWidth.value
+ extrusionWidth = repository.extrusionWidth.value #todo add extrusionwidth for later use
svgWriter = svg_writer.SVGWriter(
repository.addLayerTemplateToSVG.value,
carving.getCarveCornerMaximum(),
@@ -269,11 +269,11 @@ def parseInitialization( self, clipRepository ):
elif firstWord == '(<extrusionWidth>':
self.extrusionWidth = float(splitLine[1])
absolutePerimeterWidth = abs( self.extrusionWidth )
- self.clipLength = (self.extrusionHeight - (clipRepository.clipOverPerimeterWidth.value * self.extrusionHeight * (math.pi/4)))*4
+ self.clipLength = (clipRepository.clipOverPerimeterWidth.value*self.extrusionHeight * (0.7853))/2
self.connectingStepLength = 0.5 * absolutePerimeterWidth
self.layerPixelWidth = 0.1 * absolutePerimeterWidth
self.maximumConnectionDistance = clipRepository.maximumConnectionDistanceOverPerimeterWidth.value * absolutePerimeterWidth
- elif firstWord == '(<travelFeedRatePerSecond>':
+ elif firstWord == '(<travelFeedRate>':
self.travelFeedRateMinute = 60.0 * float(splitLine[1])
self.distanceFeedRate.addLine(line)
@@ -380,7 +380,7 @@ def parseInitialization( self, combRepository ):
self.combInset = 0.7 * extrusionWidth
self.betweenInset = 0.4 * extrusionWidth
self.uTurnWidth = 0.5 * self.betweenInset
- elif firstWord == '(<travelFeedRatePerSecond>':
+ elif firstWord == '(<travelFeedRate>':
self.travelFeedRateMinute = 60.0 * float(splitLine[1])
self.distanceFeedRate.addLine(line)
Oops, something went wrong.

0 comments on commit f1b35fa

Please sign in to comment.