Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cleanup and a few updates to retraction

  • Loading branch information...
commit 76986f1e806978587137d315a80a6aa50553f65a 1 parent a96d31b
Ahmet Cem TURAN authored
243 .idea/workspace.xml
View
@@ -2,28 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="776eaf14-a295-457b-b16b-2e308ade59f0" name="Default" comment="">
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\documentation\fabmetheus_utilities.geometry.creation.sponge.html" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\documentation\fabmetheus_utilities.geometry.manipulation_paths._inset.html" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\documentation\fabmetheus_utilities.geometry.manipulation_paths._outset.html" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\documentation\skeinforge_application.skeinforge_plugins.craft_plugins.bookend.html" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\fabmetheus_utilities\geometry\creation\sponge.py" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\fabmetheus_utilities\geometry\manipulation_meta\_carve.py~RF321bebc.TMP" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\fabmetheus_utilities\geometry\manipulation_paths\_inset.py" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\fabmetheus_utilities\geometry\manipulation_paths\_outset.py" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\models\xml_models\creation\sponge.xml" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\models\xml_models\manipulation_paths\bevel.xml" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\models\xml_models\manipulation_paths\inset.xml" afterPath="" />
- <change type="DELETED" beforePath="C:\Users\Ahmet\Documents\GitHub\SFACT\models\xml_models\manipulation_paths\outset.xml" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config.py" afterPath="$PROJECT_DIR$/config.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fabmetheus_utilities/version.txt" afterPath="$PROJECT_DIR$/fabmetheus_utilities/version.txt" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/sfact.py" afterPath="$PROJECT_DIR$/sfact.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skFrontend.py" afterPath="$PROJECT_DIR$/skFrontend.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py" afterPath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py" afterPath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py" afterPath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py" afterPath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py" afterPath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py" afterPath="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py" />
</list>
<ignored path="SFACT.iws" />
<ignored path=".idea/workspace.xml" />
@@ -46,71 +27,26 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="sfact.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/sfact.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="235" column="124" selection-start="12416" selection-end="12459" vertical-scroll-proportion="-3.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="jitter.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.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="dimension.py" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="dimension.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="409" column="64" selection-start="21027" selection-end="21027" vertical-scroll-proportion="-5.8846154">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="multiply.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.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="skirt.py" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="261" column="0" selection-start="11781" selection-end="11781" vertical-scroll-proportion="0.6195286">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="settings.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/fabmetheus_utilities/settings.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1406" column="8" selection-start="53250" selection-end="53250" vertical-scroll-proportion="-142.08">
+ <state line="326" column="56" selection-start="17286" selection-end="17286" vertical-scroll-proportion="0.6694215">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="hop.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py">
+ <file leaf-file-name="notes" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/notes">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="0" selection-start="1099" selection-end="1099" vertical-scroll-proportion="0.0">
+ <state line="1" column="62" selection-start="41" selection-end="60" vertical-scroll-proportion="-0.65384614">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="comb.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py">
+ <file leaf-file-name="skin.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skin.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 />
@@ -118,10 +54,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="raft.py" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py">
+ <file leaf-file-name="sfact.py" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/sfact.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="723" column="88" selection-start="37998" selection-end="38034" vertical-scroll-proportion="-7.576923">
+ <state line="35" column="0" selection-start="1634" selection-end="2509" vertical-scroll-proportion="-14.923077">
<folding />
</state>
</provider>
@@ -141,7 +77,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/fabmetheus_utilities/archive.py" />
<option value="$PROJECT_DIR$/alterations/support_end.gmc" />
<option value="$PROJECT_DIR$/alterations/support_start.gmc" />
<option value="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py" />
@@ -154,9 +89,10 @@
<option value="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py" />
<option value="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py" />
<option value="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py" />
+ <option value="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py" />
<option value="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py" />
+ <option value="$PROJECT_DIR$/notes" />
<option value="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py" />
- <option value="$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py" />
</list>
</option>
</component>
@@ -186,8 +122,6 @@
<sortByType />
</navigator>
<panes>
- <pane id="Favorites" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -195,47 +129,9 @@
<option name="myItemId" value="SFACT" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SFACT" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="SFACT" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SFACT" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="SFACT" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="skeinforge_application" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="SFACT" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="SFACT" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="skeinforge_application" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="skeinforge_plugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
@@ -247,21 +143,11 @@
<option name="myItemId" value="SFACT" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="skeinforge_application" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="skeinforge_plugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="craft_plugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
+ <pane id="Favorites" />
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -381,20 +267,20 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="227" y="37" width="1331" height="1040" extended-state="0" />
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="false" />
<layout>
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32815966" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <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.17984496" sideWeight="0.20620842" order="1" side_tool="true" content_ui="tabs" x="583" y="196" width="274" height="468" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4694989" sideWeight="0.5" order="1" 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.23007916" sideWeight="0.29738563" 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.17984496" sideWeight="0.51773834" 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.23007916" sideWeight="0.42701524" 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.26718405" sideWeight="0.99891305" 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.26688454" sideWeight="0.9772394" 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.2849224" 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" />
@@ -441,113 +327,116 @@
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
</component>
<component name="XDebuggerManager">
- <breakpoint-manager />
+ <breakpoint-manager>
+ <breakpoints>
+ <line-breakpoint enabled="true" type="python-line">
+ <url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py</url>
+ <line>220</line>
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="python-line">
+ <url>file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py</url>
+ <line>244</line>
+ </line-breakpoint>
+ </breakpoints>
+ </breakpoint-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="106" column="0" selection-start="4128" selection-end="4128" vertical-scroll-proportion="0.618887" />
+ <state line="232" column="11" selection-start="10377" selection-end="10377" vertical-scroll-proportion="0.54787236" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skFrontend.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="379" column="25" selection-start="17353" selection-end="17353" vertical-scroll-proportion="0.0" />
+ <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_plugins/craft_plugins/fillet.py">
+ <entry file="file://$PROJECT_DIR$/fabmetheus_utilities/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="314" column="62" selection-start="14580" selection-end="14580" vertical-scroll-proportion="0.90425533">
- <folding />
- </state>
+ <state line="1406" column="8" selection-start="53250" selection-end="53250" 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$/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="351" column="16" selection-start="16355" selection-end="16355" vertical-scroll-proportion="0.030141843">
- <folding />
- </state>
+ <state line="28" column="0" selection-start="1099" selection-end="1099" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="120" column="17" selection-start="6350" selection-end="6351" vertical-scroll-proportion="0.030141843">
- <folding />
- </state>
+ <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_plugins/craft_plugins/smooth.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="232" column="11" selection-start="10377" selection-end="10377" vertical-scroll-proportion="0.54787236">
+ <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/speed.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="316" column="59" selection-start="17282" selection-end="17282" vertical-scroll-proportion="0.030141843">
+ <state line="285" column="34" selection-start="12744" selection-end="12744" vertical-scroll-proportion="0.027642276">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="0" selection-start="1099" selection-end="1099" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <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_plugins/craft_plugins/comb.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/speed.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="316" column="80" selection-start="17282" selection-end="17303" vertical-scroll-proportion="0.3325688">
<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="723" column="88" selection-start="37998" selection-end="38034" vertical-scroll-proportion="-7.576923">
+ <state line="974" column="35" selection-start="50731" selection-end="50959" vertical-scroll-proportion="1.2829268">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/sfact.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/export.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="235" column="124" selection-start="12416" selection-end="12459" vertical-scroll-proportion="-3.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/jitter.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.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="294" column="43" selection-start="0" selection-end="18766" vertical-scroll-proportion="0.35779816">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/fabmetheus_utilities/settings.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="1406" column="8" selection-start="53250" selection-end="53250" vertical-scroll-proportion="-142.08">
+ <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/dimension.py">
+ <entry file="file://$PROJECT_DIR$/sfact.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="409" column="64" selection-start="21027" selection-end="21027" vertical-scroll-proportion="-5.8846154">
+ <state line="35" column="0" selection-start="1634" selection-end="2509" vertical-scroll-proportion="-14.923077">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py">
+ <entry file="file://$PROJECT_DIR$/notes">
<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="1" column="62" selection-start="41" selection-end="60" vertical-scroll-proportion="-0.65384614">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py">
+ <entry file="file://$PROJECT_DIR$/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py">
<provider selected="true" editor-type-id="text-editor">
- <state line="261" column="0" selection-start="11781" selection-end="11781" vertical-scroll-proportion="0.6195286">
+ <state line="326" column="56" selection-start="17286" selection-end="17286" vertical-scroll-proportion="0.6694215">
<folding />
</state>
</provider>
11 notes
View
@@ -0,0 +1,11 @@
+if isActive:
+ if not self.repository.retractWithinIsland.value:
+ locationEnclosureIndex = self.getSmallestEnclosureIndex(location.dropAxis())
+ if locationEnclosureIndex != self.getSmallestEnclosureIndex(self.oldLocation.dropAxis()):
+ return None
+ locationMinusOld = location - self.oldLocation
+ xyTravel = abs(locationMinusOld.dropAxis())
+ zTravelMultiplied = locationMinusOld.z * self.zDistanceRatio
+ return math.sqrt(xyTravel * xyTravel + zTravelMultiplied * zTravelMultiplied)
+ else:
+ location = gcodec.getLocationFromSplitLine(location, splitLine)
77 skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
View
@@ -149,9 +149,12 @@ def __init__(self):
self.fileNameInput = settings.FileNameInput().getFromFileName( fabmetheus_interpret.getGNUTranslatorGcodeFileTypeTuples(), 'Open File for Dimension', self, '')
self.openWikiManualHelpPage = settings.HelpPage().getOpenFromAbsolute('http://fabmetheus.crsndoo.com/wiki/index.php/Skeinforge_Dimension')
self.activateDimension = settings.BooleanSetting().getFromValue('Activate Volumetric Extrusion (Stepper driven Extruders)', self, True )
+ extrusionDistanceFormatLatentStringVar = settings.LatentStringVar()
+ self.extrusionDistanceFormatChoiceLabel = settings.LabelDisplay().getFromName('Extrusion Distance Format Choice: ', self )
+ settings.Radio().getFromRadio( extrusionDistanceFormatLatentStringVar, 'Absolute Extrusion Distance', self, True )
+ self.relativeExtrusionDistance = settings.Radio().getFromRadio( extrusionDistanceFormatLatentStringVar, 'Relative Extrusion Distance', self, False )
+ self.extruderRetractionSpeed = settings.FloatSpin().getFromValue( 10, 'Extruder Retraction Speed (mm/s):', self, 50, 30 )
settings.LabelSeparator().getFromRepository(self)
- settings.LabelDisplay().getFromName('- Filament Settings - YOU NEED TO HAVE YOUR EXTRUDER E-STEPS CALIBRATED FIRST -', self )
- settings.LabelDisplay().getFromName('http://josefprusa.cz/skeinforge-40-volumetric-calibration', self )
settings.LabelDisplay().getFromName('- Filament -', self )
self.filamentDiameter = settings.FloatSpin().getFromValue(1.0, 'Filament Diameter (mm):', self, 6.0, 2.8)
self.filamentPackingDensity = settings.FloatSpin().getFromValue(0.5, 'E-Steps corrector:', self, 1.5, 1.0)
@@ -159,24 +162,13 @@ def __init__(self):
self.MeasuredXSection = settings.FloatSpin().getFromValue(0.20, 'Measured Width of Extrusion:', self, 2.0, 0.6)
settings.LabelSeparator().getFromRepository(self)
settings.LabelDisplay().getFromName('- Filament Retraction Settings -', self )
- self.extruderRetractionSpeed = settings.FloatSpin().getFromValue( 10, 'Extruder Retraction Speed (mm/s):', self, 50, 30 )
-# self.extruderRetractionDwell = settings.FloatSpin().getFromValue( 0, 'Extruder Retraction Dwell (mS):', self, 500, 100 )
- self.retractionDistance = settings.FloatSpin().getFromValue( 0.0, 'Retraction Distance (millimeters):', self, 3.0, 1.0 )
- self.restartExtraDistance = settings.FloatSpin().getFromValue( 0.0, 'Restart Extra Distance (millimeters):', self, 1.0, 0.1 )
- self.retractWithinIsland = settings.BooleanSetting().getFromValue('Retract Within Island', self, False)
+ self.maximumEValueBeforeReset = settings.FloatSpin().getFromValue(0.0, 'Maximum E Value before Reset (float):', self, 999999.9, 91234.0)
self.minimumTravelForRetraction = settings.FloatSpin().getFromValue(0.0, 'Minimum Travelmove after Retraction (millimeters):', self, 2.0, 1.0)
- settings.LabelSeparator().getFromRepository(self)
+ self.retractWithinIsland = settings.BooleanSetting().getFromValue('Retract Within Island', self, False)
+ self.retractionDistance = settings.FloatSpin().getFromValue( 0.0, 'Retraction Distance (millimeters):', self, 3.0, 1.0 )
settings.LabelSeparator().getFromRepository(self)
settings.LabelDisplay().getFromName('- Firmware Related Stuff -', self )
-# self.useFilamentDiameter = settings.BooleanSetting().getFromValue('Consider Filament Diameter?', self, True )
- self.maximumEValueBeforeReset = settings.FloatSpin().getFromValue(0.0, 'Maximum E Value before Reset (float):', self, 999999.9, 91234.0)
- extrusionDistanceFormatLatentStringVar = settings.LatentStringVar()
- self.extrusionDistanceFormatChoiceLabel = settings.LabelDisplay().getFromName('Extrusion Distance Format Choice: ', self )
- settings.Radio().getFromRadio( extrusionDistanceFormatLatentStringVar, 'Absolute Extrusion Distance', self, True )
- self.relativeExtrusionDistance = settings.Radio().getFromRadio( extrusionDistanceFormatLatentStringVar, 'Relative Extrusion Distance', self, False )
-
-
-
+ self.restartExtraDistance = settings.FloatSpin().getFromValue( 0.0, 'Restart Extra Distance (millimeters):', self, 1.0, 0.1 )
self.executeTitle = 'Dimension'
def execute(self):
@@ -197,22 +189,21 @@ def __init__(self):
self.isExtruderActive = False
self.layerIndex = -1
self.lineIndex = 0
- self.maximumZTravelFeedRatePerSecond = None
+ self.maximumZFeedRatePerSecond = None
self.oldLocation = None
self.operatingFlowRate = None
self.retractionRatio = 1.0
self.totalExtrusionDistance = 0.0
self.travelFeedRatePerSecond = None
- self.zDistanceRatio = 1.0
+ self.zDistanceRatio = 5.0
self.oldFlowRateString = None
self.layerHeight = 0
self.edgeWidth = 0
- self.filamentXsection = 0
self.nozzleXsection = 0
self.flowRate = 0
self.extrusionReduction = 1
- self.oldExtrusionDistance = 0
- self.restartDistance = 0
+# self.oldExtrusionDistance = 0
+# self.restartDistance = 0
def addLinearMoveExtrusionDistanceLine(self, extrusionDistance):
'Get the extrusion distance string from the extrusion distance.'
@@ -227,14 +218,14 @@ def getCraftedGcode(self, gcodeText, repository):
'Parse gcode text and store the dimension gcode.'
self.repository = repository
filamentRadius = 0.5 * repository.filamentDiameter.value
+ filamentPackingArea = filamentRadius ** 2 * math.pi
self.minimumTravelForRetraction = self.repository.minimumTravelForRetraction.value
self.doubleMinimumTravelForRetraction = self.minimumTravelForRetraction + self.minimumTravelForRetraction
self.lines = archive.getTextLines(gcodeText)
self.parseInitialization()
- self.filamentXsection = filamentRadius ** 2 * math.pi
- self.extrusionXsection=(((self.layerHeight+self.edgeWidth)/4)*((self.layerHeight+self.edgeWidth)/4)) * math.pi
if not self.repository.retractWithinIsland.value:
self.parseBoundaries()
+ self.flowScaleSixty = (((self.layerHeight+self.edgeWidth)/4)*((self.layerHeight+self.edgeWidth)/4)) * math.pi
if repository.activateCalibration.value:
self.calibrationFactor = (4 * (self.repository.MeasuredXSection.value - self.edgeWidth))/((math.pi-4)*self.layerHeight+ 4* self.edgeWidth )+1
self.newfilamentPackingDensity = repository.filamentPackingDensity.value * self.calibrationFactor
@@ -251,19 +242,19 @@ def getCraftedGcode(self, gcodeText, repository):
print('There is no operatingFlowRate so dimension will do nothing.')
return gcodeText
# Calculate the extrusion volume
- self.extrusionReduction = self.filamentXsection * self.calibrationFactor #todo comment out later
+ self.extrusionReduction = filamentPackingArea * self.calibrationFactor #todo comment out later
# Retraction for fixed
self.restartDistance = self.repository.retractionDistance.value + self.repository.restartExtraDistance.value
self.extruderRetractionSpeedMinuteString = self.distanceFeedRate.getRounded(60.0 * self.repository.extruderRetractionSpeed.value)
- if self.maximumZTravelFeedRatePerSecond is not None and self.travelFeedRatePerSecond is not None:
- self.zDistanceRatio = self.travelFeedRatePerSecond / self.maximumZTravelFeedRatePerSecond
+ if self.maximumZFeedRatePerSecond != None and self.travelFeedRatePerSecond != None:
+ self.zDistanceRatio = self.travelFeedRatePerSecond / self.maximumZFeedRatePerSecond
for lineIndex in xrange(self.lineIndex, len(self.lines)):
self.parseLine( lineIndex )
return self.distanceFeedRate.output.getvalue()
def getDimensionedArcMovement(self, line, splitLine):
'Get a dimensioned arc movement.'
- if self.oldLocation is None:
+ if self.oldLocation == None:
return line
relativeLocation = gcodec.getLocationFromSplitLine(self.oldLocation, splitLine)
self.oldLocation += relativeLocation
@@ -275,11 +266,11 @@ def getDimensionedLinearMovement( self, line, splitLine ):
distance = 0.0
if self.absoluteDistanceMode:
location = gcodec.getLocationFromSplitLine(self.oldLocation, splitLine)
- if self.oldLocation is not None:
+ if self.oldLocation != None:
distance = abs( location - self.oldLocation )
self.oldLocation = location
else:
- if self.oldLocation is None:
+ if self.oldLocation == None:
print('Warning: There was no absolute location when the G91 command was parsed, so the absolute location will be set to the origin.')
self.oldLocation = Vector3()
location = gcodec.getLocationFromSplitLine(None, splitLine)
@@ -289,7 +280,7 @@ def getDimensionedLinearMovement( self, line, splitLine ):
def getDistanceToNextThread(self, lineIndex):
'Get the travel distance to the next thread.'
- if self.oldLocation is None:
+ if self.oldLocation == None:
return None
isActive = False
location = self.oldLocation
@@ -299,7 +290,6 @@ def getDistanceToNextThread(self, lineIndex):
firstWord = gcodec.getFirstWord(splitLine)
if firstWord == 'G1':
if isActive:
- location = gcodec.getLocationFromSplitLine(location, splitLine)
if not self.repository.retractWithinIsland.value:
locationEnclosureIndex = self.getSmallestEnclosureIndex(location.dropAxis())
if locationEnclosureIndex != self.getSmallestEnclosureIndex(self.oldLocation.dropAxis()):
@@ -307,16 +297,14 @@ def getDistanceToNextThread(self, lineIndex):
locationMinusOld = location - self.oldLocation
xyTravel = abs(locationMinusOld.dropAxis())
zTravelMultiplied = locationMinusOld.z * self.zDistanceRatio
- return math.hypot(xyTravel , zTravelMultiplied)
-
-
+ return math.sqrt(xyTravel * xyTravel + zTravelMultiplied * zTravelMultiplied)
+ location = gcodec.getLocationFromSplitLine(location, splitLine)
elif firstWord == 'M101':
isActive = True
elif firstWord == 'M103':
isActive = False
return None
-
def getExtrusionDistanceString( self, distance, splitLine ):
'Get the extrusion distance string.'
self.feedRateMinute = gcodec.getFeedRateMinute( self.feedRateMinute, splitLine )
@@ -329,12 +317,11 @@ def getExtrusionDistanceString( self, distance, splitLine ):
print(distance)
print(splitLine)
return ''
- scaledXSection = self.flowRate * self.extrusionXsection
- return self.getExtrusionDistanceStringFromExtrusionDistance((scaledXSection * distance) / self.extrusionReduction)
+ scaledFlowRate = self.flowRate * self.flowScaleSixty
+ return self.getExtrusionDistanceStringFromExtrusionDistance(scaledFlowRate/ self.extrusionReduction * distance)
def getExtrusionDistanceStringFromExtrusionDistance( self, extrusionDistance ):
'Get the extrusion distance string from the extrusion distance.'
- self.oldExtrusionDistance = self.distanceFeedRate.getRounded(extrusionDistance)
if self.repository.relativeExtrusionDistance.value:
return ' E' + self.distanceFeedRate.getRounded(extrusionDistance)
self.totalExtrusionDistance += extrusionDistance
@@ -344,12 +331,12 @@ def getRetractionRatio(self, lineIndex):
'Get the retraction ratio.'
distanceToNextThread = self.getDistanceToNextThread(lineIndex)
if distanceToNextThread is None:
- return 0.0
+ return 1.0
if distanceToNextThread >= self.doubleMinimumTravelForRetraction:
return 1.0
if distanceToNextThread <= self.minimumTravelForRetraction:
return 0.0
- return #(distanceToNextThread - self.minimumTravelForRetraction) / self.minimumTravelForRetraction
+ return (distanceToNextThread - self.minimumTravelForRetraction) / self.minimumTravelForRetraction
def getSmallestEnclosureIndex(self, point):
'Get the index of the smallest boundary loop which encloses the point.'
@@ -393,9 +380,9 @@ def parseInitialization(self):
elif firstWord == '(<layerHeight>':
self.layerHeight = float(splitLine[1])
elif firstWord == '(<maximumZDrillFeedRatePerSecond>':
- self.maximumZTravelFeedRatePerSecond = float(splitLine[1])
- elif firstWord == '(<maximumZTravelFeedRatePerSecond>':
- self.maximumZTravelFeedRatePerSecond = float(splitLine[1])
+ self.maximumZFeedRatePerSecond = float(splitLine[1])
+ elif firstWord == '(<maximumZFeedRatePerSecond>':
+ self.maximumZFeedRatePerSecond = float(splitLine[1])
elif firstWord == '(<operatingFeedRatePerSecond>':
self.feedRateMinute = 60.0 * float(splitLine[1])
elif firstWord == '(<operatingFlowRate>':
@@ -405,7 +392,6 @@ def parseInitialization(self):
self.edgeWidth = float(splitLine[1])
elif firstWord == '(<travelFeedRatePerSecond>':
self.travelFeedRatePerSecond = float(splitLine[1])
- self.XtravelFeedRatePerSecond = self.travelFeedRatePerSecond
elif firstWord == '(<FirstLayerTravelSpeed>':
self.FirstLayerTravelSpeed = float(splitLine[1])
elif firstWord == '(<nozzleDiameter>':
@@ -443,6 +429,7 @@ def parseLine( self, lineIndex ):
self.totalExtrusionDistance = 0.0
self.isExtruderActive = True
elif firstWord == 'M103': #retract
+ self.retractionRatio = self.getRetractionRatio(lineIndex)
self.addLinearMoveExtrusionDistanceLine(-self.repository.retractionDistance.value*self.retractionRatio)
self.isExtruderActive = False
elif firstWord == 'M108':
2  skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py
View
@@ -338,7 +338,7 @@ def addArc( self, afterCenterDifferenceAngle, afterPoint, beforeCenterSegment, b
distance = abs( arcDistanceZ )
if distance <= 0.0:
return
- line = self.distanceFeedRate.getFirstWordMovement( firstWord, afterPointMinusBefore ) + self.getRelativeCenter( centerMinusBeforeComplex )
+ line = self.distanceFeedRate.getFirstWordMovement( firstWord, afterPoint ) + self.getRelativeCenter( centerMinusBeforeComplex )
cornerFeedRate = self.getCornerFeedRate()
if cornerFeedRate != None:
line += ' F' + self.distanceFeedRate.getRounded(cornerFeedRate)
Please sign in to comment.
Something went wrong with that request. Please try again.