Commit 39faf24b authored by olau@iola.dk's avatar olau@iola.dk

Fixed a bug with drawing marking lines with differrent colors

git-svn-id: https://flot.googlecode.com/svn/trunk@106 1e0a6537-2640-0410-bfb7-f154510ff394
parent e4775aab
...@@ -3,18 +3,23 @@ Flot 0.x ...@@ -3,18 +3,23 @@ Flot 0.x
Bug fixes: Bug fixes:
Fixed two corner-case bugs when drawing filled curves (report and - Fixed two corner-case bugs when drawing filled curves (report and
analysis by Joshua Varner). Fix auto-adjustment code when setting min analysis by Joshua Varner).
to 0 for an axis where the dataset is completely flat on that axis - Fix auto-adjustment code when setting min to 0 for an axis where the
(report by chovy). Fixed a bug with passing in data from getData to dataset is completely flat on that axis (report by chovy).
setData when the secondary axes are used (issue 65, reported by - Fixed a bug with passing in data from getData to setData when the
nperelman). Fixed so that it is possible to turn lines off when no secondary axes are used (issue 65, reported by nperelman).
other chart type is shown (based on problem reported by Glenn - Fixed so that it is possible to turn lines off when no other chart
Vanderburg), and fixed so that setting lineWidth to 0 also hides the type is shown (based on problem reported by Glenn Vanderburg), and
shadow (based on problem reported by Sergio Nunes). Updated mousemove fixed so that setting lineWidth to 0 also hides the shadow (based on
position expression to the latest from jQuery (bug reported by problem reported by Sergio Nunes).
meyuchas). Use borders instead of background in legend (fix printing - Updated mousemove position expression to the latest from jQuery (bug
issue 25 and 45). Explicitly convert axis min/max to numbers. reported by meyuchas).
- Use borders instead of background in legend (fix printing issue 25
and 45).
- Explicitly convert axis min/max to numbers.
- Fixed a bug with drawing marking lines with different colors
(reported by Khurram).
Flot 0.5 Flot 0.5
......
...@@ -926,6 +926,7 @@ ...@@ -926,6 +926,7 @@
if (xrange.from == xrange.to || yrange.from == yrange.to) { if (xrange.from == xrange.to || yrange.from == yrange.to) {
// draw line // draw line
ctx.strokeStyle = m.color || options.grid.markingsColor; ctx.strokeStyle = m.color || options.grid.markingsColor;
ctx.beginPath();
ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth; ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth;
ctx.moveTo(Math.floor(xrange.from), Math.floor(yrange.from)); ctx.moveTo(Math.floor(xrange.from), Math.floor(yrange.from));
ctx.lineTo(Math.floor(xrange.to), Math.floor(yrange.to)); ctx.lineTo(Math.floor(xrange.to), Math.floor(yrange.to));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment