Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter@walter-laptop.(none)>2010-02-06 16:26:07 (GMT)
committer Walter Bender <walter@walter-laptop.(none)>2010-02-06 16:26:07 (GMT)
commit689bfb96e8fa2a0fa26816059714f5eb2443699a (patch)
tree1a1e946ec86e395d39e3a7de70c3e729c6a19583
parent4610b5c72844e326feeee495ea109a860b025539 (diff)
labeled coordinates
-rw-r--r--TurtleArtActivity.py18
-rw-r--r--images/Cartesian_labeled.svg375
-rw-r--r--images/polar.svg415
-rw-r--r--taconstants.py2
-rwxr-xr-xturtleart.py34
5 files changed, 602 insertions, 242 deletions
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 75270c3..1982336 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -416,10 +416,17 @@ class TurtleArtActivity(activity.Activity):
"""
def _do_cartesian_cb(self, button):
if self.tw.cartesian is True:
- self.tw.overlay_shapes['Cartesian'].hide()
+ if self.tw.coord_scale == 1:
+ self.tw.overlay_shapes['Cartesian_labeled'].hide()
+ else:
+ self.tw.overlay_shapes['Cartesian'].hide()
self.tw.cartesian = False
else:
- self.tw.overlay_shapes['Cartesian'].set_layer(OVERLAY_LAYER)
+ if self.tw.coord_scale == 1:
+ self.tw.overlay_shapes['Cartesian_labeled'].set_layer(
+ OVERLAY_LAYER)
+ else:
+ self.tw.overlay_shapes['Cartesian'].set_layer(OVERLAY_LAYER)
self.tw.cartesian = True
def _do_polar_cb(self, button):
@@ -439,11 +446,18 @@ class TurtleArtActivity(activity.Activity):
self.rescale_button.set_icon("contract-coordinates")
self.rescale_button.set_tooltip(_('Rescale coordinates down'))
self.tw.eraser_button()
+ if self.tw.cartesian is True:
+ self.tw.overlay_shapes['Cartesian_labeled'].hide()
+ self.tw.overlay_shapes['Cartesian'].set_layer(OVERLAY_LAYER)
else:
self.tw.coord_scale = 1
self.rescale_button.set_icon("expand-coordinates")
self.rescale_button.set_tooltip(_('Rescale coordinates up'))
self.tw.eraser_button()
+ if self.tw.cartesian is True:
+ self.tw.overlay_shapes['Cartesian'].hide()
+ self.tw.overlay_shapes['Cartesian_labeled'].set_layer(
+ OVERLAY_LAYER)
"""
Either set up initial share...
diff --git a/images/Cartesian_labeled.svg b/images/Cartesian_labeled.svg
new file mode 100644
index 0000000..e70bb9b
--- /dev/null
+++ b/images/Cartesian_labeled.svg
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.0"
+ width="1200"
+ height="900"
+ id="svg2">
+ <defs
+ id="defs4" />
+ <g
+ id="layer1">
+ <path
+ d="m 0,850 1200,0"
+ id="path5"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 0,750 1200,0"
+ id="path7"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 0,650 1200,0"
+ id="path9"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 0,550 1200,0"
+ id="path11"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 0,350 1200,0"
+ id="path13"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 0,250 1200,0"
+ id="path15"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 0,150 1200,0"
+ id="path17"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 0,50 1200,0"
+ id="path19"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 1100,0 0,900"
+ id="path21"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 1000,0 0,900"
+ id="path23"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 900,0 0,900"
+ id="path25"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 800,0 0,900"
+ id="path27"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 700,0 0,900"
+ id="path29"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 500,0 0,900"
+ id="path31"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 400,0 0,900"
+ id="path33"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 300,0 0,900"
+ id="path35"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 200,0 0,900"
+ id="path37"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 100,0 0,900"
+ id="path39"
+ style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 590,850 20,0"
+ id="path41"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 590,750 20,0"
+ id="path43"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 590,650 20,0"
+ id="path45"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 590,550 20,0"
+ id="path47"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 0,450 1200,0"
+ id="path49"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 590,350 20,0"
+ id="path51"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 590,250 20,0"
+ id="path53"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 590,150 20,0"
+ id="path55"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 590,50 20,0"
+ id="path57"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 1100,440 0,20"
+ id="path59"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 1000,440 0,20"
+ id="path61"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 900,440 0,20"
+ id="path63"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 800,440 0,20"
+ id="path65"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 700,440 0,20"
+ id="path67"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 600,0 0,900"
+ id="path69"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 500,440 0,20"
+ id="path71"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 400,440 0,20"
+ id="path73"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 300,440 0,20"
+ id="path75"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 200,440 0,20"
+ id="path77"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ <path
+ d="m 100,440 0,20"
+ id="path79"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1" />
+ </g>
+ <text
+ x="603.90137"
+ y="344.8584"
+ id="text3218"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="603.90137"
+ y="344.8584"
+ id="tspan3220">100</tspan></text>
+ <text
+ x="604.26758"
+ y="244.8584"
+ id="text3218-8"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="604.26758"
+ y="244.8584"
+ id="tspan3220-7">200</tspan></text>
+ <text
+ x="604.23828"
+ y="144.8584"
+ id="text3218-7"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="604.23828"
+ y="144.8584"
+ id="tspan3220-2">300</tspan></text>
+ <text
+ x="604.51172"
+ y="44.858398"
+ id="text3218-2"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="604.51172"
+ y="44.858398"
+ id="tspan3220-26">400</tspan></text>
+ <text
+ x="1104.2285"
+ y="444.8584"
+ id="text3218-6"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="1104.2285"
+ y="444.8584"
+ id="tspan3220-1">500</tspan></text>
+ <text
+ x="1004.5117"
+ y="444.8584"
+ id="text3218-9"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="1004.5117"
+ y="444.8584"
+ id="tspan3220-4">400</tspan></text>
+ <text
+ x="904.23828"
+ y="444.8584"
+ id="text3218-0"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="904.23828"
+ y="444.8584"
+ id="tspan3220-9">300</tspan></text>
+ <text
+ x="804.26758"
+ y="444.8584"
+ id="text3218-71"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="804.26758"
+ y="444.8584"
+ id="tspan3220-15">200</tspan></text>
+ <text
+ x="703.90137"
+ y="444.8584"
+ id="text3218-76"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="703.90137"
+ y="444.8584"
+ id="tspan3220-73">100</tspan></text>
+ <text
+ x="469.51172"
+ y="444.8584"
+ id="text3218-5"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="469.51172"
+ y="444.8584"
+ id="tspan3220-6">–100</tspan></text>
+ <text
+ x="369.51172"
+ y="444.8584"
+ id="text3218-94"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="369.51172"
+ y="444.8584"
+ id="tspan3220-8">–200</tspan></text>
+ <text
+ x="269.51172"
+ y="444.8584"
+ id="text3218-93"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="269.51172"
+ y="444.8584"
+ id="tspan3220-90">–300</tspan></text>
+ <text
+ x="169.51172"
+ y="444.8584"
+ id="text3218-85"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="169.51172"
+ y="444.8584"
+ id="tspan3220-0">–400</tspan></text>
+ <text
+ x="69.511719"
+ y="444.8584"
+ id="text3218-3"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="69.511719"
+ y="444.8584"
+ id="tspan3220-85">–500</tspan></text>
+ <text
+ x="571.51172"
+ y="544.8584"
+ id="text3218-1"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="571.51172"
+ y="544.8584"
+ id="tspan3220-5">–100</tspan></text>
+ <text
+ x="571.51172"
+ y="644.8584"
+ id="text3218-4"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="571.51172"
+ y="644.8584"
+ id="tspan3220-81">–200</tspan></text>
+ <text
+ x="571.51172"
+ y="744.8584"
+ id="text3218-30"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="571.51172"
+ y="744.8584"
+ id="tspan3220-44">–300</tspan></text>
+ <text
+ x="571.51172"
+ y="844.8584"
+ id="text3218-47"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="571.51172"
+ y="844.8584"
+ id="tspan3220-63">–400</tspan></text>
+ <text
+ x="604.34082"
+ y="444.8584"
+ id="text3218-96"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="604.34082"
+ y="444.8584"
+ id="tspan3220-21">0</tspan></text>
+ <text
+ x="69.140625"
+ y="43.681641"
+ id="text3218-2-7"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="69.140625"
+ y="43.681641"
+ id="tspan3220-26-8">(–500, 400)</tspan></text>
+ <text
+ x="1074.1406"
+ y="43.681641"
+ id="text3218-2-7-5"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="1074.1406"
+ y="43.681641"
+ id="tspan3220-26-8-7">(500, 400)</tspan></text>
+ <text
+ x="1074.1406"
+ y="843.68164"
+ id="text3218-2-7-1"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="1074.1406"
+ y="843.68164"
+ id="tspan3220-26-8-8">(500, –400)</tspan></text>
+ <text
+ x="69.140625"
+ y="843.68164"
+ id="text3218-2-7-1-5"
+ xml:space="preserve"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"><tspan
+ x="69.140625"
+ y="843.68164"
+ id="tspan3220-26-8-8-9">(–500, –400)</tspan></text>
+</svg>
diff --git a/images/polar.svg b/images/polar.svg
index 6a5f841..c1c283a 100644
--- a/images/polar.svg
+++ b/images/polar.svg
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
@@ -7,267 +8,223 @@
width="1200"
height="900"
id="svg2">
+ <text
+ x="596.82129"
+ y="175.8584"
+ id="text3003"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="596.82129"
+ y="175.8584"
+ id="tspan3005"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">0</tspan></text>
+ <text
+ x="869.37012"
+ y="453.64014"
+ id="text3003-4"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="869.37012"
+ y="453.64014"
+ id="tspan3005-7"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">90</tspan></text>
+ <text
+ x="590.23438"
+ y="733.8584"
+ id="text3003-5"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="590.23438"
+ y="733.8584"
+ id="tspan3005-6"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">180</tspan></text>
+ <text
+ x="319.26758"
+ y="453.64014"
+ id="text3003-3"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="319.26758"
+ y="453.64014"
+ id="tspan3005-74"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">270</tspan></text>
+ <text
+ x="733.93848"
+ y="215.30679"
+ id="text3003-52"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="733.93848"
+ y="215.30679"
+ id="tspan3005-5"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">30</tspan></text>
+ <text
+ x="830.63684"
+ y="317.30682"
+ id="text3003-7"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="830.63684"
+ y="317.30682"
+ id="tspan3005-4"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">60</tspan></text>
+ <text
+ x="790.0752"
+ y="260.57425"
+ id="text3003-0"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="790.0752"
+ y="260.57425"
+ id="tspan3005-78"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">45</tspan></text>
+ <text
+ x="355.23846"
+ y="317.30682"
+ id="text3003-52-6"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="355.23846"
+ y="317.30682"
+ id="tspan3005-5-8"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">300</tspan></text>
+ <text
+ x="453.2384"
+ y="215.30679"
+ id="text3003-7-8"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="453.2384"
+ y="215.30679"
+ id="tspan3005-4-4"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">330</tspan></text>
+ <text
+ x="397.23846"
+ y="260.64017"
+ id="text3003-0-3"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="397.23846"
+ y="260.64017"
+ id="tspan3005-78-1"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">315</tspan></text>
+ <text
+ x="355.25311"
+ y="589.97345"
+ id="text3003-52-9"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="355.25311"
+ y="589.97345"
+ id="tspan3005-5-2"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">240</tspan></text>
+ <text
+ x="453.25305"
+ y="695.30682"
+ id="text3003-7-0"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="453.25305"
+ y="695.30682"
+ id="tspan3005-4-6"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">210</tspan></text>
+ <text
+ x="397.25311"
+ y="650.6402"
+ id="text3003-0-8"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="397.25311"
+ y="650.6402"
+ id="tspan3005-78-9"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">225</tspan></text>
+ <text
+ x="730.58643"
+ y="695.30682"
+ id="text3003-52-66"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="730.58643"
+ y="695.30682"
+ id="tspan3005-5-4"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">150</tspan></text>
+ <text
+ x="827.25305"
+ y="589.97345"
+ id="text3003-7-9"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="827.25305"
+ y="589.97345"
+ id="tspan3005-4-5"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">120</tspan></text>
+ <text
+ x="786.58643"
+ y="650.6402"
+ id="text3003-0-0"
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+ x="786.58643"
+ y="650.6402"
+ id="tspan3005-78-4"
+ style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">135</tspan></text>
<defs
id="defs4" />
<path
- d="M 899.66703,-69.03853 L 300.33297,969.03853"
+ d="M 899.66703,-69.03853 300.33297,969.03853"
id="path3403"
- style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 600,-149.33408 L 600,1049.3341"
+ d="m 600,-149.33408 0,1198.66818"
id="path69"
- style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 300.33297,-69.03853 L 899.66703,969.03853"
+ d="M 300.33297,-69.03853 899.66703,969.03853"
id="path3397"
- style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 176.2068,26.20681 L 1023.7932,873.79319"
+ d="m 176.2068,26.20681 847.5864,847.58638"
id="path3405"
- style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 80.961482,150.33296 L 1119.0385,749.66704"
+ d="M 80.961482,150.33296 1119.0385,749.66704"
id="path3399"
- style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 881.14902,435.72711 C 881.14902,630.2662 723.92622,787.97129 529.98206,787.97129 C 336.03789,787.97129 178.81509,630.2662 178.81509,435.72711 C 178.81509,241.18802 336.03789,83.482931 529.98205,83.482931 C 723.92622,83.482931 881.14902,241.18802 881.14902,435.72711 L 881.14902,435.72711 z"
+ d="m 881.14902,435.72711 c 0,194.53909 -157.2228,352.24418 -351.16696,352.24418 -193.94417,0 -351.16697,-157.70509 -351.16697,-352.24418 0,-194.53909 157.2228,-352.244179 351.16696,-352.244179 193.94417,0 351.16697,157.705089 351.16697,352.244179 l 0,0 z"
transform="matrix(1.1334197,0,0,1.1299535,-0.6921025,-42.351375)"
id="path2537"
- style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.88363791;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.88363791;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 881.14902,435.72711 C 881.14902,630.2662 723.92622,787.97129 529.98206,787.97129 C 336.03789,787.97129 178.81509,630.2662 178.81509,435.72711 C 178.81509,241.18802 336.03789,83.482931 529.98205,83.482931 C 723.92622,83.482931 881.14902,241.18802 881.14902,435.72711 L 881.14902,435.72711 z"
+ d="m 881.14902,435.72711 c 0,194.53909 -157.2228,352.24418 -351.16696,352.24418 -193.94417,0 -351.16697,-157.70509 -351.16697,-352.24418 0,-194.53909 157.2228,-352.244179 351.16696,-352.244179 193.94417,0 351.16697,157.705089 351.16697,352.244179 l 0,0 z"
transform="matrix(0.8500647,0,0,0.8474652,149.48096,80.736436)"
id="path3311"
- style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.17818391;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.17818391;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 881.14902,435.72711 C 881.14902,630.2662 723.92622,787.97129 529.98206,787.97129 C 336.03789,787.97129 178.81509,630.2662 178.81509,435.72711 C 178.81509,241.18802 336.03789,83.482931 529.98205,83.482931 C 723.92622,83.482931 881.14902,241.18802 881.14902,435.72711 L 881.14902,435.72711 z"
+ d="m 881.14902,435.72711 c 0,194.53909 -157.2228,352.24418 -351.16696,352.24418 -193.94417,0 -351.16697,-157.70509 -351.16697,-352.24418 0,-194.53909 157.2228,-352.244179 351.16696,-352.244179 193.94417,0 351.16697,157.705089 351.16697,352.244179 l 0,0 z"
transform="matrix(0.5667098,0,0,0.5649768,299.65398,203.82429)"
id="path3313"
- style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.76727581;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.76727581;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 881.14902,435.72711 C 881.14902,630.2662 723.92622,787.97129 529.98206,787.97129 C 336.03789,787.97129 178.81509,630.2662 178.81509,435.72711 C 178.81509,241.18802 336.03789,83.482931 529.98205,83.482931 C 723.92622,83.482931 881.14902,241.18802 881.14902,435.72711 L 881.14902,435.72711 z"
+ d="m 881.14902,435.72711 c 0,194.53909 -157.2228,352.24418 -351.16696,352.24418 -193.94417,0 -351.16697,-157.70509 -351.16697,-352.24418 0,-194.53909 157.2228,-352.244179 351.16696,-352.244179 193.94417,0 351.16697,157.705089 351.16697,352.244179 l 0,0 z"
transform="matrix(0.2833549,0,0,0.2824884,449.82699,326.91215)"
id="path3315"
- style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.53455162;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:3.53455162;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 881.14902,435.72711 C 881.14902,630.2662 723.92622,787.97129 529.98206,787.97129 C 336.03789,787.97129 178.81509,630.2662 178.81509,435.72711 C 178.81509,241.18802 336.03789,83.482931 529.98205,83.482931 C 723.92622,83.482931 881.14902,241.18802 881.14902,435.72711 L 881.14902,435.72711 z"
+ d="m 881.14902,435.72711 c 0,194.53909 -157.2228,352.24418 -351.16696,352.24418 -193.94417,0 -351.16697,-157.70509 -351.16697,-352.24418 0,-194.53909 157.2228,-352.244179 351.16696,-352.244179 193.94417,0 351.16697,157.705089 351.16697,352.244179 l 0,0 z"
transform="matrix(1.4220377,0,0,1.417689,-153.65446,-167.72553)"
id="path3395"
- style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.70429397;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.70429397;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 0,450 L 1200,450"
+ d="m 0,450 1200,0"
id="path49"
style="fill:none;stroke:#aaaaaa;stroke-width:1px;stroke-opacity:1" />
-<!--
- <text
- id="text105"
- style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans">
- <tspan
- x="700"
- y="480"
- id="tspan107">100</tspan>
- </text>
- <text
- id="text109"
- style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans">
- <tspan
- x="800"
- y="480"
- id="tspan111">200</tspan>
- </text>
- <text
- id="text113"
- style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans">
- <tspan
- x="900"
- y="480"
- id="tspan115">300</tspan>
- </text>
- <text
- id="text117"
- style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans">
- <tspan
- x="1000"
- y="480"
- id="tspan119">400</tspan>
- </text>
- <text
- id="text121"
- style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans">
- <tspan
- x="1100"
- y="480"
- id="tspan123">500</tspan>
- </text>
--->
<path
- d="M 80.96149,749.66704 L 1119.0385,150.33296"
+ d="M 80.96149,749.66704 1119.0385,150.33296"
id="path3401"
- style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
- d="M 1023.7932,26.20681 L 176.2068,873.79319"
+ d="M 1023.7932,26.20681 176.2068,873.79319"
id="path3407"
- style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-<!--
- <text
- x="593.71545"
- y="243.75009"
- id="text3409"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="593.71545"
- y="243.75009"
- id="tspan3411"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">0</tspan></text>
- <text
- x="694.31061"
- y="271.75113"
- id="text3413"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="694.31061"
- y="271.75113"
- id="tspan3415"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">30</tspan></text>
- <text
- x="735.44513"
- y="305.70435"
- id="text3417"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="735.44513"
- y="305.70435"
- id="tspan3419"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">45</tspan></text>
- <text
- x="773.53778"
- y="351.4249"
- id="text3421"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="773.53778"
- y="351.4249"
- id="tspan3423"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">60</tspan></text>
- <text
- x="802.28174"
- y="455.84259"
- id="text3425"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="802.28174"
- y="455.84259"
- id="tspan3427"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">90</tspan></text>
- <text
- x="771.25879"
- y="568.39978"
- id="text3429"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="771.25879"
- y="568.39978"
- id="tspan3431"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">120</tspan></text>
- <text
- x="735.16608"
- y="611.58545"
- id="text3433"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="735.16608"
- y="611.58545"
- id="tspan3435"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">135</tspan></text>
- <text
- x="689.05011"
- y="643.14337"
- id="text3437"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="689.05011"
- y="643.14337"
- id="tspan3439"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">150</tspan></text>
- <text
- x="581.42322"
- y="667.88727"
- id="text3441"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="581.42322"
- y="667.88727"
- id="tspan3443"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">180</tspan></text>
- <text
- x="473.40085"
- y="642.6084"
- id="text3445"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="473.40085"
- y="642.6084"
- id="tspan3447"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">210</tspan></text>
- <text
- x="427.6803"
- y="611.05054"
- id="text3449"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="427.6803"
- y="611.05054"
- id="tspan3451"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">225</tspan></text>
- <text
- x="388.12244"
- y="564.39978"
- id="text3453"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="388.12244"
- y="564.39978"
- id="tspan3455"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">240</tspan></text>
- <text
- x="358.44824"
- y="456.91229"
- id="text3457"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="358.44824"
- y="456.91229"
- id="tspan3459"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">270</tspan></text>
- <text
- x="390.12247"
- y="347.4249"
- id="text3461"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="390.12247"
- y="347.4249"
- id="tspan3463"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">300</tspan></text>
- <text
- x="429.28494"
- y="302.77408"
- id="text3465"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="429.28494"
- y="302.77408"
- id="tspan3467"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">315</tspan></text>
- <text
- x="473.54037"
- y="271.21625"
- id="text3469"
- xml:space="preserve"
- style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
- x="473.54037"
- y="271.21625"
- id="tspan3471"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">330</tspan></text>
--->
+ style="fill:none;stroke:#aaaaaa;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</svg>
diff --git a/taconstants.py b/taconstants.py
index 806ecee..df41adf 100644
--- a/taconstants.py
+++ b/taconstants.py
@@ -502,7 +502,7 @@ MEDIA_SHAPES = ['audiooff', 'audioon', 'audiosmall',
'pythonoff', 'pythonon', 'pythonsmall',
'list', '1x1', '1x1a', '2x1', '1x2', '2x2']
-OVERLAY_SHAPES = ['Cartesian', 'polar']
+OVERLAY_SHAPES = ['Cartesian', 'Cartesian_labeled', 'polar']
STATUS_SHAPES = ['status', 'info', 'nostack', 'noinput', 'emptyheap',
'emptybox', 'nomedia', 'nocode', 'overflowerror',
diff --git a/turtleart.py b/turtleart.py
index da1be5c..1dee069 100755
--- a/turtleart.py
+++ b/turtleart.py
@@ -220,10 +220,17 @@ class TurtleMain():
def _do_cartesian_cb(self, button):
if self.tw.cartesian is True:
- self.tw.overlay_shapes['Cartesian'].hide()
+ if self.tw.coord_scale == 1:
+ self.tw.overlay_shapes['Cartesian_labeled'].hide()
+ else:
+ self.tw.overlay_shapes['Cartesian'].hide()
self.tw.cartesian = False
else:
- self.tw.overlay_shapes['Cartesian'].set_layer(OVERLAY_LAYER)
+ if self.tw.coord_scale == 1:
+ self.tw.overlay_shapes['Cartesian_labeled'].set_layer(
+ OVERLAY_LAYER)
+ else:
+ self.tw.overlay_shapes['Cartesian'].set_layer(OVERLAY_LAYER)
self.tw.cartesian = True
def _do_polar_cb(self, button):
@@ -234,6 +241,21 @@ class TurtleMain():
self.tw.overlay_shapes['polar'].set_layer(OVERLAY_LAYER)
self.tw.polar = True
+ def _do_rescale_cb(self, button):
+ if self.tw.coord_scale == 1:
+ self.tw.coord_scale = self.tw.height/200
+ self.tw.eraser_button()
+ if self.tw.cartesian is True:
+ self.tw.overlay_shapes['Cartesian_labeled'].hide()
+ self.tw.overlay_shapes['Cartesian'].set_layer(OVERLAY_LAYER)
+ else:
+ self.tw.coord_scale = 1
+ self.tw.eraser_button()
+ if self.tw.cartesian is True:
+ self.tw.overlay_shapes['Cartesian'].hide()
+ self.tw.overlay_shapes['Cartesian_labeled'].set_layer(
+ OVERLAY_LAYER)
+
def _do_palette_cb(self, widget):
self.tw.show_palette(self.i)
self.i += 1
@@ -283,14 +305,6 @@ class TurtleMain():
if text is not None:
self.tw.process_data(data_from_string(text))
- def _do_rescale_cb(self, button):
- if self.tw.coord_scale == 1:
- self.tw.coord_scale = self.tw.height/200
- self.tw.eraser_button()
- else:
- self.tw.coord_scale = 1
- self.tw.eraser_button()
-
def main():
gtk.main()
return 0