|
Lines 1-69
Link Here
|
| 1 |
--- mingchart.rb.orig Fri Aug 15 10:06:17 2003 |
|
|
| 2 |
+++ mingchart.rb Fri Aug 15 10:06:20 2003 |
| 3 |
@@ -188,7 +188,7 @@ |
| 4 |
|
| 5 |
def add_axises |
| 6 |
shape = SWFShape.new |
| 7 |
- shape.set_line(@axis_line_width, *@axis_line_color) |
| 8 |
+ shape.set_line(@axis_line_width, *@axis_line_color.to_a) |
| 9 |
shape.move_pen(@canvas_x_margin, @canvas_y_margin) |
| 10 |
shape.draw_line(0, @y_length) |
| 11 |
shape.draw_line(@x_length, 0) |
| 12 |
@@ -325,7 +325,7 @@ |
| 13 |
item.move_to(xx + x_margin, yy + y_margin) |
| 14 |
|
| 15 |
line = SWFShape.new |
| 16 |
- line.set_line(@scale_line_width, *@scale_line_color) |
| 17 |
+ line.set_line(@scale_line_width, *@scale_line_color.to_a) |
| 18 |
line.move_pen_to(xx, yy) |
| 19 |
if at == :bottom |
| 20 |
line.draw_line(0, -@s...) |
| 21 |
@@ -354,7 +354,7 @@ |
| 22 |
xx = convert_x(x) |
| 23 |
yy = @canvas_height - @canvas_y_margin |
| 24 |
line = SWFShape.new |
| 25 |
- line.set_line(@grid_line_width, *@grid_line_color) |
| 26 |
+ line.set_line(@grid_line_width, *@grid_line_color.to_a) |
| 27 |
line.move_pen_to(xx, yy) |
| 28 |
line.draw_line(0, -@y...) |
| 29 |
@movie.add(line) |
| 30 |
@@ -370,7 +370,7 @@ |
| 31 |
xx = @canvas_x_margin |
| 32 |
yy = convert_y(y, side) |
| 33 |
line = SWFShape.new |
| 34 |
- line.set_line(@grid_line_width, *@grid_line_color) |
| 35 |
+ line.set_line(@grid_line_width, *@grid_line_color.to_a) |
| 36 |
line.move_pen_to(xx, yy) |
| 37 |
line.draw_line(@x_length, 0) |
| 38 |
@movie.add(line) |
| 39 |
@@ -424,7 +424,7 @@ |
| 40 |
|
| 41 |
def draw_line (data, color, side, fill_p = false) |
| 42 |
line = SWFShape.new |
| 43 |
- line.set_line(@line_width, *color) |
| 44 |
+ line.set_line(@line_width, *color.to_a) |
| 45 |
first_time = true |
| 46 |
|
| 47 |
if fill_p |
| 48 |
@@ -549,8 +549,9 @@ |
| 49 |
texts.push([text, width, height, lineno]) |
| 50 |
} |
| 51 |
|
| 52 |
- total_height = texts.map {|x| x[2] }.inject(0) {|x, y| |
| 53 |
- x + y * @line_title_line_height_ratio |
| 54 |
+ total_height = 0 |
| 55 |
+ texts.map {|x| x[2] }.each {|v| |
| 56 |
+ total_height += v * @line_title_line_height_ratio |
| 57 |
} |
| 58 |
max_width = texts.map {|x| x[1] }.max |
| 59 |
|
| 60 |
@@ -571,7 +572,7 @@ |
| 61 |
base_y + height + height * i * @line_title_line_height_ratio) |
| 62 |
|
| 63 |
line = SWFShape.new |
| 64 |
- line.set_line(@line_width, *@line_colors[lineno]) |
| 65 |
+ line.set_line(@line_width, *@line_colors[lineno].to_a) |
| 66 |
line.draw_line(@line_title_line_length, 0) |
| 67 |
item = @movie.add(line) |
| 68 |
item.move_to(base_x + @line_title_line_margin, |
| 69 |
|