Commit f34d1941 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

update test files, examples

parent e333e53b

elements/chart/linechart.cc

+5 −2
Original line number Diff line number Diff line
@@ -39,9 +39,12 @@ ReturnCode build( 
    {"data-x", bind(&expr_rewritev, _1, "data-x", &geom_opts)},

    {"data-y", bind(&expr_rewritev, _1, "data-y", &geom_opts)},

    {"color", bind(&expr_rewritev, _1, "color", &geom_opts)},

    {"stroke", bind(&expr_rewritev, _1, "stroke", &geom_opts)},

    {"stroke-width", bind(&expr_rewritev, _1, "stroke-width", &geom_opts)},

    {"stroke-style", bind(&expr_rewritev, _1, "stroke-style", &geom_opts)},

    {"stroke-color", bind(&expr_rewritev, _1, "stroke-color", &geom_opts)},

    {"marker-size", bind(&expr_rewritev, _1, "marker-size", &geom_opts)},

    {"marker-sizes", bind(&expr_rewritev, _1, "marker-sizes", &geom_opts)},

    {"marker-shape", bind(&expr_rewritev, _1, "marker-shape", &geom_opts)},

    {"marker-color", bind(&expr_rewritev, _1, "marker-color", &geom_opts)},

    {"labels", bind(&expr_rewritev, _1, "labels", &geom_opts)},

    {"label-font-size", bind(&expr_rewritev, _1, "label-font-size", &geom_opts)},

    {"label-color", bind(&expr_rewritev, _1, "label-color", &geom_opts)},

examples/examples.yaml

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
    - file: charts-scientific/line_markers

    - file: charts-scientific/errorbars_log

    - file: charts-scientific/multiple_y_axes

    - file: charts-scientific/scatterplot_colors

    - file: charts-scientific/barchart_ranges

    - file: charts-scientific/scatterplot_colors



- section: Editorial Charts

  files:

tests/spec/areachart.svg

+1 −25
Original line number Diff line number Diff line 
<svg xmlns="http://www.w3.org/2000/svg" width="900.000000" height="480.000000" viewBox="0 0 900 480">

  <rect width="900.000000" height="480.000000" fill="#ffffff"/>

  <path fill="#eeeeee" d="M88.5406 14.6667 L885.333 14.6667 L885.333 435.6 L88.5406 435.6 L88.5406 14.6667 "/>

  <path fill="#eeeeee" d="M88.5406 14.6667 L885.333 14.6667 L885.333 435.6 L88.5406 435.6 Z"/>

  <path stroke-width="1.333333" stroke="#ffffff" fill="none" d="M88.5406 14.6667 L88.5406 435.6 "/>

  <path stroke-width="1.333333" stroke="#ffffff" fill="none" d="M168.22 14.6667 L168.22 435.6 "/>

  <path stroke-width="1.333333" stroke="#ffffff" fill="none" d="M247.899 14.6667 L247.899 435.6 "/>
@@ -24,18 +24,6 @@ 
  <path stroke-width="1.333333" stroke="#ffffff" fill="none" d="M88.5406 56.76 L885.333 56.76 "/>

  <path stroke-width="1.333333" stroke="#ffffff" fill="none" d="M88.5406 14.6667 L885.333 14.6667 "/>

  <path fill="#888888" d="M88.5406 14.6667 L98.0263 104.307 L109.142 159.51 L120.258 155.097 L131.374 199.672 L142.49 227.759 L153.606 246.483 L164.722 257.954 L175.838 287.32 L186.954 235.225 L198.07 251.627 L209.186 301.903 L220.302 237.689 L231.418 245.53 L242.534 295.14 L253.65 288.447 L264.766 321.532 L275.882 344.178 L286.998 378.76 L298.114 391.594 L309.23 409.464 L320.346 270.37 L331.462 166.698 L342.578 138.629 L353.694 163.433 L364.81 220.766 L375.925 300.263 L387.041 293.933 L398.157 341.925 L409.273 358.148 L420.389 380.958 L431.505 360.28 L442.621 385.504 L453.737 337.171 L464.853 297.629 L475.969 379.852 L487.085 390.309 L498.201 403.484 L509.317 435.6 L520.433 369.012 L531.549 339.658 L542.665 342.725 L553.781 358.99 L564.897 315.349 L576.013 383.753 L587.129 337.315 L598.245 318.447 L609.361 320.517 L620.477 345.424 L631.593 294.066 L642.709 285.576 L653.825 252.368 L664.941 294.032 L676.057 335.871 L687.173 369.075 L698.289 305.107 L709.405 335.233 L720.521 328.793 L731.637 386.069 L742.752 402.573 L753.868 385.054 L764.984 398.351 L776.1 384.675 L787.216 361.94 L798.332 369.359 L809.448 354.243 L820.564 331.44 L831.68 344.088 L842.796 364.684 L853.912 289.797 L865.028 279.774 L876.144 239.133 L885.333 243.345 L885.333 435.6 L876.144 435.6 L865.028 435.6 L853.912 435.6 L842.796 435.6 L831.68 435.6 L820.564 435.6 L809.448 435.6 L798.332 435.6 L787.216 435.6 L776.1 435.6 L764.984 435.6 L753.868 435.6 L742.752 435.6 L731.637 435.6 L720.521 435.6 L709.405 435.6 L698.289 435.6 L687.173 435.6 L676.057 435.6 L664.941 435.6 L653.825 435.6 L642.709 435.6 L631.593 435.6 L620.477 435.6 L609.361 435.6 L598.245 435.6 L587.129 435.6 L576.013 435.6 L564.897 435.6 L553.781 435.6 L542.665 435.6 L531.549 435.6 L520.433 435.6 L509.317 435.6 L498.201 435.6 L487.085 435.6 L475.969 435.6 L464.853 435.6 L453.737 435.6 L442.621 435.6 L431.505 435.6 L420.389 435.6 L409.273 435.6 L398.157 435.6 L387.041 435.6 L375.925 435.6 L364.81 435.6 L353.694 435.6 L342.578 435.6 L331.462 435.6 L320.346 435.6 L309.23 435.6 L298.114 435.6 L286.998 435.6 L275.882 435.6 L264.766 435.6 L253.65 435.6 L242.534 435.6 L231.418 435.6 L220.302 435.6 L209.186 435.6 L198.07 435.6 L186.954 435.6 L175.838 435.6 L164.722 435.6 L153.606 435.6 L142.49 435.6 L131.374 435.6 L120.258 435.6 L109.142 435.6 L98.0263 435.6 L88.5406 435.6 Z"/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 435.6 L885.333 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 430.267 L88.5406 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M168.22 430.267 L168.22 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M247.899 430.267 L247.899 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M327.578 430.267 L327.578 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M407.258 430.267 L407.258 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M486.937 430.267 L486.937 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M566.616 430.267 L566.616 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M646.296 430.267 L646.296 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M725.975 430.267 L725.975 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M805.654 430.267 L805.654 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M885.333 430.267 L885.333 435.6 "/>

  <path fill="#000000" d="M7.75 -5.5 Q7.75 -2.82812 6.84375 -1.41406 Q5.9375 0 4.15625 0 Q2.375 0 1.48438 -1.40625 Q0.59375 -2.8125 0.59375 -5.5 Q0.59375 -8.25 1.46094 -9.625 Q2.32812 -11 4.20312 -11 Q6.01562 -11 6.88281 -9.60938 Q7.75 -8.21875 7.75 -5.5 ZM6.42188 -5.5 Q6.42188 -7.84375 5.90625 -8.89062 Q5.39062 -9.9375 4.20312 -9.9375 Q2.98438 -9.9375 2.45312 -8.90625 Q1.92188 -7.875 1.92188 -5.5 Q1.92188 -3.20312 2.46094 -2.14062 Q3 -1.07812 4.17188 -1.07812 Q5.34375 -1.07812 5.88281 -2.16406 Q6.42188 -3.25 6.42188 -5.5 Z" transform="translate(59.9938 461.333)"/>

  <path fill="#000000" d="M7.71875 -3.65625 Q7.71875 -1.95312 6.75 -0.976562 Q5.78125 0 4.04688 0 Q2.60938 0 1.71875 -0.601562 Q0.828125 -1.20312 0.59375 -2.34375 L1.9375 -2.48438 Q2.35938 -1.07812 4.07812 -1.07812 Q5.14062 -1.07812 5.74219 -1.75781 Q6.34375 -2.4375 6.34375 -3.625 Q6.34375 -4.65625 5.74219 -5.28906 Q5.14062 -5.92188 4.10938 -5.92188 Q3.57812 -5.92188 3.11719 -5.75 Q2.65625 -5.57812 2.1875 -5.17188 L0.90625 -5.17188 L1.25 -11 L7.10938 -11 L7.10938 -9.875 L2.45312 -9.875 L2.25 -6.34375 Q3.10938 -7 4.39062 -7 Q5.90625 -7 6.8125 -6.07031 Q7.71875 -5.14062 7.71875 -3.65625 Z" transform="translate(68.15 461.333)"/>

  <path fill="#000000" d="M1.375 -6 L1.375 -8 L2.79688 -8 L2.79688 -6 L1.375 -6 ZM1.375 0 L1.375 -2 L2.79688 -2 L2.79688 0 L1.375 0 Z" transform="translate(76.3063 461.333)"/>
@@ -124,18 +112,6 @@ 
  <path fill="#000000" d="M1.375 -6 L1.375 -8 L2.79688 -8 L2.79688 -6 L1.375 -6 ZM1.375 0 L1.375 -2 L2.79688 -2 L2.79688 0 L1.375 0 Z" transform="translate(892.943 461.333)"/>

  <path fill="#000000" d="M7.75 -5.5 Q7.75 -2.82812 6.84375 -1.41406 Q5.9375 0 4.15625 0 Q2.375 0 1.48438 -1.40625 Q0.59375 -2.8125 0.59375 -5.5 Q0.59375 -8.25 1.46094 -9.625 Q2.32812 -11 4.20312 -11 Q6.01562 -11 6.88281 -9.60938 Q7.75 -8.21875 7.75 -5.5 ZM6.42188 -5.5 Q6.42188 -7.84375 5.90625 -8.89062 Q5.39062 -9.9375 4.20312 -9.9375 Q2.98438 -9.9375 2.45312 -8.90625 Q1.92188 -7.875 1.92188 -5.5 Q1.92188 -3.20312 2.46094 -2.14062 Q3 -1.07812 4.17188 -1.07812 Q5.34375 -1.07812 5.88281 -2.16406 Q6.42188 -3.25 6.42188 -5.5 Z" transform="translate(897.021 461.333)"/>

  <path fill="#000000" d="M7.6875 -2.98438 Q7.6875 -1.57812 6.78125 -0.789062 Q5.875 0 4.17188 0 Q2.51562 0 1.58594 -0.773438 Q0.65625 -1.54688 0.65625 -2.96875 Q0.65625 -3.96875 1.23438 -4.64844 Q1.8125 -5.32812 2.70312 -5.46875 L2.70312 -5.5 Q1.85938 -5.71875 1.375 -6.4375 Q0.890625 -7.15625 0.890625 -8.125 Q0.890625 -9.40625 1.77344 -10.2031 Q2.65625 -11 4.14062 -11 Q5.67188 -11 6.55469 -10.2188 Q7.4375 -9.4375 7.4375 -8.10938 Q7.4375 -7.14062 6.94531 -6.42188 Q6.45312 -5.70312 5.60938 -5.51562 L5.60938 -5.48438 Q6.59375 -5.32812 7.14062 -4.65625 Q7.6875 -3.98438 7.6875 -2.98438 ZM6.0625 -8.04688 Q6.0625 -10.0156 4.14062 -10.0156 Q3.20312 -10.0156 2.71875 -9.52344 Q2.23438 -9.03125 2.23438 -8.04688 Q2.23438 -7.04688 2.73438 -6.52344 Q3.23438 -6 4.15625 -6 Q5.09375 -6 5.57812 -6.48438 Q6.0625 -6.96875 6.0625 -8.04688 ZM6.32812 -3.10938 Q6.32812 -4.0625 5.75781 -4.53906 Q5.1875 -5.01562 4.15625 -5.01562 Q3.14062 -5.01562 2.57812 -4.5 Q2.01562 -3.98438 2.01562 -3.07812 Q2.01562 -0.984375 4.1875 -0.984375 Q5.26562 -0.984375 5.79688 -1.49219 Q6.32812 -2 6.32812 -3.10938 Z" transform="translate(905.177 461.333)"/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 14.6667 L88.5406 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 435.6 L93.874 435.6 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 393.507 L93.874 393.507 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 351.413 L93.874 351.413 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 309.32 L93.874 309.32 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 267.227 L93.874 267.227 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 225.133 L93.874 225.133 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 183.04 L93.874 183.04 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 140.947 L93.874 140.947 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 98.8533 L93.874 98.8533 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 56.76 L93.874 56.76 "/>

  <path stroke-width="0.000000" stroke="#000000" fill="none" d="M88.5406 14.6667 L93.874 14.6667 "/>

  <path fill="#000000" d="M7.59375 -9.92188 Q6 -7.32812 5.35156 -5.85938 Q4.70312 -4.39062 4.375 -2.96094 Q4.04688 -1.53125 4.04688 0 L2.67188 0 Q2.67188 -2.125 3.50781 -4.46875 Q4.34375 -6.8125 6.3125 -9.875 L0.765625 -9.875 L0.765625 -11 L7.59375 -11 L7.59375 -9.92188 Z" transform="translate(14.6667 440.6)"/>

  <path fill="#000000" d="M1.375 0 L1.375 -2 L2.79688 -2 L2.79688 0 L1.375 0 Z" transform="translate(22.8229 440.6)"/>

  <path fill="#000000" d="M7.6875 -3.01562 Q7.6875 -1.57812 6.78125 -0.789062 Q5.875 0 4.1875 0 Q2.625 0 1.6875 -0.703125 Q0.75 -1.40625 0.578125 -2.79688 L1.9375 -2.92188 Q2.20312 -1.09375 4.1875 -1.09375 Q5.17188 -1.09375 5.74219 -1.58594 Q6.3125 -2.07812 6.3125 -3.0625 Q6.3125 -3.90625 5.66406 -4.38281 Q5.01562 -4.85938 3.79688 -4.85938 L3.04688 -4.85938 L3.04688 -6 L3.76562 -6 Q4.84375 -6 5.44531 -6.51562 Q6.04688 -7.03125 6.04688 -7.95312 Q6.04688 -8.85938 5.5625 -9.39062 Q5.07812 -9.92188 4.10938 -9.92188 Q3.25 -9.92188 2.71094 -9.47656 Q2.17188 -9.03125 2.07812 -8.21875 L0.75 -8.32812 Q0.890625 -9.57812 1.79688 -10.2891 Q2.70312 -11 4.125 -11 Q5.67188 -11 6.53125 -10.2266 Q7.39062 -9.45312 7.39062 -8.07812 Q7.39062 -7.03125 6.83594 -6.36719 Q6.28125 -5.70312 5.23438 -5.46875 L5.23438 -5.4375 Q6.39062 -5.3125 7.03906 -4.65625 Q7.6875 -4 7.6875 -3.01562 Z" transform="translate(26.901 440.6)"/>

tests/spec/areas_and_lines.fvz

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
    lines (

        data-x (10 20 30 40 50)

        data-y (1.23 10.32 -6.23 4.43 3.45)

        marker-size (3pt))

        marker-size 3pt)

    legend-overlay (

        position (bottom left)

        background #fff

tests/spec/areas_and_lines.svg

+6 −6
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ 
  <path fill="#cccccc" d="M59.8375 106.992 L194.878 91.344 L329.919 71.784 L600 110.904 L870.081 157.848 L1140.16 110.904 L1140.16 365.184 L870.081 310.416 L600 333.888 L329.919 318.24 L194.878 357.36 L59.8375 373.008 Z"/>

  <path fill="#888888" d="M59.8375 118.728 L194.878 110.904 L329.919 91.344 L600 134.376 L870.081 189.144 L1140.16 122.64 L1140.16 310.416 L870.081 267.384 L600 318.24 L329.919 298.68 L194.878 318.24 L59.8375 333.888 Z"/>

  <path stroke-width="2.000000" stroke="#000000" fill="none" d="M59.8375 235.188 L329.919 199.628 L600 264.372 L870.081 222.67 L1140.16 226.504 "/>

  <path fill="#000000" d="M63.8375 235.188 M55.8375 235.188 a4 4 0 1 0 8 0 a4 4 0 1 0 -8 0 "/>

  <path fill="#000000" d="M333.919 199.628 M325.919 199.628 a4 4 0 1 0 8 0 a4 4 0 1 0 -8 0 "/>

  <path fill="#000000" d="M604 264.372 M596 264.372 a4 4 0 1 0 8 0 a4 4 0 1 0 -8 0 "/>

  <path fill="#000000" d="M874.081 222.67 M866.081 222.67 a4 4 0 1 0 8 0 a4 4 0 1 0 -8 0 "/>

  <path fill="#000000" d="M1144.16 226.504 M1136.16 226.504 a4 4 0 1 0 8 0 a4 4 0 1 0 -8 0 "/>

  <path fill="#ffffff" d="M68.6375 368.8 L169.557 368.8 L169.557 426.8 L68.6375 426.8 L68.6375 368.8 "/>

  <path fill="#000000" d="M61.8375 235.188 M57.8375 235.188 a2 2 0 1 0 4 0 a2 2 0 1 0 -4 0 "/>

  <path fill="#000000" d="M331.919 199.628 M327.919 199.628 a2 2 0 1 0 4 0 a2 2 0 1 0 -4 0 "/>

  <path fill="#000000" d="M602 264.372 M598 264.372 a2 2 0 1 0 4 0 a2 2 0 1 0 -4 0 "/>

  <path fill="#000000" d="M872.081 222.67 M868.081 222.67 a2 2 0 1 0 4 0 a2 2 0 1 0 -4 0 "/>

  <path fill="#000000" d="M1142.16 226.504 M1138.16 226.504 a2 2 0 1 0 4 0 a2 2 0 1 0 -4 0 "/>

  <path fill="#ffffff" d="M68.6375 368.8 L169.557 368.8 L169.557 426.8 L68.6375 426.8 Z"/>

  <path fill="#000000" d="M9.3125 -3.10938 Q9.3125 -1.625 8.19531 -0.8125 Q7.07812 0 5.0625 0 Q1.28125 0 0.6875 -1.71875 L2.03125 -1.89062 Q2.26562 -1.48438 3.03125 -1.28906 Q3.79688 -1.09375 5.10938 -1.09375 Q6.46875 -1.09375 7.20312 -1.58594 Q7.9375 -2.07812 7.9375 -3.03125 Q7.9375 -3.54688 7.70312 -3.875 Q7.46875 -4.20312 7.05469 -4.41406 Q6.64062 -4.625 6.0625 -4.77344 Q5.48438 -4.92188 4.78125 -5.09375 Q3.5625 -5.35938 2.92969 -5.64062 Q2.29688 -5.92188 1.92969 -6.27344 Q1.5625 -6.625 1.36719 -7.08594 Q1.17188 -7.54688 1.17188 -8.14062 Q1.17188 -9.51562 2.1875 -10.2578 Q3.20312 -11 5.09375 -11 Q6.84375 -11 7.77344 -10.6719 Q8.70312 -10.3438 9.07812 -9.54688 L7.70312 -9.39062 Q7.46875 -9.67188 6.83594 -9.80469 Q6.20312 -9.9375 5.07812 -9.9375 Q3.82812 -9.9375 3.17969 -9.50781 Q2.53125 -9.07812 2.53125 -8.21875 Q2.53125 -7.71875 2.78125 -7.39844 Q3.03125 -7.07812 3.50781 -6.85156 Q3.98438 -6.625 5.40625 -6.3125 Q5.875 -6.1875 6.35156 -6.07031 Q6.82812 -5.95312 7.25781 -5.78906 Q7.6875 -5.625 8.0625 -5.40625 Q8.4375 -5.1875 8.71875 -4.86719 Q9 -4.54688 9.15625 -4.11719 Q9.3125 -3.6875 9.3125 -3.10938 Z" transform="translate(99.4375 391.6)"/>

  <path fill="#000000" d="M2.01562 -3.98438 Q2.01562 -2.54688 2.57812 -1.76562 Q3.14062 -0.984375 4.23438 -0.984375 Q5.09375 -0.984375 5.60938 -1.27344 Q6.125 -1.5625 6.3125 -2 L7.46875 -1.70312 Q6.76562 0 4.23438 0 Q2.48438 0 1.5625 -1.02344 Q0.640625 -2.04688 0.640625 -4.04688 Q0.640625 -5.95312 1.5625 -6.97656 Q2.48438 -8 4.1875 -8 Q7.67188 -8 7.67188 -4.14062 L7.67188 -3.98438 L2.01562 -3.98438 ZM6.3125 -5 Q6.20312 -6.0625 5.67188 -6.54688 Q5.14062 -7.03125 4.15625 -7.03125 Q3.20312 -7.03125 2.64062 -6.49219 Q2.07812 -5.95312 2.03125 -5 L6.3125 -5 Z" transform="translate(109.219 391.6)"/>

  <path fill="#000000" d="M1.04688 0 L1.04688 -6.14062 Q1.04688 -6.98438 1 -8 L2.23438 -8 Q2.29688 -6.53125 2.29688 -6.23438 L2.32812 -6.23438 Q2.64062 -7.25 3.05469 -7.625 Q3.46875 -8 4.21875 -8 Q4.48438 -8 4.75 -7.92188 L4.75 -6.71875 Q4.48438 -6.78125 4.04688 -6.78125 Q3.21875 -6.78125 2.78906 -6.08594 Q2.35938 -5.39062 2.35938 -4.07812 L2.35938 0 L1.04688 0 Z" transform="translate(117.375 391.6)"/>

CRA Git | Maintained and supported by SUSTech CRA and CCSE