Commit 23485e0e authored by Paul Asmuth's avatar Paul Asmuth
Browse files

fix horizontal bar charts, test runner

parent 7f48decd

examples/barcharts/horizontal_bars.svg

+18 −18
Original line number Diff line number Diff line
@@ -19,22 +19,22 @@ 
  <text x="92.562500" y="283.260859" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">India</text>

  <text x="97.453125" y="322.391292" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Italy</text>

  <text x="87.671875" y="361.521725" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Brazil</text>

  <path fill="#4572a7" d="M20.0 31.744926 L1069.716364 31.744926 L1069.716364 55.211593 L20.0 55.211593 "/>

  <path fill="#4572a7" d="M20.0 70.87536 L652.287273 70.87536 L652.287273 94.342026 L20.0 94.342026 "/>

  <path fill="#4572a7" d="M20.0 110.005793 L298.210909 110.005793 L298.210909 133.472459 L20.0 133.472459 "/>

  <path fill="#4572a7" d="M20.0 149.136226 L215.976364 149.136226 L215.976364 172.602893 L20.0 172.602893 "/>

  <path fill="#4572a7" d="M20.0 188.266659 L169.194545 188.266659 L169.194545 211.733326 L20.0 211.733326 "/>

  <path fill="#4572a7" d="M20.0 227.397092 L158.936364 227.397092 L158.936364 250.863759 L20.0 250.863759 "/>

  <path fill="#4572a7" d="M20.0 266.527525 L147.325455 266.527525 L147.325455 289.994192 L20.0 289.994192 "/>

  <path fill="#4572a7" d="M20.0 305.657959 L124.723636 305.657959 L124.723636 329.124625 L20.0 329.124625 "/>

  <path fill="#4572a7" d="M20.0 344.788392 L121.172727 344.788392 L121.172727 368.255058 L20.0 368.255058 "/>

  <text x="1078.516364" y="48.478260" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$18,624bln</text>

  <text x="661.087273" y="87.608693" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$11,218bln</text>

  <text x="307.010909" y="126.739126" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$11,218bln</text>

  <text x="224.776364" y="165.869559" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$11,218bln</text>

  <text x="177.994545" y="204.999992" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$11,218bln</text>

  <text x="167.736364" y="244.130426" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$2,465bln</text>

  <text x="156.125455" y="283.260859" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$2.259bln</text>

  <text x="133.523636" y="322.391292" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$1.858bln</text>

  <text x="129.972727" y="361.521725" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$1.795bln</text>

  <path fill="#4572a7" d="M136.108333 31.744926 L1087.533715 31.744926 L1087.533715 55.211593 L136.108333 55.211593 "/>

  <path fill="#4572a7" d="M136.108333 70.87536 L709.190911 70.87536 L709.190911 94.342026 L136.108333 94.342026 "/>

  <path fill="#4572a7" d="M136.108333 110.005793 L388.268755 110.005793 L388.268755 133.472459 L136.108333 133.472459 "/>

  <path fill="#4572a7" d="M136.108333 149.136226 L313.734303 149.136226 L313.734303 172.602893 L136.108333 172.602893 "/>

  <path fill="#4572a7" d="M136.108333 188.266659 L271.332935 188.266659 L271.332935 211.733326 L136.108333 211.733326 "/>

  <path fill="#4572a7" d="M136.108333 227.397092 L262.035286 227.397092 L262.035286 250.863759 L136.108333 250.863759 "/>

  <path fill="#4572a7" d="M136.108333 266.527525 L251.511573 266.527525 L251.511573 289.994192 L136.108333 289.994192 "/>

  <path fill="#4572a7" d="M136.108333 305.657959 L231.026093 305.657959 L231.026093 329.124625 L136.108333 329.124625 "/>

  <path fill="#4572a7" d="M136.108333 344.788392 L227.807676 344.788392 L227.807676 368.255058 L136.108333 368.255058 "/>

  <text x="1096.333715" y="48.478260" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$18,624bln</text>

  <text x="717.990911" y="87.608693" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$11,218bln</text>

  <text x="397.068755" y="126.739126" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$11,218bln</text>

  <text x="322.534303" y="165.869559" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$11,218bln</text>

  <text x="280.132935" y="204.999992" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$11,218bln</text>

  <text x="270.835286" y="244.130426" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$2,465bln</text>

  <text x="260.311573" y="283.260859" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$2.259bln</text>

  <text x="239.826093" y="322.391292" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$1.858bln</text>

  <text x="236.607676" y="361.521725" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">$1.795bln</text>

</svg>
 
 No newline at end of file

examples/barcharts/horizontal_ranges.svg

