Somewhat correct some more of cnd

CND
Tatarize 2022-01-31 20:33:10 -08:00
rodzic c9f432f2fb
commit f7a9419e62
2 zmienionych plików z 20 dodań i 19 usunięć

Wyświetl plik

@ -1,4 +1,4 @@
from .ReadHelper import read_int_16le, read_int_8
from .ReadHelper import read_int_16be, read_int_8
def read_cnd_stitches(f, out):
@ -6,18 +6,18 @@ def read_cnd_stitches(f, out):
control = read_int_8(f)
if control is None:
break
x = read_int_16le(f)
y = read_int_16le(f)
# if control & 0x20 == 0x20:
# y = -y
# if control & 0x40 == 0x40:
# x = -x
x = read_int_16be(f)
y = -read_int_16be(f)
if control & 0x20:
y = -y
if control & 0x40:
x = -x
if y is None:
break
if control & 0xF == 0x07: # Jump
out.move(x, y)
out.trim()
continue
elif control & 0xF == 0x01:
if control & 0xF == 0x01:
out.stitch_abs(x, y)
continue
break # Uncaught Control

Wyświetl plik

@ -5,6 +5,7 @@ import pyembroidery.A100Reader as A100Reader
# import pyembroidery.ArtReader as ArtReader
import pyembroidery.BroReader as BroReader
import pyembroidery.CndReader as CndReader
import pyembroidery.ColReader as ColReader
import pyembroidery.ColWriter as ColWriter
import pyembroidery.CsvReader as CsvReader
@ -932,16 +933,16 @@ class EmbPattern:
"writer": ExpWriter,
}
)
# yield (
# {
# "description": "Melco Condensed Embroidery Format",
# "extension": "cnd",
# "extensions": ("cnd",),
# "mimetype": "application/x-cnd",
# "category": "embroidery",
# "reader": CndReader,
# }
# )
yield (
{
"description": "Melco Condensed Embroidery Format",
"extension": "cnd",
"extensions": ("cnd",),
"mimetype": "application/x-cnd",
"category": "embroidery",
"reader": CndReader,
}
)
yield (
{
"description": "Tajima Embroidery Format",