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

improved scatterplot label placement, update default marker size

parent 1c17cd5c

elements/plot/points.cc

+2 −4
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ using namespace std::placeholders; 


namespace fviz::elements::plot::points {



static const double kDefaultPointSizePT = 2;

static const double kDefaultPointSizeMinPT = 1;

static const double kDefaultPointSizeMaxPT = 24;

static const double kDefaultPointSizePT = 4;

static const double kDefaultLabelPaddingEM = 0.4;



struct PlotPointsConfig {
@@ -114,7 +112,7 @@ ReturnCode draw( 
        ? 0

        : config->sizes[i % config->sizes.size()].value;



    auto label_padding = size + measure_or(

    auto label_padding = size * 0.5 + measure_or(

        config->label_padding,

        from_em(kDefaultLabelPaddingEM, config->label_font_size));

examples/charts-basic/scatterplot.svg

+1000 −1000

File changed.

Preview size limit exceeded, changes collapsed.

examples/charts-basic/scatterplot_with_labels.svg

+12 −12
Original line number Diff line number Diff line
@@ -35,18 +35,18 @@ 
  <path fill="#000000" d="M285.343 183.179 M283.343 183.179 a1 1 0 1 0 2 0 a1 1 0 1 0 -2 0 "/>

  <path fill="#000000" d="M223.595 367.779 M219.595 367.779 a2 2 0 1 0 4 0 a2 2 0 1 0 -4 0 "/>

  <path fill="#000000" d="M167.348 359.388 M150.348 359.388 a8.5 8.5 0 1 0 17 0 a8.5 8.5 0 1 0 -17 0 "/>

  <text x="531.254834" y="105.380045" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">5</text>

  <text x="558.550481" y="305.544218" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">23</text>

  <text x="590.471127" y="61.620862" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">11</text>

  <text x="656.749920" y="323.739683" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">9</text>

  <text x="715.419338" y="134.139229" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">14</text>

  <text x="782.245005" y="106.575510" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">8</text>

  <text x="405.759749" y="105.380045" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">5</text>

  <text x="374.385978" y="169.507483" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">8</text>

  <text x="338.934081" y="246.807710" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">23</text>

  <text x="280.264663" y="171.312018" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">2</text>

  <text x="217.517121" y="353.912472" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">4</text>

  <text x="150.691453" y="332.521542" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">17</text>

  <text x="531.254834" y="107.880045" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">5</text>

  <text x="558.550481" y="317.044218" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">23</text>

  <text x="590.471127" y="67.120862" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">11</text>

  <text x="656.749920" y="328.239683" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">9</text>

  <text x="715.419338" y="141.139229" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">14</text>

  <text x="782.245005" y="110.575510" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">8</text>

  <text x="405.759749" y="107.880045" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">5</text>

  <text x="374.385978" y="173.507483" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">8</text>

  <text x="338.934081" y="258.307710" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">23</text>

  <text x="280.264663" y="172.312018" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">2</text>

  <text x="217.517121" y="355.912472" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">4</text>

  <text x="150.691453" y="341.021542" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">17</text>

  <path fill="#000000" d="M757.044 47.4222 M747.044 47.4222 a5 5 0 1 0 10 0 a5 5 0 1 0 -10 0 "/>

  <text x="763.544444" y="52.422222" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Random Data</text>

  <path stroke-width="0.000000" stroke="#333333" fill="none" d="M64.7264 430.711 L880.444 430.711 "/>

examples/charts-custom/multiple_y_axes.svg

+5 −5
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
  <path fill="#0000cc" d="M763.836 260.444 M755.836 260.444 a4 4 0 1 0 8 0 a4 4 0 1 0 -8 0 "/>

  <path fill="#cc0000" d="M963.836 160.444 M955.836 160.444 a4 4 0 1 0 8 0 a4 4 0 1 0 -8 0 "/>

  <path fill="#0000cc" d="M363.836 360.444 M355.836 360.444 a4 4 0 1 0 8 0 a4 4 0 1 0 -8 0 "/>

  <text x="153.835764" y="241.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">A</text>

  <text x="553.835764" y="141.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">B</text>

  <text x="753.835764" y="241.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">A</text>

  <text x="953.835764" y="141.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">B</text>

  <text x="353.835764" y="341.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">A</text>

  <text x="153.835764" y="245.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">A</text>

  <text x="553.835764" y="145.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">B</text>

  <text x="753.835764" y="245.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">A</text>

  <text x="953.835764" y="145.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">B</text>

  <text x="353.835764" y="345.244444" fill="#000000" font-size="18.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">A</text>

  <path stroke-width="1.333333" stroke="#333333" fill="none" d="M848.32 19.5556 L848.32 460.444 "/>

  <path stroke-width="1.333333" stroke="#333333" fill="none" d="M842.987 460.444 L848.32 460.444 "/>

  <path stroke-width="1.333333" stroke="#333333" fill="none" d="M842.987 416.356 L848.32 416.356 "/>

examples/charts-reference/markers.svg

+4 −4
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
  <path fill="#000000" d="M164.508 39.1111 M148.508 39.1111 a8 8 0 1 0 16 0 a8 8 0 1 0 -16 0 "/>

  <text x="267.904762" y="44.611111" fill="#000000" font-size="16.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">⬢</text>

  <text x="385.301587" y="44.611111" fill="#000000" font-size="16.000000" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">⬡</text>

  <text x="21.978299" y="13.244444" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">circle</text>

  <text x="143.453249" y="13.244444" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">disk</text>

  <text x="245.764137" y="13.244444" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">hexagon</text>

  <text x="356.637525" y="13.244444" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">hexagon-o</text>

  <text x="21.978299" y="21.244444" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">circle</text>

  <text x="143.453249" y="21.244444" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">disk</text>

  <text x="245.764137" y="21.244444" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">hexagon</text>

  <text x="356.637525" y="21.244444" fill="#000000" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">hexagon-o</text>

</svg>
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE