mirror
/
PES-Embroidery
kopia lustrzana https://github.com/Reenforcements/PES-Embroidery
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed a bug in writing color change indices

pull/4/head
Reenforcements 2018-12-06 12:12:58 -05:00
rodzic 2622593e5b
commit 8757312f59
12 zmienionych plików z 124 dodań i 109 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

196
.idea/workspace.xml
Wyświetl plik

@ -2,7 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0b5af789-e47c-4138-bdb9-8fa765481e1e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/PECRender/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/PECRender/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tests/curves.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Tests/debugPicture.png" beforeDir="false" afterPath="$PROJECT_DIR$/Tests/debugPicture.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/PES.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/PES.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/svgFunctions.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/svgFunctions.py" afterDir="false" />
</list>
@ -15,8 +19,8 @@
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/PES_Embroidery$PESDump.coverage" NAME="PESDump Coverage Results" MODIFIED="1543957085304" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/PESDump" />
<SUITE FILE_PATH="coverage/PES_Embroidery$svgImport.coverage" NAME="svgImport Coverage Results" MODIFIED="1541478220694" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/learning" />
<SUITE FILE_PATH="coverage/PES_Embroidery$main.coverage" NAME="main Coverage Results" MODIFIED="1543980289433" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" />
<SUITE FILE_PATH="coverage/PES_Embroidery$PECRender_main.coverage" NAME="PECRender-main Coverage Results" MODIFIED="1543980402090" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/PECRender" />
<SUITE FILE_PATH="coverage/PES_Embroidery$main.coverage" NAME="main Coverage Results" MODIFIED="1544116241113" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" />
<SUITE FILE_PATH="coverage/PES_Embroidery$PECRender_main.coverage" NAME="PECRender-main Coverage Results" MODIFIED="1544106433238" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/PECRender" />
<SUITE FILE_PATH="coverage/PES_Embroidery$getColors.coverage" NAME="getColors Coverage Results" MODIFIED="1542917684965" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Colors" />
<SUITE FILE_PATH="coverage/PES_Embroidery$main__1_.coverage" NAME="PESDump Coverage Results" MODIFIED="1543893622615" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/PESDump" />
</component>
@ -24,37 +28,37 @@
<session id="-1920598427">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="12" />
<entry key="project.closed" value="13" />
<entry key="project.open.time.2" value="1" />
<entry key="project.open.time.5" value="1" />
<entry key="project.open.time.6" value="6" />
<entry key="project.open.time.6" value="7" />
<entry key="project.open.time.7" value="2" />
<entry key="project.open.time.8" value="3" />
<entry key="project.opened" value="13" />
<entry key="project.opened" value="14" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages" />
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Python" value="44400" />
<entry key="Python" value="44529" />
</counts>
</usages-collector>
<usages-collector id="statistics.js.language.service.starts" />
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="Python" value="46" />
<entry key="Python" value="47" />
<entry key="UML" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="JavaScript-modules-diagram//Users/imaustyn/Documents/MiamiUniversity/ECE 487/Project/PES-Embroidery" value="1" />
<entry key="py" value="46" />
<entry key="py" value="47" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="py" value="44400" />
<entry key="py" value="44529" />
</counts>
</usages-collector>
</session>
@ -64,8 +68,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11">
<caret line="35" column="33" lean-forward="true" selection-start-line="35" selection-start-column="33" selection-end-line="35" selection-end-column="33" />
<state relative-caret-position="63">
<caret line="19" column="32" lean-forward="true" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
@ -73,16 +77,16 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/svgFunctions.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="360" column="55" selection-start-line="360" selection-start-column="55" selection-end-line="360" selection-end-column="55" />
<state relative-caret-position="328">
<caret line="402" selection-start-line="402" selection-end-line="402" />
<folding>
<element signature="e#0#19#0" expanded="true" />
<marker date="1543979114206" expanded="true" signature="143:2224" ph="..." />
<marker date="1543979114206" expanded="true" signature="8439:8962" ph="..." />
<marker date="1543979114206" expanded="true" signature="8991:8996" ph="..." />
<marker date="1544116365862" expanded="true" signature="143:2224" ph="..." />
<marker date="1544116365862" expanded="true" signature="8479:9002" ph="..." />
<marker date="1544116365862" expanded="true" signature="9031:9036" ph="..." />
</folding>
</state>
</provider>
@ -91,15 +95,15 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/PES.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="238" column="32" lean-forward="true" selection-start-line="238" selection-start-column="32" selection-end-line="238" selection-end-column="32" />
<state relative-caret-position="408">
<caret line="397" column="53" lean-forward="true" selection-start-line="397" selection-start-column="53" selection-end-line="397" selection-end-column="53" />
<folding>
<element signature="e#0#23#0" expanded="true" />
<marker date="1543977681147" expanded="true" signature="149:339" ph="..." />
<marker date="1543977681147" expanded="true" signature="287:339" ph="..." />
<marker date="1543977681147" expanded="true" signature="516:556" ph="..." />
<marker date="1543977681147" expanded="true" signature="3450:3456" ph="..." />
<marker date="1543977681147" expanded="true" signature="11805:11901" ph="..." />
<marker date="1544116240082" expanded="true" signature="149:339" ph="..." />
<marker date="1544116240082" expanded="true" signature="287:339" ph="..." />
<marker date="1544116240082" expanded="true" signature="516:556" ph="..." />
<marker date="1544116240082" expanded="true" signature="3450:3456" ph="..." />
<marker date="1544116240082" expanded="true" signature="11805:11901" ph="..." />
</folding>
</state>
</provider>
@ -108,7 +112,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/PES_Emb_mathutils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<state relative-caret-position="30">
<caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
<folding>
<element signature="e#0#29#0" expanded="true" />
@ -129,26 +133,22 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PESDump/main.py">
<entry file="file://$PROJECT_DIR$/PECRender/main.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="327">
<caret line="70" column="30" lean-forward="true" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
<state relative-caret-position="9">
<caret line="16" column="108" selection-start-line="16" selection-start-column="108" selection-end-line="16" selection-end-column="108" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<marker date="1543888134994" expanded="true" signature="559:825" ph="..." />
<element signature="e#0#10#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/PECRender/main.py">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utilities.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="76" lean-forward="true" selection-start-line="15" selection-start-column="76" selection-end-line="15" selection-end-column="76" />
<folding>
<element signature="e#0#10#0" expanded="true" />
</folding>
<state relative-caret-position="15">
<caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
</state>
</provider>
</entry>
@ -164,9 +164,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>getClosest</find>
<find>image</find>
<find>fe</find>
<find>width</find>
<find>label</find>
<find>FF</find>
@ -182,7 +179,6 @@
<find>getCoordinate</find>
<find>PECColors</find>
<find>short</find>
<find>long</find>
<find>PEC</find>
<find>TYPE_LONG</find>
<find>encode</find>
@ -190,10 +186,14 @@
<find>maxStitchDistance</find>
<find>prepend</find>
<find>createSubshapeLineGroups</find>
<find>inver</find>
<find>print</find>
<find>closest</find>
<find>subshapeLineGroups</find>
<find>closest</find>
<find>print</find>
<find>long</find>
<find>svg</find>
<find>inver</find>
<find>ColorChange</find>
<find>indexInColorList</find>
</findStrings>
</component>
<component name="Git.Settings">
@ -212,10 +212,10 @@
<option value="$PROJECT_DIR$/src/PES_Emb_mathutils.py" />
<option value="$PROJECT_DIR$/src/PES_render_utils.py" />
<option value="$PROJECT_DIR$/PESDump/main.py" />
<option value="$PROJECT_DIR$/src/PES.py" />
<option value="$PROJECT_DIR$/src/svgFunctions.py" />
<option value="$PROJECT_DIR$/src/main.py" />
<option value="$PROJECT_DIR$/PECRender/main.py" />
<option value="$PROJECT_DIR$/src/PES.py" />
<option value="$PROJECT_DIR$/src/svgFunctions.py" />
</list>
</option>
</component>
@ -238,7 +238,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -274,6 +273,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -301,7 +301,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python.PECRender-main">
<component name="RunManager" selected="Python.main">
<configuration name="PECRender-main" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="PES-Embroidery" />
<option name="INTERPRETER_OPTIONS" value="" />
@ -382,7 +382,7 @@
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/main.py" />
<option name="PARAMETERS" value="-i &quot;../Tests/tux.svg&quot; -o ../TestOutput/simple.pes -d" />
<option name="PARAMETERS" value="-i &quot;../Tests/ugliestApple.svg&quot; -o ../TestOutput/ugliestApple.pes -d" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
@ -444,7 +444,7 @@
<frame x="0" y="23" width="1680" height="1027" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14224665" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14346765" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@ -574,13 +574,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utilities.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/PES_render_utils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
@ -619,18 +612,14 @@
</entry>
<entry file="file://$PROJECT_DIR$/PESDump/main.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="327">
<caret line="70" column="30" lean-forward="true" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<marker date="1543888134994" expanded="true" signature="559:825" ph="..." />
</folding>
<state relative-caret-position="45">
<caret line="3" column="61" selection-start-line="3" selection-start-column="58" selection-end-line="3" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/PES_Emb_mathutils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<state relative-caret-position="30">
<caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
<folding>
<element signature="e#0#29#0" expanded="true" />
@ -649,53 +638,60 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/PES.py">
<entry file="file://$PROJECT_DIR$/src/utilities.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="238" column="32" lean-forward="true" selection-start-line="238" selection-start-column="32" selection-end-line="238" selection-end-column="32" />
<folding>
<element signature="e#0#23#0" expanded="true" />
<marker date="1543977681147" expanded="true" signature="149:339" ph="..." />
<marker date="1543977681147" expanded="true" signature="287:339" ph="..." />
<marker date="1543977681147" expanded="true" signature="516:556" ph="..." />
<marker date="1543977681147" expanded="true" signature="3450:3456" ph="..." />
<marker date="1543977681147" expanded="true" signature="11805:11901" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/svgFunctions.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="360" column="55" selection-start-line="360" selection-start-column="55" selection-end-line="360" selection-end-column="55" />
<folding>
<element signature="e#0#19#0" expanded="true" />
<marker date="1543979114206" expanded="true" signature="143:2224" ph="..." />
<marker date="1543979114206" expanded="true" signature="8439:8962" ph="..." />
<marker date="1543979114206" expanded="true" signature="8991:8996" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11">
<caret line="35" column="33" lean-forward="true" selection-start-line="35" selection-start-column="33" selection-end-line="35" selection-end-column="33" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
<state relative-caret-position="15">
<caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PECRender/main.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="76" lean-forward="true" selection-start-line="15" selection-start-column="76" selection-end-line="15" selection-end-column="76" />
<state relative-caret-position="9">
<caret line="16" column="108" selection-start-line="16" selection-start-column="108" selection-end-line="16" selection-end-column="108" />
<folding>
<element signature="e#0#10#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="63">
<caret line="19" column="32" lean-forward="true" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/PES.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="397" column="53" lean-forward="true" selection-start-line="397" selection-start-column="53" selection-end-line="397" selection-end-column="53" />
<folding>
<element signature="e#0#23#0" expanded="true" />
<marker date="1544116240082" expanded="true" signature="149:339" ph="..." />
<marker date="1544116240082" expanded="true" signature="287:339" ph="..." />
<marker date="1544116240082" expanded="true" signature="516:556" ph="..." />
<marker date="1544116240082" expanded="true" signature="3450:3456" ph="..." />
<marker date="1544116240082" expanded="true" signature="11805:11901" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/svgFunctions.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="328">
<caret line="402" selection-start-line="402" selection-end-line="402" />
<folding>
<element signature="e#0#19#0" expanded="true" />
<marker date="1544116365862" expanded="true" signature="143:2224" ph="..." />
<marker date="1544116365862" expanded="true" signature="8479:9002" ph="..." />
<marker date="1544116365862" expanded="true" signature="9031:9036" ph="..." />
</folding>
</state>
</provider>
</entry>
</component>
</project>

2
PECRender/main.py
Wyświetl plik

@ -14,7 +14,7 @@ pyglet.gl.glClearColor(0.4,0.4,0.4,1)
#filepath = "/Users/imaustyn/Documents/MiamiUniversity/ECE 487/Project/Understanding2/tux.pes"
#filepath = "/Users/imaustyn/Downloads/Circle embroidery designs/Circle.pes"
filepath = "/Users/imaustyn/Documents/MiamiUniversity/ECE 487/Project/PES-Embroidery/TestOutput/simple.PES"
filepath = "/Users/imaustyn/Documents/MiamiUniversity/ECE 487/Project/PES-Embroidery/TestOutput/ugliestApple.PES"
#filepath = "/Users/imaustyn/Documents/MiamiUniversity/ECE 487/Project/PES-Embroidery/TestOutput/simpleTry.PES"
# Global variables

BIN
TestOutput/simple.pes 100644
Wyświetl plik

Plik binarny nie jest wyświetlany.

BIN
TestOutput/ugliestApple.pes 100644
Wyświetl plik

Plik binarny nie jest wyświetlany.

BIN
Tests/debugPicture.png
Wyświetl plik

Plik binarny nie jest wyświetlany.
Side by Side Swipe Nakładka

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 3.7 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 2.7 KiB

3
Tests/test1.svg 100644
Wyświetl plik

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid meet" viewBox="194.68111332352888 225.98757819408158 250.63777335294228 172.2847343887219" width="251" height="172"><defs><path d="M292.98 303.13C308.31 343.01 302.18 321.53 330.81 308.24C359.44 294.95 337.97 300.06 348.19 247.91C358.42 195.76 360.46 246.89 420.79 294.95C481.13 343.01 418.75 311.31 356.37 368.57C294 425.83 326.72 386.98 246.96 362.44C193.79 346.08 181.18 321.87 209.13 289.83L263.32 247.91C272.87 258.14 282.75 276.54 292.98 303.13Z" id="agubZWD6j"></path></defs><g><use xlink:href="#agubZWD6j" opacity="1" fill="#ff0014" fill-opacity="1"></use><g><use xlink:href="#agubZWD6j" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1" stroke-opacity="1"></use></g></g></svg>
Side by Side

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 979 B

25
Tests/curves.svg → Tests/ugliestApple.svg
Wyświetl plik

@ -26,7 +26,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.7348765"
inkscape:cx="364.28571"
inkscape:cx="280.70627"
inkscape:cy="542.85714"
inkscape:document-units="px"
inkscape:current-layer="layer1"
@ -44,7 +44,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -53,9 +53,24 @@
inkscape:groupmode="layer"
id="layer1">
<path
style="fill:#00b100;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
d="m 269.18342,466.15335 c 0,0 -29.97332,72.05123 53.02971,69.74559 83.00302,-2.30564 85.88507,-77.23892 85.88507,-77.23892 0,0 3.45846,-92.802 -47.84202,-81.85021 -51.30048,10.95179 -91.07276,89.34354 -91.07276,89.34354 z"
id="path4203"
style="fill:#a26200;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
d="m 276.67675,433.29797 -1.72922,-55.91177 17.29229,-1.15281 -7.49333,65.71072 z"
id="path4140"
inkscape:connector-curvature="0" />
<path
style="fill:#00b500;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
d="m 300.30956,446.55539 -3.45846,-36.31382 34.00819,-41.50151 13.25742,41.50151 z"
id="path4142"
inkscape:connector-curvature="0" />
<path
style="fill:#ef0000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
d="m 266.30138,547.42713 c 0,0 -60.52304,-39.19588 -60.52304,-41.50152 0,-2.30564 -0.57641,-66.28714 -0.57641,-66.28714 0,0 31.12613,-34.00818 33.43177,-34.00818 2.30564,0 46.11279,38.04305 46.11279,38.04305 l 15.56307,4.61128 37.46664,-13.83383 c 0,0 27.66768,-14.41025 29.97332,-15.56307 2.30564,-1.15282 19.02153,-5.7641 21.32717,-4.61128 2.30564,1.15282 9.22255,34.58459 9.22255,34.58459 l 4.03487,25.93845 -21.32716,53.02971 -34.5846,20.75076 -30.54972,-4.61128 -18.44512,-10.37538 -14.98666,6.34051 -8.64614,5.18769 z"
id="path4144"
inkscape:connector-curvature="0" />
<path
style="fill:#0065f7;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
d="m 209.2368,559.53174 c 0,0 24.20921,-5.7641 26.51485,-6.34051 2.30564,-0.57641 20.75076,19.02152 20.75076,19.02152 l -25.36204,19.02153 z"
id="path4146"
inkscape:connector-curvature="0" />
</g>
</svg>
Side by Side Swipe Nakładka

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 2.0 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 3.3 KiB

2
src/PES.py
Wyświetl plik

@ -402,4 +402,4 @@ class ColorChange:
def encode(self, b):
b.extend([ ColorChange.TYPE_COLOR_CHANGE_left ])
b.extend([ ColorChange.TYPE_COLOR_CHANGE_right ])
b.extend([ self.indexInColorList & 0xFF ])
b.extend([ (self.indexInColorList-1) & 0xFF ])

BIN
src/PES.pyc
Wyświetl plik

Plik binarny nie jest wyświetlany.

2
src/main.py
Wyświetl plik

@ -26,7 +26,7 @@ paths, attributes = svg
if paths is None:
sys.exit(0)
threadWidth = 3
threadWidth = 2.5
maxStitchDistance = 10.0
# Enumerate the shapes in the SVG to find where stitches should go.

3
src/svgFunctions.py
Wyświetl plik

@ -70,8 +70,9 @@ def loadVectorGraphic(filename):
attributes = None
try:
svg, attributes = svgpathtools.svg2paths(filename)
except:
except Exception as e:
print("Couldn't load SVG file. Perhaps it doesn't exist?")
print(e.message)
return svg, attributes

BIN
src/svgFunctions.pyc
Wyświetl plik

Plik binarny nie jest wyświetlany.