Skip to content

Commit

Permalink
updated gitignore, still toying with raft
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmetcemturan committed Oct 2, 2012
1 parent fd6923a commit 6b2602e
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 48 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -2,4 +2,5 @@
*.gcode *.gcode
priv_* priv_*
zzz* zzz*
sfact_profiles sfact_profiles
.idea
87 changes: 48 additions & 39 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions skeinforge_application/skeinforge_plugins/craft_plugins/raft.py
Expand Up @@ -440,7 +440,7 @@ def __init__(self):


def addBaseLayer(self): def addBaseLayer(self):
'Add a base layer.' 'Add a base layer.'
baseLayerThickness = self.layerHeight * self.baseLayerThicknessOverLayerThickness baseLayerThickness = self.baseLayerThicknessOverLayerThickness
zCenter = self.extrusionTop + 0.5 * baseLayerThickness zCenter = self.extrusionTop + 0.5 * baseLayerThickness
z = zCenter + baseLayerThickness * self.repository.baseNozzleLiftOverBaseLayerThickness.value z = zCenter + baseLayerThickness * self.repository.baseNozzleLiftOverBaseLayerThickness.value
if len(self.baseEndpoints) < 1: if len(self.baseEndpoints) < 1:
Expand Down Expand Up @@ -479,7 +479,7 @@ def addFlowRate(self, flowRate):


def addInterfaceLayer(self): def addInterfaceLayer(self):
'Add an interface layer.' 'Add an interface layer.'
interfaceLayerThickness = self.layerHeight * self.interfaceLayerThicknessOverLayerThickness interfaceLayerThickness = self.interfaceLayerThicknessOverLayerThickness
zCenter = self.extrusionTop + 0.5 * interfaceLayerThickness zCenter = self.extrusionTop + 0.5 * interfaceLayerThickness
z = zCenter + interfaceLayerThickness * self.repository.interfaceNozzleLiftOverInterfaceLayerThickness.value z = zCenter + interfaceLayerThickness * self.repository.interfaceNozzleLiftOverInterfaceLayerThickness.value
if len(self.interfaceEndpoints) < 1: if len(self.interfaceEndpoints) < 1:
Expand Down Expand Up @@ -575,10 +575,10 @@ def addRaft(self):
print('this should never happen, there are no boundary layers in addRaft') print('this should never happen, there are no boundary layers in addRaft')
return return
self.baseLayerThicknessOverLayerThickness = self.repository.baseLayerThicknessOverLayerThickness.value self.baseLayerThicknessOverLayerThickness = self.repository.baseLayerThicknessOverLayerThickness.value
baseExtrusionWidth = self.edgeWidth * self.baseLayerThicknessOverLayerThickness baseExtrusionWidth = self.baseLayerThicknessOverLayerThickness
self.baseStep = baseExtrusionWidth / self.repository.baseInfillDensity.value * euclidean.globalQuarterPi self.baseStep = baseExtrusionWidth / self.repository.baseInfillDensity.value * euclidean.globalQuarterPi
self.interfaceLayerThicknessOverLayerThickness = self.repository.interfaceLayerThicknessOverLayerThickness.value self.interfaceLayerThicknessOverLayerThickness = self.repository.interfaceLayerThicknessOverLayerThickness.value
interfaceExtrusionWidth = self.edgeWidth * self.interfaceLayerThicknessOverLayerThickness interfaceExtrusionWidth = self.interfaceLayerThicknessOverLayerThickness
self.interfaceStep = interfaceExtrusionWidth / self.repository.interfaceInfillDensity.value* euclidean.globalQuarterPi self.interfaceStep = interfaceExtrusionWidth / self.repository.interfaceInfillDensity.value* euclidean.globalQuarterPi
self.setCornersZ() self.setCornersZ()
self.cornerMinimumComplex = self.cornerMinimum.dropAxis() self.cornerMinimumComplex = self.cornerMinimum.dropAxis()
Expand Down Expand Up @@ -750,9 +750,9 @@ def addSupportSegmentTable( self, layerIndex ):
# self.minimumSupportRatiox = self.supportXAngle * self.repository.supportMinimumAngle.value # self.minimumSupportRatiox = self.supportXAngle * self.repository.supportMinimumAngle.value
# print ('min sup ratx',self.minimumSupportRatiox) # print ('min sup ratx',self.minimumSupportRatiox)
self.minimumSupportRatio = self.widthHeightRatio * self.repository.supportMinimumAngle.value self.minimumSupportRatio = self.widthHeightRatio * self.repository.supportMinimumAngle.value
# print (self.minimumSupportRatio , self.widthHeightRatio , self.repository.supportMinimumAngle.value) print ('LH',self.layerHeight,'EW', self.edgeWidth, 'msr',self.minimumSupportRatio , 'whr',self.widthHeightRatio , 'sma',self.repository.supportMinimumAngle.value)

print ('MSR:', math.tan(self.minimumSupportRatio))
outsetSupportLoops = intercircle.getInsetSeparateLoopsFromLoops(boundaryLayer.loops, -self.minimumSupportRatio * rise) outsetSupportLoops = intercircle.getInsetSeparateLoopsFromLoops(boundaryLayer.loops, self.minimumSupportRatio * rise)
numberOfSubSteps = 4 numberOfSubSteps = 4
subStepSize = self.interfaceStep / float( numberOfSubSteps ) subStepSize = self.interfaceStep / float( numberOfSubSteps )
aboveIntersectionsTable = {} aboveIntersectionsTable = {}
Expand Down Expand Up @@ -924,7 +924,7 @@ def parseInitialization(self):
self.quarterEdgeWidth = 0.25 * self.edgeWidth self.quarterEdgeWidth = 0.25 * self.edgeWidth
self.supportOutset = self.edgeWidth + self.edgeWidth * self.repository.supportGapOverPerimeterExtrusionWidth.value self.supportOutset = self.edgeWidth + self.edgeWidth * self.repository.supportGapOverPerimeterExtrusionWidth.value
self.extrusionXsection = ((self.edgeWidth + self.layerHeight)/4) ** 2 * math.pi self.extrusionXsection = ((self.edgeWidth + self.layerHeight)/4) ** 2 * math.pi
self.widthHeightRatio = ((self.edgeWidth-self.layerHeight)/2) / self.layerHeight self.widthHeightRatio = (((self.edgeWidth-self.layerHeight)/2)/self.layerHeight)
# supportMinimumAngle = 90 - math.degrees(math.fabs( math.tan((self.edgeWidth -self.layerHeight)/2/self.layerHeight))) # supportMinimumAngle = 90 - math.degrees(math.fabs( math.tan((self.edgeWidth -self.layerHeight)/2/self.layerHeight)))


# self.supportXTempAngle = math.degrees(((self.edgeWidth-self.layerHeight)/self.layerHeight/2)) # self.supportXTempAngle = math.degrees(((self.edgeWidth-self.layerHeight)/self.layerHeight/2))
Expand Down

0 comments on commit 6b2602e

Please sign in to comment.