From 6b2602eece29f29c964c551169c72b6c9361d324 Mon Sep 17 00:00:00 2001 From: Ahmet Cem TURAN Date: Tue, 2 Oct 2012 18:13:55 +0300 Subject: [PATCH] updated gitignore, still toying with raft --- .gitignore | 3 +- .idea/workspace.xml | 87 ++++++++++--------- .../skeinforge_plugins/craft_plugins/raft.py | 16 ++-- 3 files changed, 58 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index c0d42ad..b041b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.gcode priv_* zzz* -sfact_profiles \ No newline at end of file +sfact_profiles +.idea \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 13fda66..acd5d91 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -26,10 +26,19 @@ + + + + + + + + + - + @@ -94,6 +103,7 @@ + @@ -172,7 +182,6 @@ - @@ -293,20 +302,20 @@ - - + + - + - + - + @@ -369,7 +378,7 @@ file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py - 836 + 850 file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py @@ -603,86 +612,86 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py b/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py index d7434a4..425dbc5 100644 --- a/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py +++ b/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py @@ -440,7 +440,7 @@ def __init__(self): def addBaseLayer(self): 'Add a base layer.' - baseLayerThickness = self.layerHeight * self.baseLayerThicknessOverLayerThickness + baseLayerThickness = self.baseLayerThicknessOverLayerThickness zCenter = self.extrusionTop + 0.5 * baseLayerThickness z = zCenter + baseLayerThickness * self.repository.baseNozzleLiftOverBaseLayerThickness.value if len(self.baseEndpoints) < 1: @@ -479,7 +479,7 @@ def addFlowRate(self, flowRate): def addInterfaceLayer(self): 'Add an interface layer.' - interfaceLayerThickness = self.layerHeight * self.interfaceLayerThicknessOverLayerThickness + interfaceLayerThickness = self.interfaceLayerThicknessOverLayerThickness zCenter = self.extrusionTop + 0.5 * interfaceLayerThickness z = zCenter + interfaceLayerThickness * self.repository.interfaceNozzleLiftOverInterfaceLayerThickness.value if len(self.interfaceEndpoints) < 1: @@ -575,10 +575,10 @@ def addRaft(self): print('this should never happen, there are no boundary layers in addRaft') return self.baseLayerThicknessOverLayerThickness = self.repository.baseLayerThicknessOverLayerThickness.value - baseExtrusionWidth = self.edgeWidth * self.baseLayerThicknessOverLayerThickness + baseExtrusionWidth = self.baseLayerThicknessOverLayerThickness self.baseStep = baseExtrusionWidth / self.repository.baseInfillDensity.value * euclidean.globalQuarterPi self.interfaceLayerThicknessOverLayerThickness = self.repository.interfaceLayerThicknessOverLayerThickness.value - interfaceExtrusionWidth = self.edgeWidth * self.interfaceLayerThicknessOverLayerThickness + interfaceExtrusionWidth = self.interfaceLayerThicknessOverLayerThickness self.interfaceStep = interfaceExtrusionWidth / self.repository.interfaceInfillDensity.value* euclidean.globalQuarterPi self.setCornersZ() self.cornerMinimumComplex = self.cornerMinimum.dropAxis() @@ -750,9 +750,9 @@ def addSupportSegmentTable( self, layerIndex ): # self.minimumSupportRatiox = self.supportXAngle * self.repository.supportMinimumAngle.value # print ('min sup ratx',self.minimumSupportRatiox) self.minimumSupportRatio = self.widthHeightRatio * self.repository.supportMinimumAngle.value -# print (self.minimumSupportRatio , self.widthHeightRatio , self.repository.supportMinimumAngle.value) - - outsetSupportLoops = intercircle.getInsetSeparateLoopsFromLoops(boundaryLayer.loops, -self.minimumSupportRatio * rise) + 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) numberOfSubSteps = 4 subStepSize = self.interfaceStep / float( numberOfSubSteps ) aboveIntersectionsTable = {} @@ -924,7 +924,7 @@ def parseInitialization(self): self.quarterEdgeWidth = 0.25 * self.edgeWidth self.supportOutset = self.edgeWidth + self.edgeWidth * self.repository.supportGapOverPerimeterExtrusionWidth.value 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))) # self.supportXTempAngle = math.degrees(((self.edgeWidth-self.layerHeight)/self.layerHeight/2))