r4751 - trunk/cumin/python/cumin
by croberts＠fedoraproject.org
Author: croberts
Date: 2011-05-04 18:19:55 +0000 (Wed, 04 May 2011)
New Revision: 4751
Modified:
trunk/cumin/python/cumin/charts.py
trunk/cumin/python/cumin/stat.py
Log:
For charted values > 1000000, we are now labeling the y-axis in terms of "M" instead of "K". This addresses BZ https://bugzilla.redhat.com/show_bug.cgi?id=697093 .
Modified: trunk/cumin/python/cumin/charts.py
===================================================================
--- trunk/cumin/python/cumin/charts.py 2011-05-04 15:04:19 UTC (rev 4750)
+++ trunk/cumin/python/cumin/charts.py 2011-05-04 18:19:55 UTC (rev 4751)
@@ -365,8 +365,8 @@
value = fraction * self.y_max - self.y_min
value = int(round(value + self.y_min))
- if value >= 10000000:
- svalue = "%im" % int(round(value / 1000000.0, -1))
+ if value >= 1000000:
+ svalue = "%.2fm" % (round(value / 1000000.0, 2))
elif value >= 10000:
svalue = "%ik" % int(round(value / 1000.0, -1))
else:
Modified: trunk/cumin/python/cumin/stat.py
===================================================================
--- trunk/cumin/python/cumin/stat.py 2011-05-04 15:04:19 UTC (rev 4750)
+++ trunk/cumin/python/cumin/stat.py 2011-05-04 18:19:55 UTC (rev 4751)
@@ -939,8 +939,8 @@
if i % step == 0:
value = int(round(i * y_step, 0))
- if value >= 10000000:
- svalue = "%im" % int(round(value / 1000000.0, -1))
+ if value >= 1000000:
+ svalue = "%.2fm" % (round(value / 1000000.0, 2))
elif value >= 10000:
svalue = "%ik" % int(round(value / 1000.0, -1))
else:
12 years, 12 months
r4750 - trunk/cumin/python/cumin
by croberts＠fedoraproject.org
Author: croberts
Date: 2011-05-04 15:04:19 +0000 (Wed, 04 May 2011)
New Revision: 4750
Modified:
trunk/cumin/python/cumin/stat.py
Log:
Now performing a sort on the stats being used to draw our graphs. This is to fix BZ https://bugzilla.redhat.com/show_bug.cgi?id=699265 .
Modified: trunk/cumin/python/cumin/stat.py
===================================================================
--- trunk/cumin/python/cumin/stat.py 2011-05-04 11:41:23 UTC (rev 4749)
+++ trunk/cumin/python/cumin/stat.py 2011-05-04 15:04:19 UTC (rev 4750)
@@ -1053,7 +1053,7 @@
if secs(dt) < min_dt:
break
- vals.reverse()
+ vals.sort(key=lambda stat: stat["dt"], reverse=False) #here, we sort by dt to be sure that our graphs are valid
return vals
def make_chart_lines(self, session, chart, line_type, stats, dot_size, halo_size, line_width, samples, duration, end_secs, mode):
12 years, 12 months
r4749 - trunk/cumin/open-flash-chart
by croberts＠fedoraproject.org
Author: croberts
Date: 2011-05-04 11:41:23 +0000 (Wed, 04 May 2011)
New Revision: 4749
Modified:
trunk/cumin/open-flash-chart/build.xml
Log:
Generalized ant build file for compiling open-flash-chart.swf
Modified: trunk/cumin/open-flash-chart/build.xml
===================================================================
--- trunk/cumin/open-flash-chart/build.xml 2011-05-03 15:43:36 UTC (rev 4748)
+++ trunk/cumin/open-flash-chart/build.xml 2011-05-04 11:41:23 UTC (rev 4749)
@@ -1,15 +1,15 @@
-<project name='Flex' default='mxml'>
-
+<project name='Flex' default='mxml'>
<target name='mxml'>
- <property name='compiler' location='/home/croberts/flex/bin/mxmlc' />
+ <!-- Be sure to define FLEX_HOME and FLASH_DEPLOY, ex:
+ -DFLEX_HOME=/home/croberts/flex -DFLASH_DEPLOY=/home/croberts/workspace/cumin-trunk/cumin/resources
+ -->
+ <property name='compiler' location='${FLEX_HOME}/bin/mxmlc' />
<exec executable='${compiler}' failonerror='true'>
- <arg line='-output /home/croberts/workspace/cumin-trunk/cumin/resources/open-flash-chart.swf' />
+ <arg line='-output ${FLASH_DEPLOY}/open-flash-chart.swf' />
<arg line='-static-link-runtime-shared-libraries=true' />
+ <arg line='-debug=true' />
<arg line='main.as' />
</exec>
- <echo>mxml file compiled successfully</echo>
<echo>swf file generated successfully</echo>
</target>
-
-
</project>
\ No newline at end of file
12 years, 12 months
r4748 - trunk/cumin/open-flash-chart
by croberts＠fedoraproject.org
Author: croberts
Date: 2011-05-03 15:43:36 +0000 (Tue, 03 May 2011)
New Revision: 4748
Added:
trunk/cumin/open-flash-chart/build.xml
Log:
Quick and dirty ant build file to let me compile the swf from within eclipse on fedora. TODO, make this generic so that it can be used by all.
Added: trunk/cumin/open-flash-chart/build.xml
===================================================================
--- trunk/cumin/open-flash-chart/build.xml (rev 0)
+++ trunk/cumin/open-flash-chart/build.xml 2011-05-03 15:43:36 UTC (rev 4748)
@@ -0,0 +1,15 @@
+<project name='Flex' default='mxml'>
+
+ <target name='mxml'>
+ <property name='compiler' location='/home/croberts/flex/bin/mxmlc' />
+ <exec executable='${compiler}' failonerror='true'>
+ <arg line='-output /home/croberts/workspace/cumin-trunk/cumin/resources/open-flash-chart.swf' />
+ <arg line='-static-link-runtime-shared-libraries=true' />
+ <arg line='main.as' />
+ </exec>
+ <echo>mxml file compiled successfully</echo>
+ <echo>swf file generated successfully</echo>
+ </target>
+
+
+</project>
\ No newline at end of file
12 years, 12 months