gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 13 11:22:50 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/68798181 (commit)
via https://github.com/Gnucash/gnucash/commit/00b827db (commit)
via https://github.com/Gnucash/gnucash/commit/6d0a3707 (commit)
via https://github.com/Gnucash/gnucash/commit/96289823 (commit)
from https://github.com/Gnucash/gnucash/commit/8cd6c0e1 (commit)
commit 68798181589adac47d9bbb12a599bed1f9e8fdf8
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 13 20:45:11 2014 +0200
Some minor cosmetics in the barchart code
diff --git a/src/report/report-system/html-barchart.scm b/src/report/report-system/html-barchart.scm
index b43afbb..60d4b92 100644
--- a/src/report/report-system/html-barchart.scm
+++ b/src/report/report-system/html-barchart.scm
@@ -462,8 +462,8 @@
cursor:{
show: true,
showTooltip: false,
- zoom: true
- }
+ zoom: true,
+ },
};\n")
(push " options.stackSeries = ")
@@ -495,7 +495,7 @@
(push "\";\n")))
- (push "$.jqplot.config.enablePlugins = true;")
+ (push "$.jqplot.config.enablePlugins = true;\n")
(push "var plot = $.jqplot('")(push chart-id)(push"', data, options);
function formatTooltip(str, seriesIndex, pointIndex) {
commit 00b827dbf255d8c29c4c296e10a7baf4ee172cfe
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 13 20:44:42 2014 +0200
Redo the highlighter in barcharts.
The formatting code was removed with the introduction
of the zoom cursor. It continued to display
poorly formatted information though which is now fixed again
diff --git a/src/report/report-system/html-barchart.scm b/src/report/report-system/html-barchart.scm
index a90e7ac..b43afbb 100644
--- a/src/report/report-system/html-barchart.scm
+++ b/src/report/report-system/html-barchart.scm
@@ -456,8 +456,12 @@
autoscale: true,
},
},
+ highlighter: {
+ tooltipContentEditor: formatTooltip,
+ },
cursor:{
show: true,
+ showTooltip: false,
zoom: true
}
};\n")
@@ -495,12 +499,9 @@
(push "var plot = $.jqplot('")(push chart-id)(push"', data, options);
function formatTooltip(str, seriesIndex, pointIndex) {
- if (options.axes.xaxis.ticks[pointIndex] !== undefined)
- x = options.axes.xaxis.ticks[pointIndex];
- else
- x = pointIndex;
+ x = data[seriesIndex][pointIndex][0];
y = data[seriesIndex][pointIndex][1].toFixed(2);
- return options.series[seriesIndex].label + ' ' + x + '<br><b>' + y + '</b>';
+ return options.series[seriesIndex].label + '<br/>' + x + '<br/><b>' + y + '</b>';
}\n")
(push "});\n</script>")
commit 6d0a3707e1f6cc0d8ca00a5a96fe0e9355bcbb61
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 13 20:36:35 2014 +0200
Bug 737815 - Graphs cannot be generated correctly
Revert x axis renderer from DateAxis to CategoryAxis.
It looks like the DateAxis renderer wasn't meant to be
used for a bar chart.
diff --git a/src/report/report-system/html-barchart.scm b/src/report/report-system/html-barchart.scm
index 33b81f8..a90e7ac 100644
--- a/src/report/report-system/html-barchart.scm
+++ b/src/report/report-system/html-barchart.scm
@@ -386,7 +386,7 @@
(push (gnc:html-js-include "jqplot/jquery.jqplot.js"))
(push (gnc:html-js-include "jqplot/jqplot.barRenderer.js"))
(push (gnc:html-js-include "jqplot/jqplot.cursor.js"))
- (push (gnc:html-js-include "jqplot/jqplot.dateAxisRenderer.js"))
+ (push (gnc:html-js-include "jqplot/jqplot.categoryAxisRenderer.js"))
(push (gnc:html-js-include "jqplot/jqplot.highlighter.js"))
(push (gnc:html-js-include "jqplot/jqplot.canvasTextRenderer.js"))
(push (gnc:html-js-include "jqplot/jqplot.canvasAxisTickRenderer.js"))
@@ -445,7 +445,7 @@
},
axes: {
xaxis: {
- renderer:$.jqplot.DateAxisRenderer,
+ renderer:$.jqplot.CategoryAxisRenderer,
tickRenderer: $.jqplot.CanvasAxisTickRenderer,
tickOptions: {
angle: -30,
commit 96289823e5a7b7904bf9e64fe94bcb1dbcb0c7ee
Author: Carsten Rinke <carsten.rinke at gmx.de>
Date: Sat Oct 11 21:52:45 2014 +0200
Bug737815 - Graphs Cannot Be Generated Correctly
Fix in html-barchart.scm, change loop condition
diff --git a/src/report/report-system/html-barchart.scm b/src/report/report-system/html-barchart.scm
index dd4ab19..33b81f8 100644
--- a/src/report/report-system/html-barchart.scm
+++ b/src/report/report-system/html-barchart.scm
@@ -421,7 +421,7 @@
data)
(series-data-end col (list-ref-safe (gnc:html-barchart-col-labels barchart) col))
(if (< col (- cols 1))
- (loop (+ 1 col) 1)))))
+ (loop (+ 1 col) 0)))))
(push "var options = {
Summary of changes:
src/report/report-system/html-barchart.scm | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
More information about the gnucash-changes
mailing list