diff --git a/scatterplot.py b/scatterplot.py index 59e3fe9..4bfd660 100644 --- a/scatterplot.py +++ b/scatterplot.py @@ -42,13 +42,19 @@ def draw_axes(data): yticks = get_tick_values(ymin,ymax) for tick in xticks: screen_x_position = scale(tick, xmin, xmax, 0, constants.PLOT_WIDTH) - draw_x_tick(screeen_x_position, tick) + draw_x_tick(screen_x_position, tick) for tick in yticks: screen_y_position=scale(tick, ymin, ymax, 0, constants.PLOT_WIDTH) - draw_y_tick(screen_x_position, tick) + draw_y_tick(screen_y_position, tick) -def draw_points(data, color, size): - "Draws the scatter plot's points." +def draw_points(data, size, color): + x_values = get_x_values(data) + y_values = get_y_values(data) + xmin, xmax = bounds(x_values) + ymin, ymax = bounds(y_values) + scaled_x= scale(x_values, xmin, xmax, ymin, ymax) + scaled_y= scale(y_values, xmin, xmax, ymin, ymax) + draw_point(scaled_x, scaled_y, color, size) with no_delay(): data = generate_data(50, 10, 500, 5, 400, 1000)