Merge pull request #39 from dnanto/develop

v2.2.2

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v2.2.2
+
+-   correct levo/dextro for variable-body length capsids
+-   add pinwheel tiles
+
 # v2.2.1
 
 -   only re-render for non-svg export

README.md

@@ -4,7 +4,7 @@ This work implements Caspar-Klug Theory to generate high-quality, vectorized cap
 
 # Run
 
--   Run democapsid (v2.2.1): [https://dnanto.github.io/democapsid/app.html](https://dnanto.github.io/democapsid/app.html).
+-   Run democapsid (v2.2.2): [https://dnanto.github.io/democapsid/app.html](https://dnanto.github.io/democapsid/app.html).
 
 ![screenshot.png](screenshot.png)
 

TODO.md

@@ -1,6 +1,6 @@
--   [ ] update paper
--   [ ] tests
--   [ ] comments/documentation javascript
+-   [~] update paper
+-   [~] comments/documentation javascript
+-   [?] tests
 -   [?] R package
 -   [x] comments/documentation python
 -   [x] python package

app.html

@@ -12,7 +12,7 @@
         <section class="layout">
             <div class="sidebar">
                 <fieldset style="text-align: center">
-                    <b>&#11041;&nbsp;<a href="https://github.com/dnanto/democapsid">democapsid v2.2.1</a>&nbsp;&#11041;</b>
+                    <b>&#11041;&nbsp;<a href="https://github.com/dnanto/democapsid">democapsid v2.2.2</a>&nbsp;&#11041;</b>
                 </fieldset>
                 <fieldset>
                     <legend>model</legend>
@@ -45,6 +45,8 @@
                             <option value="dualtrihex">dualtrihex</option>
                             <option value="dualsnubhex">dualsnubhex</option>
                             <option value="dualrhombitrihex">dualrhombitrihex</option>
+                            <option value="pinwheel-1">pinwheel-1</option>
+                            <option value="pinwheel-2">pinwheel-2</option>
                         </select>
                     </div>
                     <div>

js/app.js

@@ -47,7 +47,7 @@ const DEFAULTS = Object.assign(
 
 function params() {
     const PARAMS = Object.fromEntries(Object.keys(DEFAULTS).map((k) => [k, DEFAULTS[k](document.getElementById(k))]));
-    PARAMS.c = PARAMS.l ? "levo" : "dextro";
+    PARAMS.c = PARAMS.l;
     return PARAMS;
 }
 
@@ -61,7 +61,7 @@ function params_to_tag(PARAMS) {
         "R=" + PARAMS.R,
         "t=" + PARAMS.t,
         `s=${(PARAMS.s * 100).toFixed(2)}%`,
-        "c=" + PARAMS.c,
+        "c=" + (PARAMS.c ? "levo" : "dextro"),
         "@(" + [PARAMS.θ, PARAMS.ψ, PARAMS.φ].map((e) => e + "°").join(",") + ")",
     ].join(",");
 }
@@ -160,7 +160,6 @@ function update(e) {
             `T-Number=(${h})²+(${h})(${k})+(${k})²=${h * h + h * k + k * k}`,
             `Q-Number=(${H})²+(${H})(${K})+(${K})²=${H * H + H * K + K * K}`,
         ].join("\n");
-        if (PARAMS.c === "levo") paper.view.scale(1, -1);
     } catch (e) {
         console.log(e);
         paper.clear();