added e and piv7

9 files changed, 126 insertions, 5 deletions

diff --git a/A.py b/A.py
index a41e29b..49e7651 100755
--- a/A.py
+++ b/A.py
@@ -43,6 +43,29 @@ print "       x=\"5\""
 print "       y=\"32\""
 print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">A</tspan></text>"
 
+
+ln = str(float(int( (math.log(math.pi)*SCALE/2 + OFFSET)*10 )/10.))
+h1 = "38"; h2 = "59"; h3 = "35"
+print "  <text style=\"font-size:12px;fill:#000000;\">"
+print "      <tspan"
+print "       x=\"" + str(ln) + "\""
+print "       y=\"" + h3 + "\""
+print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">π</tspan></text>"
+print "   <path"
+print "       d=\"M " + ln + "," + h1 + " L " + ln + "," + h2 + "\""
+print "       style=\"fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1\" />"
+
+ln = str(float(int( (math.log(math.e)*SCALE/2 + OFFSET)*10 )/10.))
+h1 = "38"; h2 = "59"; h3 = "35"
+print "  <text style=\"font-size:12px;fill:#000000;\">"
+print "      <tspan"
+print "       x=\"" + str(ln) + "\""
+print "       y=\"" + h3 + "\""
+print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">e</tspan></text>"
+print "   <path"
+print "       d=\"M " + ln + "," + h1 + " L " + ln + "," + h2 + "\""
+print "       style=\"fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1\" />"
+
 for i in range(100,200):
     ln = str(float(int( (math.log(i/100.)*SCALE/2 + OFFSET)*10 )/10.))
     if int((i/10)*10) == i:
diff --git a/C.py b/C.py
index 59c3351..6874e59 100755
--- a/C.py
+++ b/C.py
@@ -43,6 +43,28 @@ print "       x=\"5\""
 print "       y=\"32\""
 print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">C</tspan></text>"
 
+ln = str(float(int( (math.log(math.pi)*SCALE + OFFSET)*10 )/10.))
+h1 = "38"; h2 = "59"; h3 = "35"
+print "  <text style=\"font-size:12px;fill:#000000;\">"
+print "      <tspan"
+print "       x=\"" + str(ln) + "\""
+print "       y=\"" + h3 + "\""
+print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">π</tspan></text>"
+print "   <path"
+print "       d=\"M " + ln + "," + h1 + " L " + ln + "," + h2 + "\""
+print "       style=\"fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1\" />"
+
+ln = str(float(int( (math.log(math.e)*SCALE + OFFSET)*10 )/10.))
+h1 = "38"; h2 = "59"; h3 = "35"
+print "  <text style=\"font-size:12px;fill:#000000;\">"
+print "      <tspan"
+print "       x=\"" + str(ln) + "\""
+print "       y=\"" + h3 + "\""
+print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">e</tspan></text>"
+print "   <path"
+print "       d=\"M " + ln + "," + h1 + " L " + ln + "," + h2 + "\""
+print "       style=\"fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1\" />"
+
 for i in range(100,200):
     ln = str(float(int( (math.log(i/100.)*SCALE + OFFSET)*10 )/10.))
     if int((i/10)*10) == i:
@@ -90,7 +112,6 @@ for i in range(500,1005,5):
     print "       d=\"M " + ln + "," + h1 + " L " + ln + "," + h2 + "\""
     print "       style=\"fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1\" />"
 
-
 # footer
 print "  </g>"
 print "</svg>"
diff --git a/D.py b/D.py
index b5a7c4f..db91111 100755
--- a/D.py
+++ b/D.py
@@ -43,6 +43,28 @@ print "       x=\"5\""
 print "       y=\"32\""
 print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">D</tspan></text>"
 
+ln = str(float(int( (math.log(math.pi)*SCALE + OFFSET)*10 )/10.))
+h1 = "0"; h2 = "19"; h3 = "32"
+print "  <text style=\"font-size:12px;fill:#000000;\">"
+print "      <tspan"
+print "       x=\"" + str(ln) + "\""
+print "       y=\"" + h3 + "\""
+print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">π</tspan></text>"
+print "   <path"
+print "       d=\"M " + ln + "," + h1 + " L " + ln + "," + h2 + "\""
+print "       style=\"fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1\" />"
+
+ln = str(float(int( (math.log(math.e)*SCALE + OFFSET)*10 )/10.))
+h1 = "0"; h2 = "19"; h3 = "32"
+print "  <text style=\"font-size:12px;fill:#000000;\">"
+print "      <tspan"
+print "       x=\"" + str(ln) + "\""
+print "       y=\"" + h3 + "\""
+print "       style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;\">e</tspan></text>"
+print "   <path"
+print "       d=\"M " + ln + "," + h1 + " L " + ln + "," + h2 + "\""
+print "       style=\"fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1\" />"
+
 for i in range(100,200):
     ln = str(float(int( (math.log(i/100.)*SCALE + OFFSET)*10 )/10.))
     if int((i/10)*10) == i:
@@ -90,7 +112,6 @@ for i in range(500,1005,5):
     print "       d=\"M " + ln + "," + h1 + " L " + ln + "," + h2 + "\""
     print "       style=\"fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1\" />"
 
-
 # footer
 print "  </g>"
 print "</svg>"
diff --git a/MANIFEST b/MANIFEST
index a27ca74..de98468 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -23,5 +23,9 @@ activity/activity-sliderule.png
 images/tab.svg
 A.py
 images/A.svg
-icons/A.svg
-icons/C.svg
+
+
+icons/Con.svg
+icons/Aon.svg
+icons/Coff.svg
+icons/Aoff.svg
diff --git a/NEWS b/NEWS
index 9565c8e..25fe02d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+7
+
+* added pi and e indicators
+
 6
 
 * fixed menu bug in pre-0.86 toolbars
diff --git a/activity/activity.info b/activity/activity.info
index 273a202..76329ec 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Sliderule
-activity_version = 6
+activity_version = 7
 license = GPLv3
 bundle_id = org.sugarlabs.SlideruleActivity
 exec = sugar-activity SlideruleActivity.SlideruleActivity
diff --git a/images/A.svg b/images/A.svg
index d628df3..7afdf67 100644
--- a/images/A.svg
+++ b/images/A.svg
@@ -17,6 +17,22 @@
        style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">A</tspan></text>
   <text style="font-size:12px;fill:#000000;">
       <tspan
+       x="622.3"
+       y="35"
+       style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">π</tspan></text>
+   <path
+       d="M 622.3,38 L 622.3,59"
+       style="fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <text style="font-size:12px;fill:#000000;">
+      <tspan
+       x="550.0"
+       y="35"
+       style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">e</tspan></text>
+   <path
+       d="M 550.0,38 L 550.0,59"
+       style="fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <text style="font-size:12px;fill:#000000;">
+      <tspan
        x="50.0"
        y="35"
        style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">1</tspan></text>
diff --git a/images/C.svg b/images/C.svg
index e1d9c63..054afaa 100644
--- a/images/C.svg
+++ b/images/C.svg
@@ -17,6 +17,22 @@
        style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">C</tspan></text>
   <text style="font-size:12px;fill:#000000;">
       <tspan
+       x="1194.7"
+       y="35"
+       style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">π</tspan></text>
+   <path
+       d="M 1194.7,38 L 1194.7,59"
+       style="fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <text style="font-size:12px;fill:#000000;">
+      <tspan
+       x="1050.0"
+       y="35"
+       style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">e</tspan></text>
+   <path
+       d="M 1050.0,38 L 1050.0,59"
+       style="fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <text style="font-size:12px;fill:#000000;">
+      <tspan
        x="50.0"
        y="35"
        style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">1.0</tspan></text>
diff --git a/images/D.svg b/images/D.svg
index 8614a9f..35a00ba 100644
--- a/images/D.svg
+++ b/images/D.svg
@@ -17,6 +17,22 @@
        style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">D</tspan></text>
   <text style="font-size:12px;fill:#000000;">
       <tspan
+       x="1194.7"
+       y="32"
+       style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">π</tspan></text>
+   <path
+       d="M 1194.7,0 L 1194.7,19"
+       style="fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <text style="font-size:12px;fill:#000000;">
+      <tspan
+       x="1050.0"
+       y="32"
+       style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">e</tspan></text>
+   <path
+       d="M 1050.0,0 L 1050.0,19"
+       style="fill:none;stroke:#FF0000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <text style="font-size:12px;fill:#000000;">
+      <tspan
        x="50.0"
        y="32"
        style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans;">1.0</tspan></text>