search

d-bl / GroundForge

Bobbin Lace Diagrams : threads from pairs
https://d-bl.github.io/GroundForge/
GNU General Public License v3.0
12 stars 7 forks source link

Inkscape template downloads / distortion-free layout #184

Closed jo-pol closed 3 years ago

jo-pol commented 3 years ago

Works on issue #181 and #142

Notify

@d-bl/gf

Description / purpose of the changes

Patterns with an overlapping layout that won't work for either: https://github.com/d-bl/GroundForge/blob/1633c61ef8638909163ef198b3e09b7c09d2505b/src/test/scala/dibl/InkscapeTemplateSpec.scala#L66 https://github.com/d-bl/GroundForge/blob/1633c61ef8638909163ef198b3e09b7c09d2505b/src/test/scala/dibl/InkscapeTemplateSpec.scala#L72

Converting any tile layout to a simple one is implemented in the new class PairParams and tested more or less with the InkscapeTemplateSpec class. The spot in the code to implement the overlapping tile layout: https://github.com/d-bl/GroundForge/blob/1633c61ef8638909163ef198b3e09b7c09d2505b/src/main/scala/dibl/proto/PairParams.scala#L47

It is weird that the BenchMark class produces less distortion free diagrams than are in the drop down list of working pattern. They are in the list because in previous versions the BenchMark did produce them and they still work in situ, though they still might need to be stitched up. Perhaps some more patterns might produce something. Some patterns cause a never ending loop when calculating the distortion free layout: https://github.com/d-bl/GroundForge/blob/1633c61ef8638909163ef198b3e09b7c09d2505b/src/test/scala/dibl/fte/BenchMark.scala#L47-L48

MAETempels commented 3 years ago

Aha, hier zijn ze.

Groetjes van Marian Via de phone.

Op 3 jan. 2021 om 09:53 heeft Jo Pol notifications@github.com het volgende geschreven:

Works on issue #181 and #142

Notify

@d-bl/gf

Description / purpose of the changes

Downloads of txt files for Inkscape templates were recently introduced in the caption bar of "pattern definition", but now it also works for patterns with a brick tile layout Distortion free layout is still in a very experimental phase Patterns with an overlapping layout that won't work for either:

GroundForge/src/test/scala/dibl/InkscapeTemplateSpec.scala

Line 66 in 1633c61

"gw-B6", "gw-A2", "gw-E6", "gw-H14b", "gw-B2", "gw-C9", "gw-D6", "gw-C6"

GroundForge/src/test/scala/dibl/InkscapeTemplateSpec.scala

Line 72 in 1633c61

"MAE-G54", "MAE-grond-12**", "MAE-G64", "MAE-G-02-YQ4b", "MAE-grond-12***", "MAE-G-02-Y1", "MAE-G-12" Converting any tile layout to a simple one is implemented in the new class PairParams and tested more or less with the InkscapeTemplateSpec class. The spot in the code to implement the overlapping tile layout:

GroundForge/src/main/scala/dibl/proto/PairParams.scala

Line 47 in 1633c61

case _ => ??? It is weird that the BenchMark class produces less distortion free diagrams than are in the drop down list of working pattern. They are in the list because in previous versions the BenchMark did produce them and they still work in situ, though they still might need to be stitched up. Perhaps some more patterns might produce something. Some patterns cause a never ending loop when calculating the distortion free layout:

GroundForge/src/test/scala/dibl/fte/BenchMark.scala

Lines 47 to 48 in 1633c61

"gw-H10", "gw-B14", "gw-E14", "gw-H14", "gw-H14a", "4x4_201", "4x3_91", "3x4_467", "4x4_195", You can view, comment on, or merge this pull request online at:

https://github.com/d-bl/GroundForge/pull/184

Commit Summary

received proof of concept placed under src/test compiled proof of concept squash-merged the rest of #143 droste + hook for other types of input scala-doc for foldLeft restored calculation of newFaces extracted Faces.create/Data/create and other refactoring refactoring refactored, implemented creation of data array in scala bugfix cleanup extracted LocationsDFS refactoring option->try, isolated JVM bound code x-y calculations trying to find the vectors preparing API for new web page visualizing the calculated first tile fixed visualizing the first tile typo broke the clones render 26 out of the 42 benchmark patterns extracted methods onto separate objects error handling paths for vectors may have an odd number of steps return results, even when escaping a never ending loop scala-doc and other comments start of the prototype page null space calculation with JavaScript educated guess to fix an undefined error preparing JavaScript API; up side down diagrams SBT compilation to js fails on "import org.ejml" compiled with temporary comments in Delta object completed javascript and fixed required methods generalised API textarea -> custom link edit modes reorder reordered again, stronger clues colored nodes for the new style diagram new interaction strategy signature change for TopoLink signature change in hard coded example variable scaling Alt/shift clicks eliminate radio buttons copy-paste devil shorter undoes longer; remove stitch compiled and finished removing stitches programming error to preventDefault in Chrome back to radio buttons, reactivated cloned elements Merge branch 'master' into without-distortion shortcut for the null space limited ejml to src.test (for a jvm environment) SVD-js now also can generate the diagrams link tiles page to pricking page rewording, bigger dots simple tile from bricks a pattern beyond the BenchMark some more examples rewording list of patterns that work more or less broken link, so far only simple tiling configurable in/de-crease of stitch distances added MAE pair diagrams to the BenchMark MAE pair diagrams in BenchMark and drop down brick to simple tile layout for InkscapeTemplates compiled, fixed drop down list of patterns typos not yet implemented notes File Changes

M docs/js/GroundForge-opt.js (1663) A docs/js/pricking.js (63) A docs/js/svd-1.1.1.js (1) M docs/js/tiles.js (16) A docs/pricking.html (431) M docs/tiles.html (5) M pom.xml (24) M project/build.sbt (1) M src/main/scala/dibl/InkscapeTemplate.scala (26) A src/main/scala/dibl/LinksOfSimpleTile.scala (55) A src/main/scala/dibl/fte/ClockWise.scala (31) A src/main/scala/dibl/fte/Data.scala (71) A src/main/scala/dibl/fte/Delta.scala (47) A src/main/scala/dibl/fte/Face.scala (69) A src/main/scala/dibl/fte/Locations.scala (50) A src/main/scala/dibl/fte/SvgPricking.scala (82) A src/main/scala/dibl/fte/TileVector.scala (120) A src/main/scala/dibl/fte/TopoLink.scala (256) A src/main/scala/dibl/fte/package.scala (21) M src/main/scala/dibl/package.scala (8) A src/main/scala/dibl/proto/PairParams.scala (98) M src/main/scala/dibl/proto/TilesConfig.scala (14) A src/main/scala/dibl/proto/package.scala (21) M src/test/scala/dibl/InkscapeTemplateSpec.scala (81) A src/test/scala/dibl/PatternQueries.scala (562) A src/test/scala/dibl/fte/BenchMark.scala (100) A src/test/scala/dibl/fte/Deltas.scala (31) A src/test/scala/dibl/fte/TopoLinkSpec.scala (38) Patch Links:

https://github.com/d-bl/GroundForge/pull/184.patch https://github.com/d-bl/GroundForge/pull/184.diff — You are receiving this because you are on a team that was mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

jo-pol commented 3 years ago

Mis ik een bijlage? Kijk ook eens online.