Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

grrrr

  • Loading branch information...
commit 89b81a9ea9d43686fd36e2dd10609af2b53e8eb9 1 parent ec73d5f
@ahmetcemturan authored
View
74 .idea/workspace.xml
@@ -29,7 +29,7 @@
<file leaf-file-name="raft.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="969" column="124" selection-start="51128" selection-end="51128" vertical-scroll-proportion="1.0889621">
+ <state line="752" column="1" selection-start="39786" selection-end="39786" vertical-scroll-proportion="0.45043477">
<folding />
</state>
</provider>
@@ -94,7 +94,6 @@
<sortByType />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -173,6 +172,7 @@
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
<pane id="Favorites" />
</panes>
</component>
@@ -293,16 +293,16 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1932" height="1056" extended-state="0" />
- <editor active="true" />
+ <frame x="1" y="1" width="1678" height="1008" extended-state="1" />
+ <editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32352942" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.08725542" sideWeight="0.46623093" order="1" side_tool="true" content_ui="tabs" x="583" y="196" width="274" height="468" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.08674405" sideWeight="0.537931" order="1" side_tool="true" content_ui="tabs" x="583" y="196" width="274" height="468" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.08725542" sideWeight="0.2603486" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.08674405" sideWeight="0.7390805" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2647059" sideWeight="0.9991143" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26091954" sideWeight="0.9991143" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32897604" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -369,51 +369,51 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>752</line>
+ <line>836</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>834</line>
+ <line>1017</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1015</line>
+ <line>1016</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1014</line>
+ <line>1015</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1013</line>
+ <line>1019</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1017</line>
+ <line>1020</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1018</line>
+ <line>1021</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1019</line>
+ <line>1023</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1021</line>
+ <line>1026</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1024</line>
+ <line>1028</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1026</line>
+ <line>1030</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1028</line>
+ <line>1031</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
@@ -429,7 +429,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1023</line>
+ <line>1024</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
@@ -437,23 +437,15 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1020</line>
- </line-breakpoint>
- <line-breakpoint enabled="true" type="python-line">
- <url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1016</line>
- </line-breakpoint>
- <line-breakpoint enabled="true" type="python-line">
- <url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1012</line>
+ <line>1018</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1030</line>
+ <line>1014</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1031</line>
+ <line>1032</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
@@ -461,7 +453,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1032</line>
+ <line>1035</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
@@ -469,10 +461,6 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>1035</line>
- </line-breakpoint>
- <line-breakpoint enabled="true" type="python-line">
- <url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
<line>1036</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
@@ -493,6 +481,14 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
+ <line>1041</line>
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="python-line">
+ <url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
+ <line>1042</line>
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="python-line">
+ <url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
<line>479</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
@@ -679,12 +675,14 @@
</entry>
<entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_utilities/skeinforge_craft.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="59" column="0" selection-start="2251" selection-end="2251" vertical-scroll-proportion="0.33281735" />
+ <state line="59" column="0" selection-start="2251" selection-end="2251" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="969" column="124" selection-start="51128" selection-end="51128" vertical-scroll-proportion="1.0889621">
+ <state line="752" column="1" selection-start="39786" selection-end="39786" vertical-scroll-proportion="0.45043477">
<folding />
</state>
</provider>
View
20 skeinforge_application/skeinforge_plugins/craft_plugins/raft.py
@@ -384,7 +384,7 @@ def __init__(self):
self.supportChoiceEmptyLayersOnly = settings.MenuRadio().getFromMenuButtonDisplay(self.supportMaterialChoice, 'Empty Layers Only', self, False)
self.supportChoiceEverywhere = settings.MenuRadio().getFromMenuButtonDisplay(self.supportMaterialChoice, 'Everywhere', self, False)
self.supportChoiceExteriorOnly = settings.MenuRadio().getFromMenuButtonDisplay(self.supportMaterialChoice, 'Exterior Only', self, False)
- self.supportMinimumAngle = settings.FloatSpin().getFromValue(0.25, 'Add more (>1) or less (<1) support:', self, 2.0, 1.0)
+ self.supportMinimumAngle = settings.FloatSpin().getFromValue(40.0, 'Add support if flatter than (degrees):', self, 80.0, 50.0)
self.executeTitle = 'Raft'
def execute(self):
@@ -745,7 +745,12 @@ def addSupportSegmentTable( self, layerIndex ):
# print (self.edgeWidth, self.layerHeight)
# print (self.supportXAngle)
# supportMinimumAngle = 90 - math.degrees(math.fabs( math.tan((self.edgeWidth -self.layerHeight)/2/self.layerHeight)))
- self.minimumSupportRatio = math.tan( math.radians( self.supportXAngle ) ) * self.repository.supportMinimumAngle.value
+# self.minimumSupportRatio = 1/self.supportXAngle# ) * self.repository.supportMinimumAngle.value
+# print ('min sup rat',self.minimumSupportRatio)
+# 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)
numberOfSubSteps = 4
@@ -827,9 +832,6 @@ def extendXIntersections( self, loops, radius, xIntersectionsTable ):
def getCraftedGcode(self, gcodeText, repository):
'Parse gcode text and store the raft gcode.'
self.repository = repository
-
-# supportMinimumAngle = 90 - math.degrees(math.fabs( math.tan((self.edgeWidth -self.layerHeight)/2/self.layerHeight)))
-# self.minimumSupportRatio = math.tan( math.radians( supportMinimumAngle ) )
# self.minimumSupportRatio = math.tan( math.radians( repository.supportMinimumAngle.value ) )
self.supportEndLines = settings.getAlterationFileLines(repository.nameOfSupportEndFile.value)
self.supportStartLines = settings.getAlterationFileLines(repository.nameOfSupportStartFile.value)
@@ -922,13 +924,13 @@ 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
+ 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))
- self.supportXAngle =90-math.degrees(((self.edgeWidth-self.layerHeight)/self.layerHeight/2))
-
- print (self.edgeWidth , 'X' ,self.layerHeight, '=' , self.supportXAngle)
+# self.supportXAngle =90-math.degrees(((self.edgeWidth-self.layerHeight)/self.layerHeight/2))
+# self.supportXAngle =+self.layerHeight/((self.edgeWidth-self.layerHeight)/2)
+# print (self.edgeWidth , 'X' ,self.layerHeight, '=' , self.supportXAngle)
# print self.supportXTempAngle
# print self.widthHeightRatio
# if self.widthHeightRatio >= 1:
Please sign in to comment.
Something went wrong with that request. Please try again.