Commit 06830f32 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

fix remaining test cases

parent 480fa9e6
Loading
Loading
Loading
Loading
+23 −29
Original line number Diff line number Diff line
(width 2048px)
(height 512px)
(dpi 240)
(layer/resize 2048px 512px)
(layer/set-dpi 240)
(layer/set-font "Comic Sans MS")

(font "Comic Sans MS")
(limit-x (1404278100 1404299700))
(limit-y (0 120))

(axes
(tools/plotgen
    limit-x (1404278100 1404299700)
    limit-y (0 120)
    grid (
        color #fff)
    axes (
        position (bottom left)
        label-format-y (fixed 2)
        label-format-x (datetime "%H:%M:%S")
        label-placement-x (linear 2400)
        label-placement-y (linear 20))

;; (draw/rectangle fill #f2f2f2)

(grid
    color #fff)

(lines
    lines (
        data-x (csv "test/testdata/measurement.csv" time)
        data-y (csv "test/testdata/measurement.csv" value2))

(legend
    legend (
        position (top right)
        border none
        margin 0.5em
        item-flow on
    item (label "A very serious measurement"))
        item (label "A very serious measurement")))
+22 −22
Original line number Diff line number Diff line
@@ -2,6 +2,28 @@
<!-- Generated by clip v0.6.0 (clip-lang.org) -->
<svg xmlns="http://www.w3.org/2000/svg" width="2048.000000" height="512.000000">
  <rect width="2048.000000" height="512.000000" fill="#ffffff" fill-opacity="1.000000"/>
  <path d="M0 512 L0 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M204.8 512 L204.8 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M409.6 512 L409.6 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M614.4 512 L614.4 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M819.2 512 L819.2 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1024 512 L1024 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1228.8 512 L1228.8 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1433.6 512 L1433.6 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1638.4 512 L1638.4 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1843.2 512 L1843.2 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M2048 512 L2048 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 0 L2048 0 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 51.2 L2048 51.2 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 102.4 L2048 102.4 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 153.6 L2048 153.6 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 204.8 L2048 204.8 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 256 L2048 256 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 307.2 L2048 307.2 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 358.4 L2048 358.4 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 409.6 L2048 409.6 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 460.8 L2048 460.8 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M0 512 L2048 512 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 394 L2011.33 394 " fill="none" stroke-width="3.333333" stroke="#000000ff"/>
  <path d="M181.141 394 L181.141 380.667 " fill="none" stroke-width="3.333333" stroke="#000000ff"/>
  <path d="M384.495 394 L384.495 380.667 " fill="none" stroke-width="3.333333" stroke="#000000ff"/>
@@ -137,28 +159,6 @@
  <path fill="#000000ff" d="M102.745 53.6667 Q101.807 53.6667 101.159 53.0885 Q100.51 52.5104 100.51 51.6667 Q100.51 50.8385 101.159 50.2526 Q101.807 49.6667 102.745 49.6667 Q103.682 49.6667 104.339 50.2526 Q104.995 50.8385 104.995 51.6667 Q104.995 52.5104 104.339 53.0885 Q103.682 53.6667 102.745 53.6667 Z"/>
  <path fill="#000000ff" d="M118.104 51.6667 Q112.604 51.6667 110.073 46.776 Q108.167 43.026 108.167 36.9948 Q108.167 31.901 110.651 28.1042 Q113.604 23.6667 118.651 23.6667 Q123.401 23.6667 126.057 27.6042 Q128.354 31.0104 128.354 35.9167 Q128.354 43.776 125.792 47.7214 Q123.229 51.6667 118.104 51.6667 ZM118.635 27.6667 Q115.276 27.6667 113.307 30.7917 Q111.667 33.401 111.667 36.7604 Q111.667 42.2135 113.276 44.9401 Q114.885 47.6667 118.104 47.6667 Q121.932 47.6667 123.589 43.6667 Q124.745 40.8854 124.745 36.6198 Q124.745 32.1354 123.221 29.901 Q121.698 27.6667 118.635 27.6667 Z"/>
  <path fill="#000000ff" d="M140.479 51.6667 Q134.979 51.6667 132.448 46.776 Q130.542 43.026 130.542 36.9948 Q130.542 31.901 133.026 28.1042 Q135.979 23.6667 141.026 23.6667 Q145.776 23.6667 148.432 27.6042 Q150.729 31.0104 150.729 35.9167 Q150.729 43.776 148.167 47.7214 Q145.604 51.6667 140.479 51.6667 ZM141.01 27.6667 Q137.651 27.6667 135.682 30.7917 Q134.042 33.401 134.042 36.7604 Q134.042 42.2135 135.651 44.9401 Q137.26 47.6667 140.479 47.6667 Q144.307 47.6667 145.964 43.6667 Q147.12 40.8854 147.12 36.6198 Q147.12 32.1354 145.596 29.901 Q144.073 27.6667 141.01 27.6667 Z"/>
  <path d="M181.141 394 L181.141 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M364.16 394 L364.16 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M547.179 394 L547.179 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M730.198 394 L730.198 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M913.218 394 L913.218 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1096.24 394 L1096.24 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1279.26 394 L1279.26 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1462.28 394 L1462.28 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1645.29 394 L1645.29 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M1828.31 394 L1828.31 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M2011.33 394 L2011.33 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 36.6667 L2011.33 36.6667 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 72.4 L2011.33 72.4 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 108.133 L2011.33 108.133 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 143.867 L2011.33 143.867 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 179.6 L2011.33 179.6 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 215.333 L2011.33 215.333 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 251.067 L2011.33 251.067 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 286.8 L2011.33 286.8 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 322.533 L2011.33 322.533 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 358.267 L2011.33 358.267 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 394 L2011.33 394 " fill="none" stroke-width="3.333333" stroke="#ffffffff"/>
  <path d="M181.141 300.23 L206.56 308.042 L231.979 370.705 L257.399 367.868 L282.818 354.665 L308.237 384.751 L333.657 386.942 L359.076 367.927 L384.495 350.061 L409.915 386.282 L435.334 364.32 L460.753 372.648 L486.173 324.893 L511.592 340.114 L537.011 360.305 L562.431 336.949 L587.85 364.156 L613.269 375.746 L638.689 385.282 L664.108 385.661 L689.527 385.614 L714.947 342.015 L740.366 175.659 L765.786 48.9403 L791.205 54.9104 L816.624 65.7901 L842.044 213.728 L867.463 253.23 L892.882 327.585 L918.302 366.145 L943.721 379.729 L969.14 376.161 L994.56 380.502 L1019.98 376.187 L1045.4 333.341 L1070.82 329.592 L1096.24 328.073 L1121.66 311.362 L1147.08 319.044 L1172.5 332.224 L1197.91 325.978 L1223.33 304.638 L1248.75 271.624 L1274.17 275.363 L1299.59 253.655 L1325.01 287.896 L1350.43 303.172 L1375.85 338.536 L1401.27 320.146 L1426.69 259.222 L1452.11 247.523 L1477.53 276.848 L1502.95 282.924 L1528.37 274.539 L1553.79 258.984 L1579.2 320.714 L1604.62 340.757 L1630.04 285.593 L1655.46 321.485 L1680.88 361.538 L1706.3 357.355 L1731.72 315.846 L1757.14 346.691 L1782.56 349.982 L1807.98 356.138 L1833.4 349.619 L1858.82 355.781 L1884.24 332.717 L1909.66 352.92 L1935.08 340.307 L1960.49 327.666 L1985.91 338.86 L2011.33 361.289 " fill="none" stroke-width="5.000000" stroke="#000000ff"/>
  <path fill="#000000ff" d="M1495.47 118 Q1493.82 118 1492.58 113.734 Q1492.11 112.094 1491.41 108 Q1489.57 108.234 1486.58 108.844 L1481.79 109.766 Q1480.88 112.219 1478.69 116.953 Q1478.11 118 1477.11 118 Q1476.4 118 1475.83 117.469 Q1475.26 116.938 1475.26 116.141 Q1475.26 115.25 1477.99 109.406 Q1477.68 108.922 1477.68 108.297 Q1477.68 106.797 1479.46 106.375 Q1481.52 102.359 1484.66 97.125 Q1488.94 90 1489.99 90 Q1491.41 90 1491.94 92.0625 L1493.08 98.3281 L1495.77 111.281 L1496.8 114.172 Q1497.32 115.656 1497.32 116.156 Q1497.32 116.938 1496.76 117.469 Q1496.19 118 1495.47 118 ZM1489.1 96.8594 L1483.93 105.656 Q1486.11 104.984 1490.57 104.016 L1489.1 96.8594 Z"/>
  <path fill="#000000ff" d=""/>
+12 −12
Original line number Diff line number Diff line
(width 2048px)
(height 1024px)
(dpi 240)
(layer/resize 2048px 1024px)
(layer/set-dpi 240)

;;(set color-palette (#0c0 #c00 #00c))

(legend
(tools/plotgen
    legend (
        item (label "Test Color 1" color 1)
        item (label "Test Color 2" color 2)
        item (label "Test Color 3" color 3)
@@ -12,4 +12,4 @@
        item (label "Test Color 5" color 5)
        item (label "Test Color 6" color 6)
        item (label "Test Color 7" color 7)
    item (label "Test Color 8" color 8))
        item (label "Test Color 8" color 8)))
+12 −15
Original line number Diff line number Diff line
(dpi 400)
(width 3600px)
(height 1920px)
(layer/resize 3600px 1920px)
(layer/set-dpi 400)

;;(set text-script "Arabic")

(legend
(tools/plotgen
    legend (
        border none
        margin 0
        item (label "北京市 (Beijing)" color #06c)
@@ -12,5 +10,4 @@
        item (label "القاهرة (Cairo)" color #c06)
        item (label "Москва" color #60c)
        item (label "東京都 (Tokyo)" color #6c0)
  item (label "서울 (Seoul)"))
        item (label "서울 (Seoul)")))
+57 −67
Original line number Diff line number Diff line
(width 1600px)
(height 800px)
(dpi 240)
(layer/resize 1600px 800px)
(layer/set-dpi 240)

;;(set color-palette zhang)

(limit-x (0 100))
(limit-y (0 90))

(axes
(tools/plotgen
    limit-x (0 100)
    limit-y (0 90)
    axes (
        position (bottom left)
        label-placement-y (linear-interval 10 10 80)
        border-style-left none
        label-offset-left 0
        label-attach-left left
        label-color-left #666)

(grid
    grid (
        tick-placement-x (none)
        tick-placement-y (linear-interval 10 10 80)
    color (rgba 0 0 0 .1))

(areas
        color (rgba 0 0 0 0.1))
    areas (
        data-x (5 10 20 30 40 50 60 70 80 90 100)
        data-y (7 13 17 27 38 39 52 59 48 60 65)
        color 5
        stroke-width .6pt
    stroke-color (rgba 0 0 0 .5))

(areas
        stroke-color (rgba 0 0 0 0.5))
    areas (
        data-x (5 10 20 30 40 50 60 70 80 90 100)
        data-y (4 12 15 22 35 38 47 47 42 53 60)
        color 4
        stroke-width .6pt
    stroke-color (rgba 0 0 0 .4))

(areas
        stroke-color (rgba 0 0 0 0.4))
    areas (
        data-x (5 10 20 30 40 50 60 70 80 90 100)
        data-y (3 10 10 18 32 34 42 40 36 46 54)
        color 3
        stroke-width .6pt
    stroke-color (rgba 0 0 0 .5))

(areas
        stroke-color (rgba 0 0 0 0.5))
    areas (
        data-x (5 10 20 30 40 50 60 70 80 90 100)
        data-y (2 6 6 8 18 20 30 30 30 36 35)
        color 2
        stroke-width .6pt
    stroke-color (rgba 0 0 0 .5))

(areas
        stroke-color (rgba 0 0 0 0.5))
    areas (
        data-x (5 10 20 30 40 50 60 70 80 90 100)
        data-y (1 2 4 7 13 15 20 16 18 23 18)
        color 1
        stroke-width .6pt
    stroke-color (rgba 0 0 0 .5))

(legend
        stroke-color (rgba 0 0 0 0.5))
    legend (
        position (top right)
        margin 0
        padding 0
@@ -64,4 +54,4 @@
        item (label "Series B" color 2)
        item (label "Series C" color 3)
        item (label "Series D" color 4)
    item (label "Series E" color 5))
        item (label "Series E" color 5)))
Loading