diff options
-rw-r--r-- | TurtleArt/tawindow.py | 23 | ||||
-rw-r--r-- | TurtleArtActivity.py | 27 | ||||
-rw-r--r-- | images/Cartesian.svg | 406 |
3 files changed, 241 insertions, 215 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 10867dc..c5ab0c6 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -349,6 +349,7 @@ class TurtleArtWindow(): if self.running_sugar: self.activity.check_buttons_for_fit() + self.activity.update_palette_from_metadata() def _set_screen_dpi(self): dpi = get_screen_dpi() @@ -1895,17 +1896,21 @@ before making changes to your program')) elif spr.name == _('shift'): self._shift_toolbar_palette(self.selected_palette) else: - self.orientation = 1 - self.orientation - self.palette_button[self.orientation].set_layer(TAB_LAYER) - self.palette_button[1 - self.orientation].hide() - self.palette_sprs[self.selected_palette][ - 1 - self.orientation].hide() - self._layout_palette(self.selected_palette) - self.show_palette(self.selected_palette) + self.set_orientation(1 - self.orientation) elif spr.type == 'toolbar': self._select_toolbar_button(spr) return False + def set_orientation(self, orientation): + self.orientation = orientation + self.palette_button[self.orientation].set_layer(TAB_LAYER) + self.palette_button[1 - self.orientation].hide() + spr = self.palette_sprs[self.selected_palette][1 - self.orientation] + if spr is not None: + spr.hide() + self._layout_palette(self.selected_palette) + self.show_palette(self.selected_palette) + def _update_action_names(self, name): ''' change the label on action blocks of the same name ''' if isinstance(name, (float, int)): @@ -3643,7 +3648,7 @@ before making changes to your program')) i += 1 while(not p[i].get_visibility()): i += 1 - if i == len(p) - 1: + if i >= len(p) - 1: i = 0 if i < len(p): self._highlighted_blk = p[i] @@ -4001,8 +4006,6 @@ before making changes to your program')) self.new_project() self.process_data(data_from_file(ta_file)) self._loaded_project = ta_file - # Always start on the Turtle palette - self.show_toolbar_palette(palette_name_to_index('turtle')) def load_file_from_chooser(self, create_new_project=True): ''' Load a project from file chooser ''' diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index e96c8fb..47627ef 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -165,6 +165,21 @@ class TurtleArtActivity(activity.Activity): self.init_complete = True + def update_palette_from_metadata(self): + if 'palette' in self.metadata: + n = int(self.metadata['palette']) + if n == -1: + self.tw.hideshow_palette(False) + else: + # Set radio button to active + if n < len(self.palette_buttons): + self.palette_buttons[n].set_active(True) + if 'orientation' in self.metadata: + self.tw.set_orientation(int(self.metadata['orientation'])) + else: + # Else start on the Turtle palette + self.tw.show_palette(n=0) + def check_buttons_for_fit(self): ''' Check to see which set of buttons to display ''' if not self.has_toolbarbox: @@ -359,7 +374,7 @@ class TurtleArtActivity(activity.Activity): if self.tw.palette: self.tw.hideshow_palette(False) self.do_hidepalette() - if self.has_toolbarbox and self.tw.selected_palette is not None: + if not self.has_toolbarbox and self.tw.selected_palette is not None: self.palette_buttons[self.tw.selected_palette].set_icon( palette_names[self.tw.selected_palette] + 'off') else: @@ -1297,8 +1312,14 @@ class TurtleArtActivity(activity.Activity): data_to_file(self.tw.assemble_data_to_save(), file_path) self.metadata['mime_type'] = MIMETYPE[0] self.metadata['turtle blocks'] = ''.join(self.tw.used_block_list) - self.metadata['public'] = data_to_string(['activity count', - 'turtle blocks']) + # Deprecated + # self.metadata['public'] = data_to_string(['activity count', + # 'turtle blocks']) + if self.tw.palette: + self.metadata['palette'] = str(self.tw.selected_palette) + else: + self.metadata['palette'] = '-1' + self.metadata['orientation'] = str(self.tw.orientation) if len(self.error_list) > 0: errors = [] if 'error_list' in self.metadata: diff --git a/images/Cartesian.svg b/images/Cartesian.svg index 7a29e22..b34751f 100644 --- a/images/Cartesian.svg +++ b/images/Cartesian.svg @@ -1,211 +1,213 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.0" + version="1.2" width="1200" height="900" id="svg2"> - <defs - id="defs4" /> - <g - id="layer1"> - <path - d="M 0,850 L 1200,850" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 0,750 L 1200,750" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 0,650 L 1200,650" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 0,550 L 1200,550" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 0,350 L 1200,350" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 0,250 L 1200,250" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 0,150 L 1200,150" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 0,50 L 1200,50" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 1100,0 L 1100,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 1000,0 L 1000,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 900,0 L 900,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 800,0 L 800,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 700,0 L 700,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 500,0 L 500,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 400,0 L 400,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 300,0 L 300,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 200,0 L 200,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 100,0 L 100,900" - style="fill:none;stroke:#AAAAAA;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 590,850 L 610,850" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 590,750 L 610,750" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 590,650 L 610,650" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 590,550 L 610,550" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 0,450 L 1200,450" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 590,350 L 610,350" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 590,250 L 610,250" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 590,150 L 610,150" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 590,50 L 610,50" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 1100,440 L 1100,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 1000,440 L 1000,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 900,440 L 900,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 800,440 L 800,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 700,440 L 700,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 600,0 L 600,900" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 500,440 L 500,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 400,440 L 400,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 300,440 L 300,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 200,440 L 200,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> - <path - d="M 100,440 L 100,460" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> -<!-- - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="95" - y="480">–500</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="195" - y="480">–400</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="295" - y="480">–300</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="395" - y="480">–200</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="495" - y="480">–100</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="650" - y="480">x</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="700" - y="480">100</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="800" - y="480">200</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="900" - y="480">300</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="1000" - y="480">400</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#0000FF;fill-opacity:1;stroke:none;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans"><tspan - x="1100" - y="480">500</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="58">400</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="158">300</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="258">200</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="358">100</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="408">y</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="558">–100</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="658">–200</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="758">–300</tspan></text> - <text - style="font-size:20px;font-style:normal;font-weight:normal;fill:#00AA00;fill-opacity:1;stroke:none;text-anchor:end;text-align:end;font-family:Bitstream Vera Sans"><tspan - x="590" - y="858">–400</tspan></text> ---> - </g> + <path + d="m 0,850 1200,0" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 0,750 1200,0" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 0,650 1200,0" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 0,550 1200,0" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 0,350 1200,0" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 0,250 1200,0" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 0,150 1200,0" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 0,50 1200,0" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 1100,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 1000,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 900,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 800,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 700,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 500,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 400,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 300,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 200,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 100,0 0,900" + style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 590,850 20,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 590,750 20,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 590,650 20,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 590,550 20,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 0,450 1200,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 590,350 20,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 590,250 20,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 590,150 20,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 590,50 20,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 1100,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 1000,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 900,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 800,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 700,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 600,0 0,900" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 500,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 400,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 300,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 200,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <path + d="m 100,440 0,20" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" /> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="90" + y="447" + style="font-size:24px">-25</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="190" + y="447" + style="font-size:24px">-20</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="290" + y="447" + style="font-size:24px">-15</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="390" + y="447" + style="font-size:24px">-10</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="490" + y="447" + style="font-size:24px">-5</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="700" + y="447" + style="font-size:24px">5</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="800" + y="447" + style="font-size:24px">10</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="600" + y="447" + style="font-size:24px">0</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="900" + y="447" + style="font-size:24px">15</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="1000" + y="447" + style="font-size:24px">20</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="1100" + y="447" + style="font-size:24px">25</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="590" + y="747" + style="font-size:24px">-15</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="590" + y="647" + style="font-size:24px">-10</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="590" + y="547" + style="font-size:24px">-5</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="600" + y="347" + style="font-size:24px">5</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="600" + y="247" + style="font-size:24px">10</tspan></text> + <text + style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><tspan + x="600" + y="147" + style="font-size:24px">15</tspan></text> </svg> |