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

remove 'fm:{label,series}' attributes from generated svg

parent 20b473cf

core/graphics/svgtarget.h

+2 −7
Original line number Diff line number Diff line
@@ -92,14 +92,12 @@ public: 
    // FIXPAUL escape me

    SVG_appendLine(

        "<rect x='%f' y='%f' width='%f' height='%f' class='%s' "

            "fm:series='%s' fm:label='%s' style='%s'></rect>\n",

            "style='%s'></rect>\n",

        x,

        y,

        width,

        height,

        escapeString(class_str).c_str(),

        escapeString(series).c_str(),

        escapeString(label).c_str(),

        escapeString(style_str).c_str());

  }
@@ -174,14 +172,11 @@ public: 
    /* point_type: circle */

    // FIXPAUL escape label

    SVG_appendLine(

        "<circle cx='%f' cy='%f' r='%f' class='%s' fm:label='%s' "

            "fm:series='%s', style='%s'></circle>\n",

        "<circle cx='%f' cy='%f' r='%f' class='%s' style='%s'></circle>\n",

        x,

        y,

        point_type == "none" ? 0 : point_size,

        escapeString(class_str).c_str(),

        escapeString(label).c_str(),

        escapeString(series).c_str(),

        escapeString(style_str).c_str());

  }

test/plot/ChartTest_TestHorizontalBarChart_out.svg

+6 −6
Original line number Diff line number Diff line
@@ -218,11 +218,11 @@ 
    <line x1='50.000000' y1='25.000000' x2='50.000000' y2='295.000000' class='stroke' />

  </g>

  <g class='bars horizontal'>

    <rect x='50.000000' y='34.900000' width='636.363636' height='25.199999' class='bar color1' fm:series='unnamed' fm:label='A: 40.0' style=''></rect>

    <rect x='50.000000' y='79.900000' width='556.818182' height='25.199999' class='bar color1' fm:series='unnamed' fm:label='B: 35.0' style=''></rect>

    <rect x='50.000000' y='124.900000' width='477.272727' height='25.199999' class='bar color1' fm:series='unnamed' fm:label='C: 30.0' style=''></rect>

    <rect x='50.000000' y='169.900000' width='397.727273' height='25.199999' class='bar color1' fm:series='unnamed' fm:label='D: 25.0' style=''></rect>

    <rect x='50.000000' y='214.900000' width='318.181818' height='25.199999' class='bar color1' fm:series='unnamed' fm:label='E: 20.0' style=''></rect>

    <rect x='50.000000' y='259.900000' width='238.636364' height='25.199999' class='bar color1' fm:series='unnamed' fm:label='F: 15.0' style=''></rect>

    <rect x='50.000000' y='34.900000' width='636.363636' height='25.199999' class='bar color1' style=''></rect>

    <rect x='50.000000' y='79.900000' width='556.818182' height='25.199999' class='bar color1' style=''></rect>

    <rect x='50.000000' y='124.900000' width='477.272727' height='25.199999' class='bar color1' style=''></rect>

    <rect x='50.000000' y='169.900000' width='397.727273' height='25.199999' class='bar color1' style=''></rect>

    <rect x='50.000000' y='214.900000' width='318.181818' height='25.199999' class='bar color1' style=''></rect>

    <rect x='50.000000' y='259.900000' width='238.636364' height='25.199999' class='bar color1' style=''></rect>

  </g>

</svg>

test/plot/ChartTest_TestHorizontalMulitSeriesBarChart_out.svg

+12 −12
Original line number Diff line number Diff line
@@ -218,17 +218,17 @@ 
    <line x1='50.000000' y1='25.000000' x2='50.000000' y2='295.000000' class='stroke' />

  </g>

  <g class='bars horizontal'>

    <rect x='50.000000' y='33.325000' width='391.608392' height='12.600000' class='bar color1' fm:series='unnamed' fm:label='A: 40.0, A: 23.0' style=''></rect>

    <rect x='50.000000' y='49.075000' width='225.174825' height='12.600000' class='bar color2' fm:series='unnamed' fm:label='A: 40.0, A: 23.0' style=''></rect>

    <rect x='50.000000' y='78.325000' width='342.657343' height='12.600000' class='bar color1' fm:series='unnamed' fm:label='B: 35.0, B: 65.0' style=''></rect>

    <rect x='50.000000' y='94.075000' width='636.363636' height='12.600000' class='bar color2' fm:series='unnamed' fm:label='B: 35.0, B: 65.0' style=''></rect>

    <rect x='50.000000' y='123.325000' width='293.706294' height='12.600000' class='bar color1' fm:series='unnamed' fm:label='C: 30.0, C: 43.0' style=''></rect>

    <rect x='50.000000' y='139.075000' width='420.979021' height='12.600000' class='bar color2' fm:series='unnamed' fm:label='C: 30.0, C: 43.0' style=''></rect>

    <rect x='50.000000' y='168.325000' width='244.755245' height='12.600000' class='bar color1' fm:series='unnamed' fm:label='D: 25.0, D: 12.0' style=''></rect>

    <rect x='50.000000' y='184.075000' width='117.482517' height='12.600000' class='bar color2' fm:series='unnamed' fm:label='D: 25.0, D: 12.0' style=''></rect>

    <rect x='50.000000' y='213.325000' width='195.804196' height='12.600000' class='bar color1' fm:series='unnamed' fm:label='E: 20.0, E: 54.0' style=''></rect>

    <rect x='50.000000' y='229.075000' width='528.671329' height='12.600000' class='bar color2' fm:series='unnamed' fm:label='E: 20.0, E: 54.0' style=''></rect>

    <rect x='50.000000' y='258.325000' width='146.853147' height='12.600000' class='bar color1' fm:series='unnamed' fm:label='F: 15.0, F: 31.0' style=''></rect>

    <rect x='50.000000' y='274.075000' width='303.496503' height='12.600000' class='bar color2' fm:series='unnamed' fm:label='F: 15.0, F: 31.0' style=''></rect>

    <rect x='50.000000' y='33.325000' width='391.608392' height='12.600000' class='bar color1' style=''></rect>

    <rect x='50.000000' y='49.075000' width='225.174825' height='12.600000' class='bar color2' style=''></rect>

    <rect x='50.000000' y='78.325000' width='342.657343' height='12.600000' class='bar color1' style=''></rect>

    <rect x='50.000000' y='94.075000' width='636.363636' height='12.600000' class='bar color2' style=''></rect>

    <rect x='50.000000' y='123.325000' width='293.706294' height='12.600000' class='bar color1' style=''></rect>

    <rect x='50.000000' y='139.075000' width='420.979021' height='12.600000' class='bar color2' style=''></rect>

    <rect x='50.000000' y='168.325000' width='244.755245' height='12.600000' class='bar color1' style=''></rect>

    <rect x='50.000000' y='184.075000' width='117.482517' height='12.600000' class='bar color2' style=''></rect>

    <rect x='50.000000' y='213.325000' width='195.804196' height='12.600000' class='bar color1' style=''></rect>

    <rect x='50.000000' y='229.075000' width='528.671329' height='12.600000' class='bar color2' style=''></rect>

    <rect x='50.000000' y='258.325000' width='146.853147' height='12.600000' class='bar color1' style=''></rect>

    <rect x='50.000000' y='274.075000' width='303.496503' height='12.600000' class='bar color2' style=''></rect>

  </g>

</svg>

test/plot/ChartTest_TestHorizontalRangeBarChart_out.svg

+12 −12
Original line number Diff line number Diff line
@@ -219,17 +219,17 @@ 
    <line x1='50.000000' y1='25.000000' x2='50.000000' y2='275.000000' class='stroke' />

  </g>

  <g class='bars horizontal'>

    <rect x='220.512821' y='32.708334' width='358.974359' height='11.666666' class='bar color1' fm:series='myseries1' fm:label='A: -40.0, 40.0, A: -23.0, 23.0' style=''></rect>

    <rect x='296.794872' y='47.291667' width='206.410256' height='11.666666' class='bar color2' fm:series='myseries2' fm:label='A: -40.0, 40.0, A: -23.0, 23.0' style=''></rect>

    <rect x='242.948718' y='74.375000' width='314.102564' height='11.666666' class='bar color1' fm:series='myseries1' fm:label='B: -35.0, 35.0, B: -65.0, 65.0' style=''></rect>

    <rect x='108.333333' y='88.958333' width='583.333333' height='11.666666' class='bar color2' fm:series='myseries2' fm:label='B: -35.0, 35.0, B: -65.0, 65.0' style=''></rect>

    <rect x='265.384615' y='116.041667' width='269.230769' height='11.666666' class='bar color1' fm:series='myseries1' fm:label='C: -30.0, 30.0, C: -43.0, 43.0' style=''></rect>

    <rect x='207.051282' y='130.625000' width='385.897436' height='11.666666' class='bar color2' fm:series='myseries2' fm:label='C: -30.0, 30.0, C: -43.0, 43.0' style=''></rect>

    <rect x='287.820513' y='157.708334' width='224.358974' height='11.666666' class='bar color1' fm:series='myseries1' fm:label='D: -25.0, 25.0, D: -12.0, 12.0' style=''></rect>

    <rect x='346.153846' y='172.291667' width='107.692308' height='11.666666' class='bar color2' fm:series='myseries2' fm:label='D: -25.0, 25.0, D: -12.0, 12.0' style=''></rect>

    <rect x='310.256410' y='199.375000' width='179.487179' height='11.666666' class='bar color1' fm:series='myseries1' fm:label='E: -20.0, 20.0, E: -54.0, 54.0' style=''></rect>

    <rect x='157.692308' y='213.958333' width='484.615385' height='11.666666' class='bar color2' fm:series='myseries2' fm:label='E: -20.0, 20.0, E: -54.0, 54.0' style=''></rect>

    <rect x='332.692308' y='241.041667' width='134.615385' height='11.666666' class='bar color1' fm:series='myseries1' fm:label='F: -15.0, 15.0, F: -31.0, 31.0' style=''></rect>

    <rect x='260.897436' y='255.625000' width='278.205128' height='11.666666' class='bar color2' fm:series='myseries2' fm:label='F: -15.0, 15.0, F: -31.0, 31.0' style=''></rect>

    <rect x='220.512821' y='32.708334' width='358.974359' height='11.666666' class='bar color1' style=''></rect>

    <rect x='296.794872' y='47.291667' width='206.410256' height='11.666666' class='bar color2' style=''></rect>

    <rect x='242.948718' y='74.375000' width='314.102564' height='11.666666' class='bar color1' style=''></rect>

    <rect x='108.333333' y='88.958333' width='583.333333' height='11.666666' class='bar color2' style=''></rect>

    <rect x='265.384615' y='116.041667' width='269.230769' height='11.666666' class='bar color1' style=''></rect>

    <rect x='207.051282' y='130.625000' width='385.897436' height='11.666666' class='bar color2' style=''></rect>

    <rect x='287.820513' y='157.708334' width='224.358974' height='11.666666' class='bar color1' style=''></rect>

    <rect x='346.153846' y='172.291667' width='107.692308' height='11.666666' class='bar color2' style=''></rect>

    <rect x='310.256410' y='199.375000' width='179.487179' height='11.666666' class='bar color1' style=''></rect>

    <rect x='157.692308' y='213.958333' width='484.615385' height='11.666666' class='bar color2' style=''></rect>

    <rect x='332.692308' y='241.041667' width='134.615385' height='11.666666' class='bar color1' style=''></rect>

    <rect x='260.897436' y='255.625000' width='278.205128' height='11.666666' class='bar color2' style=''></rect>

  </g>

</svg>

test/plot/ChartTest_TestHorizontalStackedBarChart_out.svg

+12 −12
Original line number Diff line number Diff line
@@ -218,17 +218,17 @@ 
    <line x1='50.000000' y1='25.000000' x2='50.000000' y2='295.000000' class='stroke' />

  </g>

  <g class='bars horizontal'>

    <rect x='50.000000' y='31.750000' width='254.545455' height='31.499999' class='bar color1' fm:series='unnamed' fm:label='A: 40.0, A: 23.0' style=''></rect>

    <rect x='304.545455' y='31.750000' width='146.363636' height='31.499999' class='bar color2' fm:series='unnamed' fm:label='A: 40.0, A: 23.0' style=''></rect>

    <rect x='50.000000' y='76.750000' width='222.727273' height='31.499999' class='bar color1' fm:series='unnamed' fm:label='B: 35.0, B: 65.0' style=''></rect>

    <rect x='272.727273' y='76.750000' width='413.636364' height='31.499999' class='bar color2' fm:series='unnamed' fm:label='B: 35.0, B: 65.0' style=''></rect>

    <rect x='50.000000' y='121.750000' width='190.909091' height='31.499999' class='bar color1' fm:series='unnamed' fm:label='C: 30.0, C: 43.0' style=''></rect>

    <rect x='240.909091' y='121.750000' width='273.636364' height='31.499999' class='bar color2' fm:series='unnamed' fm:label='C: 30.0, C: 43.0' style=''></rect>

    <rect x='50.000000' y='166.750000' width='159.090909' height='31.499999' class='bar color1' fm:series='unnamed' fm:label='D: 25.0, D: 12.0' style=''></rect>

    <rect x='209.090909' y='166.750000' width='76.363636' height='31.499999' class='bar color2' fm:series='unnamed' fm:label='D: 25.0, D: 12.0' style=''></rect>

    <rect x='50.000000' y='211.750000' width='127.272727' height='31.499999' class='bar color1' fm:series='unnamed' fm:label='E: 20.0, E: 54.0' style=''></rect>

    <rect x='177.272727' y='211.750000' width='343.636364' height='31.499999' class='bar color2' fm:series='unnamed' fm:label='E: 20.0, E: 54.0' style=''></rect>

    <rect x='50.000000' y='256.750000' width='95.454545' height='31.499999' class='bar color1' fm:series='unnamed' fm:label='F: 15.0, F: 31.0' style=''></rect>

    <rect x='145.454545' y='256.750000' width='197.272727' height='31.499999' class='bar color2' fm:series='unnamed' fm:label='F: 15.0, F: 31.0' style=''></rect>

    <rect x='50.000000' y='31.750000' width='254.545455' height='31.499999' class='bar color1' style=''></rect>

    <rect x='304.545455' y='31.750000' width='146.363636' height='31.499999' class='bar color2' style=''></rect>

    <rect x='50.000000' y='76.750000' width='222.727273' height='31.499999' class='bar color1' style=''></rect>

    <rect x='272.727273' y='76.750000' width='413.636364' height='31.499999' class='bar color2' style=''></rect>

    <rect x='50.000000' y='121.750000' width='190.909091' height='31.499999' class='bar color1' style=''></rect>

    <rect x='240.909091' y='121.750000' width='273.636364' height='31.499999' class='bar color2' style=''></rect>

    <rect x='50.000000' y='166.750000' width='159.090909' height='31.499999' class='bar color1' style=''></rect>

    <rect x='209.090909' y='166.750000' width='76.363636' height='31.499999' class='bar color2' style=''></rect>

    <rect x='50.000000' y='211.750000' width='127.272727' height='31.499999' class='bar color1' style=''></rect>

    <rect x='177.272727' y='211.750000' width='343.636364' height='31.499999' class='bar color2' style=''></rect>

    <rect x='50.000000' y='256.750000' width='95.454545' height='31.499999' class='bar color1' style=''></rect>

    <rect x='145.454545' y='256.750000' width='197.272727' height='31.499999' class='bar color2' style=''></rect>

  </g>

</svg>

CRA Git | Maintained and supported by SUSTech CRA and CCSE