[TWiki-Dev] [SVN] PeterThoeny r21355 - in twiki/branches/TWikiRelease05x00/ChartPlugin: data/TWiki lib/TWiki/Plugins/ChartPlugin

[<de...@de...>]

Author: PeterThoeny
Date: 2011-06-02 00:18:19 -0500 (Thu, 02 Jun 2011)
New Revision: 21355
Trac url: http://develop.twiki.org/trac/changeset/21355

Modified:
   twiki/branches/TWikiRelease05x00/ChartPlugin/data/TWiki/ChartPlugin.txt
   twiki/branches/TWikiRelease05x00/ChartPlugin/lib/TWiki/Plugins/ChartPlugin/Table.pm
Log:
Item6701: Sync from trunk -- thanks TWiki:Main.TaitCyrus

Modified: twiki/branches/TWikiRelease05x00/ChartPlugin/data/TWiki/ChartPlugin.txt
===================================================================
--- twiki/branches/TWikiRelease05x00/ChartPlugin/data/TWiki/ChartPlugin.txt	2011-06-02 01:35:05 UTC (rev 21354)
+++ twiki/branches/TWikiRelease05x00/ChartPlugin/data/TWiki/ChartPlugin.txt	2011-06-02 05:18:19 UTC (rev 21355)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1305356365" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="TWikiContributor" date="1306978197" format="1.1" version="$Rev$"}%
 ---+!! Chart Plugin
 <!--
    Contributions to this plugin are appreciated. Please update the plugin page
@@ -93,7 +93,7 @@
          | ==R2:C1== | ==R2:C2== | ==R2:C3== | ==R2:C4== |
    * A range of table cells is defined by two cell addresses separated by ==".."==. For example, "row 1-20, column 3" is: ==R1:C3..R20:C3== and "row 15-5, column 2" is: ==R15:C2..R5:C2==
    * Ranges can be discontinuous. Discontinous ranges are joined using =="+"== or ==","==. For example: ==R4:C1..R5:C2+R9:C1..R15:C2==.
-   * When you are specifying datasets, you specify the range so that you have one data set per row (column). You can also specify multiple data sets using discontinuous blocks of cells; for example, ==R4:C1..R5:C2,R9:C1..R10:C2== specifies *4* data sets: R4:C1..R4:C2, R5:C1..R5:C2, R9:C1..R9:C15 and R10:C1..R10:C2
+   * When you are specifying datasets, you specify the range so that you have one data set per row (column). You can also specify multiple data sets using discontinuous blocks of cells; for example, ==R4:C1..R5:C2,R9:C1..R10:C2== specifies *4* data sets: R4:C1..R4:C2, R5:C1..R5:C2, R9:C1..R9:C2 and R10:C1..R10:C2
    * It is possible to specify a constant value instead of a range of table cells.  For example: ==R1:C3..R20:C3,0== as a =data= or =data2= value would create a data set with the constant value = =0= which could be used to highlight the zero line when data is both negative and positive, or ==R1:C1..R1:C3,0== as a =datalegend= value would set the legend of the 4th data set = =0=.
    * ==+== has higher precedence than ==,==
    * All parameters ending with =2= (like: =data2= and =ylabel2=) are relative to the right Y axis.  The default is relative to the left Y axis.
@@ -282,8 +282,9 @@
 |  Plugin Author: | TWiki:Main.PeterThoeny, TWiki:Main.TaitCyrus |
 |  Copyright: | &copy; 2002-2011 Peter Thoeny, [[http://www.twiki.net/][Twiki, Inc.]]  <br /> &copy; 2008-2011 TWiki:TWiki.TWikiContributor |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Plugin Version: | 2011-05-13 (v%$VERSION%) |
+|  Plugin Version: | 2011-05-27 (v%$VERSION%) |
 |  Change History: | <!-- specify latest version first --> |
+|  2011-05-27: | TWikibug:Item6735: Fix bug with constant data -- TWiki:Main.TaitCyrus |
 |  2011-05-13: | TWikibug:Item6701: Doc improvements; use transparent background for sparkline examples -- TWiki:Main.PeterThoeny |
 |  2011-05-13: | <ul><li> TWikibug:Item6720: Allow support for =transparent= to be used in =colors= and =bgcolor= </li></ul> -- TWiki:Main.TaitCyrus |
 |  2011-05-11: | <ul><li> TWikibug:Item6716: Add ability to support constant values in addtion to spreadsheet ranges.</li><li> TWikibug:Item6717: Fix bug with =area= colors when =data2= is used.</li><li> TWikibug:Item6718: Add new types: =sparkline=, =sparkbar=, and =sparkarea= </li><li> TWikibug:Item6719: Retool how bar widths/spaces are used/calculated so they are now proportional instead of fixed sizing</li></ul> -- TWiki:Main.TaitCyrus |

Modified: twiki/branches/TWikiRelease05x00/ChartPlugin/lib/TWiki/Plugins/ChartPlugin/Table.pm
===================================================================
--- twiki/branches/TWikiRelease05x00/ChartPlugin/lib/TWiki/Plugins/ChartPlugin/Table.pm	2011-06-02 01:35:05 UTC (rev 21354)
+++ twiki/branches/TWikiRelease05x00/ChartPlugin/lib/TWiki/Plugins/ChartPlugin/Table.pm	2011-06-02 05:18:19 UTC (rev 21355)
@@ -1,6 +1,6 @@
 # ChartPlugin for TWiki Enterprise Collaboration Platform, http://TWiki.org/
 #
-# Copyright (C) 2004-2011 Peter Thoeny, Peter[at]Thoeny.org
+# Copyright (C) 2004-2010 Peter Thoeny, Peter@Thoeny.org
 # Copyright (C) 2008-2011 TWiki Contributors
 # Plugin written by http://TWiki.org/cgi-bin/view/Main/TaitCyrus
 #
@@ -285,6 +285,7 @@
 		    foreach my $i (1..$maxDataLen) {
 			push(@{$rows[$rowbase]}, $range->{text});
 		    }
+		    $rh = 1;
 		} else {
 		    my $rs = abs($range->{endCol} - $range->{startCol}) + 1;
 		    $rh = $rs if ($rs > $rh);
@@ -310,6 +311,7 @@
 		    foreach my $i (1..$maxDataLen) {
 			push(@{$rows[$rowbase]}, $range->{text});
 		    }
+		    $rh = 1;
 		} else {
 		    my $rs = abs($range->{endRow} - $range->{startRow}) + 1;
 		    $rh = $rs if ($rs > $rh);
@@ -332,7 +334,8 @@
 		}
             }
         } ## end foreach my $range (@$set)
-            # Start the next dataset on a new row
+
+	# Start the next dataset on a new row
         $rowbase += $rh;
     } ## end foreach my $set (@ranges)