+12 −12
Original line number Diff line number Diff line
@@ -82,16 +82,16 @@ 
  <text x="924.563021" y="34.000000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">50.0</text>

  <text x="1044.097604" y="34.000000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">60.0</text>

  <text x="1163.632187" y="34.000000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">70.0</text>

  <path fill="#4572a7" d="M863.2 410.466667 L751.6 410.466667 L751.6 422.2 L863.2 422.2 "/>

  <path fill="#4572a7" d="M1136.0 337.133333 L801.2 337.133333 L801.2 348.866667 L1136.0 348.866667 "/>

  <path fill="#4572a7" d="M900.4 263.8 L863.2 263.8 L863.2 275.533333 L900.4 275.533333 "/>

  <path fill="#4572a7" d="M801.2 190.466667 L739.2 190.466667 L739.2 202.2 L801.2 202.2 "/>

  <path fill="#4572a7" d="M801.2 117.133333 L590.4 117.133333 L590.4 128.866667 L801.2 128.866667 "/>

  <path fill="#4572a7" d="M1012.0 43.8 L739.2 43.8 L739.2 55.533333 L1012.0 55.533333 "/>

  <path fill="#aa4643" d="M999.6 424.466667 L156.4 424.466667 L156.4 436.2 L999.6 436.2 "/>

  <path fill="#aa4643" d="M1049.2 351.133333 L206.0 351.133333 L206.0 362.866667 L1049.2 362.866667 "/>

  <path fill="#aa4643" d="M1111.2 277.8 L330.0 277.8 L330.0 289.533333 L1111.2 289.533333 "/>

  <path fill="#aa4643" d="M987.2 204.466667 L280.4 204.466667 L280.4 216.2 L987.2 216.2 "/>

  <path fill="#aa4643" d="M838.4 131.133333 L553.2 131.133333 L553.2 142.866667 L838.4 142.866667 "/>

  <path fill="#aa4643" d="M987.2 57.8 L181.2 57.8 L181.2 69.533333 L987.2 69.533333 "/>

  <path fill="#4572a7" d="M855.16225 385.688889 L747.581125 385.688889 L747.581125 397.422222 L855.16225 397.422222 "/>

  <path fill="#4572a7" d="M1118.138333 322.266667 L795.394958 322.266667 L795.394958 334.0 L1118.138333 334.0 "/>

  <path fill="#4572a7" d="M891.022625 258.844444 L855.16225 258.844444 L855.16225 270.577778 L891.022625 270.577778 "/>

  <path fill="#4572a7" d="M795.394958 195.422222 L735.627667 195.422222 L735.627667 207.155556 L795.394958 207.155556 "/>

  <path fill="#4572a7" d="M795.394958 132.0 L592.186167 132.0 L592.186167 143.733333 L795.394958 143.733333 "/>

  <path fill="#4572a7" d="M998.60375 68.577778 L735.627667 68.577778 L735.627667 80.311111 L998.60375 80.311111 "/>

  <path fill="#aa4643" d="M986.650292 399.688889 L173.815125 399.688889 L173.815125 411.422222 L986.650292 411.422222 "/>

  <path fill="#aa4643" d="M1034.464125 336.266667 L221.628958 336.266667 L221.628958 348.0 L1034.464125 348.0 "/>

  <path fill="#aa4643" d="M1094.231417 272.844444 L341.163542 272.844444 L341.163542 284.577778 L1094.231417 284.577778 "/>

  <path fill="#aa4643" d="M974.696833 209.422222 L293.349708 209.422222 L293.349708 221.155556 L974.696833 221.155556 "/>

  <path fill="#aa4643" d="M831.255333 146.0 L556.325792 146.0 L556.325792 157.733333 L831.255333 157.733333 "/>

  <path fill="#aa4643" d="M974.696833 82.577778 L197.722042 82.577778 L197.722042 94.311111 L974.696833 94.311111 "/>

</svg>
 
 No newline at end of file

source/elements/bars.cc

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ ReturnCode draw_horizontal( 
    PlotBarsConfig config,

    const LayoutInfo& layout,

    Layer* layer) {

  const auto& clip = layout.bounding_box;

  const auto& clip = layout.content_box;



  /* convert units */

  convert_units(

tests/spec/barchart/test_bars_histogram_horizontal.svg

+6 −6
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ 
  <text x="20.000000" y="114.204044" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">4.0</text>

  <text x="20.000000" y="82.345459" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">5.0</text>

  <text x="20.000000" y="50.486874" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">6.0</text>

  <path fill="#888888" d="M20.0 221.575759 L380.0 221.575759 L380.0 240.242425 L20.0 240.242425 "/>

  <path fill="#888888" d="M20.0 185.212123 L180.159826 185.212123 L180.159826 203.87879 L20.0 203.87879 "/>

  <path fill="#888888" d="M20.0 148.848488 L88.116908 148.848488 L88.116908 167.515155 L20.0 167.515155 "/>

  <path fill="#888888" d="M20.0 112.484853 L66.497023 112.484853 L66.497023 131.151519 L20.0 131.151519 "/>

  <path fill="#888888" d="M20.0 76.121217 L20.0 76.121217 L20.0 94.787884 L20.0 94.787884 "/>

  <path fill="#888888" d="M20.0 39.757582 L20.0 39.757582 L20.0 58.424249 L20.0 58.424249 "/>

  <path fill="#888888" d="M52.123958 195.446465 L380.0 195.446465 L380.0 214.113132 L52.123958 214.113132 "/>

  <path fill="#888888" d="M52.123958 163.587881 L197.992208 163.587881 L197.992208 182.254547 L52.123958 182.254547 "/>

  <path fill="#888888" d="M52.123958 131.729296 L114.162575 131.729296 L114.162575 150.395962 L52.123958 150.395962 "/>

  <path fill="#888888" d="M52.123958 99.870711 L94.471902 99.870711 L94.471902 118.537377 L52.123958 118.537377 "/>

  <path fill="#888888" d="M52.123958 68.012126 L52.123958 68.012126 L52.123958 86.678792 L52.123958 86.678792 "/>

  <path fill="#888888" d="M52.123958 36.153541 L52.123958 36.153541 L52.123958 54.820207 L52.123958 54.820207 "/>

</svg>
 
 No newline at end of file

tests/spec/barchart/test_bars_horizontal_ranges.svg

+12 −12
Original line number Diff line number Diff line
@@ -82,16 +82,16 @@ 
  <text x="924.563021" y="34.000000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">50.0</text>

  <text x="1044.097604" y="34.000000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">60.0</text>

  <text x="1163.632187" y="34.000000" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">70.0</text>

  <path fill="#4572a7" d="M863.2 388.89804 L751.6 388.89804 L751.6 400.631373 L863.2 400.631373 "/>

  <path fill="#4572a7" d="M1136.0 324.192159 L801.2 324.192159 L801.2 335.925492 L1136.0 335.925492 "/>

  <path fill="#4572a7" d="M900.4 259.486277 L863.2 259.486277 L863.2 271.219611 L900.4 271.219611 "/>

  <path fill="#4572a7" d="M801.2 194.780396 L739.2 194.780396 L739.2 206.513729 L801.2 206.513729 "/>

  <path fill="#4572a7" d="M801.2 130.074514 L590.4 130.074514 L590.4 141.807848 L801.2 141.807848 "/>

  <path fill="#4572a7" d="M1012.0 65.368633 L739.2 65.368633 L739.2 77.101966 L1012.0 77.101966 "/>

  <path fill="#aa4643" d="M999.6 402.89804 L156.4 402.89804 L156.4 414.631373 L999.6 414.631373 "/>

  <path fill="#aa4643" d="M1049.2 338.192159 L206.0 338.192159 L206.0 349.925492 L1049.2 349.925492 "/>

  <path fill="#aa4643" d="M1111.2 273.486277 L330.0 273.486277 L330.0 285.219611 L1111.2 285.219611 "/>

  <path fill="#aa4643" d="M987.2 208.780396 L280.4 208.780396 L280.4 220.513729 L987.2 220.513729 "/>

  <path fill="#aa4643" d="M838.4 144.074514 L553.2 144.074514 L553.2 155.807848 L838.4 155.807848 "/>

  <path fill="#aa4643" d="M987.2 79.368633 L181.2 79.368633 L181.2 91.101966 L987.2 91.101966 "/>

  <path fill="#4572a7" d="M855.16225 367.035295 L747.581125 367.035295 L747.581125 378.768628 L855.16225 378.768628 "/>

  <path fill="#4572a7" d="M1118.138333 311.074511 L795.394958 311.074511 L795.394958 322.807845 L1118.138333 322.807845 "/>

  <path fill="#4572a7" d="M891.022625 255.113728 L855.16225 255.113728 L855.16225 266.847061 L891.022625 266.847061 "/>

  <path fill="#4572a7" d="M795.394958 199.152944 L735.627667 199.152944 L735.627667 210.886278 L795.394958 210.886278 "/>

  <path fill="#4572a7" d="M795.394958 143.192161 L592.186167 143.192161 L592.186167 154.925494 L795.394958 154.925494 "/>

  <path fill="#4572a7" d="M998.60375 87.231377 L735.627667 87.231377 L735.627667 98.964711 L998.60375 98.964711 "/>

  <path fill="#aa4643" d="M986.650292 381.035295 L173.815125 381.035295 L173.815125 392.768628 L986.650292 392.768628 "/>

  <path fill="#aa4643" d="M1034.464125 325.074511 L221.628958 325.074511 L221.628958 336.807845 L1034.464125 336.807845 "/>

  <path fill="#aa4643" d="M1094.231417 269.113728 L341.163542 269.113728 L341.163542 280.847061 L1094.231417 280.847061 "/>

  <path fill="#aa4643" d="M974.696833 213.152944 L293.349708 213.152944 L293.349708 224.886278 L974.696833 224.886278 "/>

  <path fill="#aa4643" d="M831.255333 157.192161 L556.325792 157.192161 L556.325792 168.925494 L831.255333 168.925494 "/>

  <path fill="#aa4643" d="M974.696833 101.231377 L197.722042 101.231377 L197.722042 112.964711 L974.696833 112.964711 "/>

</svg>
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE