more gchart update

git-svn-id: https://pyjamas.svn.sourceforge.net/svnroot/pyjamas/trunk@1471 7a2bd370-bda8-463c-979e-2900ccfb811e
pyjs · Aug 28, 2009 · c90bb3d · c90bb3d
1 parent 0b3fad9
commit c90bb3d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/examples/gcharttestapp/GChartExample02.py b/examples/gcharttestapp/GChartExample02.py
@@ -32,8 +32,8 @@ def __init__(self):
                     "Simulated Quarterly Revenues" +
                     "</big></big><br>&nbsp;</b>")
         self.updateButton.addClickListener(self)
-
+        self.setChartFootnotes(self.updateButton)
-        self.setChartFootnotes(updateButton)
+
         for iCurve in range(len(barLabels)):
             self.addCurve()     # one curve per quarter
             self.getCurve().getSymbol().setSymbolType(SymbolType.VBAR_SOUTHWEST)

diff --git a/examples/gcharttestapp/GChartTestAppUtil.py b/examples/gcharttestapp/GChartTestAppUtil.py
@@ -43,6 +43,7 @@ def getTitle(obj):
 """
 i = 0
 def rnd():
+    global i
     m = 217728
     a = 84589
     c = 45989

diff --git a/library/pyjamas/chart/Axis.py b/library/pyjamas/chart/Axis.py
@@ -1539,10 +1539,10 @@ def setTickLabelFontSize(self, tickLabelFontSize):
     """
     def setTickLabelFormat(self, format):
         # interpret prefixes and create an appropriate formatter
-        if not self.tickLabelFormat.equals(format):
+        if not self.tickLabelFormat == format:
             self.chartDecorationsChanged = True
-            if format.startsWith("=(Date)"):
+            if format.startswith("=(Date)"):
-                transFormat = format.substring("=(Date)".length())
+                transFormat = format.find("=(Date)".length())
                 if transFormat.equals(""):
                     # so "=(Date)" works
                     self.dateFormat = DateTimeFormat.getShortDateTimeFormat()
@@ -1552,13 +1552,13 @@ def setTickLabelFormat(self, format):
 
             self.tickLabelFormatType = DATE_FORMAT_TYPE
 
-        elif format.startsWith("=10^"):
+        elif format.startswith("=10^"):
-            transFormat = format.substring("=10^".length())
+            transFormat = format.find("=10^".length())
             self.numberFormat = NumberFormat.getFormat(transFormat)
             self.tickLabelFormatType = LOG10INVERSE_FORMAT_TYPE
 
-        elif format.startsWith("=2^"):
+        elif format.startswith("=2^"):
-            transFormat = format.substring("=2^".length())
+            transFormat = format.find("=2^".length())
             self.numberFormat = NumberFormat.getFormat(transFormat)
             self.tickLabelFormatType = LOG2INVERSE_FORMAT_TYPE