Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated gitignore, still toying with raft

  • Loading branch information...
commit 6b2602eece29f29c964c551169c72b6c9361d324 1 parent fd6923a
@ahmetcemturan authored
View
3  .gitignore
@@ -2,4 +2,5 @@
*.gcode
priv_*
zzz*
-sfact_profiles
+sfact_profiles
+.idea
View
87 .idea/workspace.xml
@@ -26,10 +26,19 @@
</component>
<component name="FileEditorManager">
<leaf>
+ <file leaf-file-name="feed.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
<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="752" column="1" selection-start="39786" selection-end="39786" vertical-scroll-proportion="0.45043477">
+ <state line="754" column="93" selection-start="40013" selection-end="40013" vertical-scroll-proportion="0.6159292">
<folding />
</state>
</provider>
@@ -94,6 +103,7 @@
<sortByType />
</navigator>
<panes>
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -172,7 +182,6 @@
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
<pane id="Favorites" />
</panes>
</component>
@@ -293,20 +302,20 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="1" y="1" width="1678" height="1008" extended-state="1" />
- <editor active="false" />
+ <frame x="91" y="12" width="1678" height="1008" extended-state="0" />
+ <editor active="true" />
<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="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.08674405" sideWeight="0.7390805" 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.3298717" sideWeight="0.7275862" 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.26091954" 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.2724138" 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" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.49673203" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.49655172" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -369,7 +378,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
- <line>836</line>
+ <line>850</line>
</line-breakpoint>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py</url>
@@ -603,86 +612,86 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/sfact.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="0" selection-start="2942" selection-end="2942" vertical-scroll-proportion="0.58143324" />
+ <state line="244" column="0" selection-start="12703" selection-end="13213" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="375" column="167" selection-start="18095" selection-end="18095" vertical-scroll-proportion="0.41530946" />
+ <state line="188" column="57" selection-start="10169" selection-end="10169" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-2.6052632" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="122" column="22" selection-start="5451" selection-end="5451" vertical-scroll-proportion="0.8121911" />
+ <state line="148" column="0" selection-start="6473" selection-end="6473" vertical-scroll-proportion="0.50238097" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="89" column="127" selection-start="3565" selection-end="3565" vertical-scroll-proportion="0.7058824" />
+ <state line="448" column="95" selection-start="21713" selection-end="21713" vertical-scroll-proportion="1.3324873" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="125" column="134" selection-start="5771" selection-end="5771" vertical-scroll-proportion="0.37598735" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge.py">
+ <entry file="file://$PROJECT_DIR$/fabmetheus_utilities/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="244" column="0" selection-start="12703" selection-end="13213" vertical-scroll-proportion="0.0" />
+ <state line="1172" column="0" selection-start="45165" selection-end="45165" vertical-scroll-proportion="0.33281735" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="188" column="57" selection-start="10169" selection-end="10169" vertical-scroll-proportion="0.0" />
+ <state line="199" column="0" selection-start="9420" selection-end="9420" vertical-scroll-proportion="0.33281735" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_utilities/skeinforge_craft.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-2.6052632" />
+ <state line="59" column="0" selection-start="2251" selection-end="2251" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py">
+ <entry file="file://$PROJECT_DIR$/runskeinforge.sh">
<provider selected="true" editor-type-id="text-editor">
- <state line="148" column="0" selection-start="6473" selection-end="6473" vertical-scroll-proportion="0.50238097" />
+ <state line="26" column="0" selection-start="674" selection-end="674" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py">
+ <entry file="file://$PROJECT_DIR$/show_skeinforge.sh">
<provider selected="true" editor-type-id="text-editor">
- <state line="448" column="95" selection-start="21713" selection-end="21713" vertical-scroll-proportion="1.3324873" />
+ <state line="8" column="0" selection-start="195" selection-end="195" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py">
+ <entry file="file://$PROJECT_DIR$/terminal.sh">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ <state line="21" column="0" selection-start="598" selection-end="598" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/fabmetheus_utilities/settings.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="1172" column="0" selection-start="45165" selection-end="45165" vertical-scroll-proportion="0.33281735" />
+ <state line="14" column="92" selection-start="1018" selection-end="1018" vertical-scroll-proportion="0.020531401" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py">
+ <entry file="file://$PROJECT_DIR$/skFrontend.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="199" column="0" selection-start="9420" selection-end="9420" vertical-scroll-proportion="0.33281735" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_utilities/skeinforge_craft.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="59" column="0" selection-start="2251" selection-end="2251" vertical-scroll-proportion="0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" 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="752" column="1" selection-start="39786" selection-end="39786" vertical-scroll-proportion="0.45043477">
+ <state line="754" column="93" selection-start="40013" selection-end="40013" vertical-scroll-proportion="0.6159292">
<folding />
</state>
</provider>
View
16 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))
Please sign in to comment.
Something went wrong with that request. Please try again.