You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/09/12 14:23:15 UTC
[3/4] git commit: ISIS-872: Merge remote-tracking branch
'michalbcz/master'
ISIS-872: Merge remote-tracking branch 'michalbcz/master'
* michalbcz/master:
fixed broken link
Conflicts:
README.md
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c1c0d534
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c1c0d534
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c1c0d534
Branch: refs/heads/master
Commit: c1c0d534b95d9d1dbe3b2aa87d59ffbf9bb61df4
Parents: df84145 5337c5d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 12 13:03:05 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 12 13:03:05 2014 +0100
----------------------------------------------------------------------
README.md | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c1c0d534/README.md
----------------------------------------------------------------------
diff --cc README.md
index 1ae852b,e114177..15c0bb0
--- a/README.md
+++ b/README.md
@@@ -77,16 -49,7 +77,19 @@@ The downloaded file can be opened in Ex
#### Wicked Charts integration
-An action that returns a [WickedChart](http://wicked-charts.googlecode.com).
+Summary chart for a collection with `BigDecimal` properties:
+
+<img src="https://raw.github.com/danhaywood/isis-wicket-wickedcharts/master/images/summarychart-tab.png" style="width: 900px;"/>
+
+... renders the returned chart with associated summary data:
+
+<img src="https://raw.github.com/danhaywood/isis-wicket-wickedcharts/master/images/summarychart.png" style="width: 900px;"/>
+
+
+Scalar chart, being the result of an action to analyze `ToDoItem`s by their category:
+
+<img src="https://raw.github.com/danhaywood/isis-wicket-wickedcharts/master/images/piechart.png" style="width: 900px;"/>
-
++A scalar chart is simply a wrapper around a [WickedChart](http://wicked-charts.googlecode.com).
++s
+