From 01dc6ab67a03b26e00d707b511cf78e8c6f2e09a Mon Sep 17 00:00:00 2001 From: moodler Date: Fri, 11 Mar 2005 14:56:34 +0000 Subject: [PATCH] Various little tweaks here and there --- lib/graphlib.php | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/graphlib.php b/lib/graphlib.php index c743e0b32c2..b2844680889 100644 --- a/lib/graphlib.php +++ b/lib/graphlib.php @@ -54,15 +54,17 @@ class graph { 'y_label_left' => '', // if this is set then this text is printed on left axis of graph. 'y_label_right' => '', // if this is set then this text is printed on right axis of graph. - 'label_size' => 12, // label text point size + 'label_size' => 8, // label text point size 'label_font' => 'default.ttf', // label text font. don't forget to set 'path_to_fonts' above. 'label_colour' => 'gray33', // label text colour 'y_label_angle' => 90, // rotation of y axis label 'x_label_angle' => 90, // rotation of y axis label - 'outer_padding' => 8, // padding around outer text. i.e. title, y label, and x label. - 'inner_padding' => 6, // padding beteen axis text and graph. + 'outer_padding' => 5, // padding around outer text. i.e. title, y label, and x label. + 'inner_padding' => 0, // padding beteen axis text and graph. + 'x_inner_padding' => 5, // padding beteen axis text and graph. + 'y_inner_padding' => 6, // padding beteen axis text and graph. 'outer_border' => 'none', // colour of border aound image, or 'none'. 'inner_border' => 'black', // colour of border around actual graph, or 'none'. 'inner_border_type' => 'box', // 'box' for all four sides, 'axis' for x/y axis only, @@ -110,10 +112,10 @@ class graph { 'axis_font' => 'default.ttf', // axis text font. don't forget to set 'path_to_fonts' above. - 'axis_size' => 12, // axis text font size in points + 'axis_size' => 8, // axis text font size in points 'axis_colour' => 'gray33', // colour of axis text. 'y_axis_angle' => 0, // rotation of axis text. - 'x_axis_angle' => 90, // rotation of axis text. + 'x_axis_angle' => 0, // rotation of axis text. 'y_axis_text_left' => 1, // whether to print left hand y axis text. if 0 no text, if 1 all ticks have text, 'x_axis_text' => 1, // if 4 then print every 4th tick and text, etc... @@ -133,7 +135,7 @@ class graph { 'legend_offset' => 10, // offset in pixels from graph or outside border. 'legend_padding' => 5, // padding around legend text. 'legend_font' => 'default.ttf', // legend text font. don't forget to set 'path_to_fonts' above. - 'legend_size' => 9, // legend text point size. + 'legend_size' => 8, // legend text point size. 'legend_colour' => 'black', // legend text colour. 'legend_border' => 'none', // legend border colour, or 'none'. @@ -203,19 +205,19 @@ function init() { $this->init_labels(); // take into account tick lengths - $this->calculated['bottom_inner_padding'] = $this->parameter['inner_padding']; + $this->calculated['bottom_inner_padding'] = $this->parameter['x_inner_padding']; if (($this->parameter['x_ticks_colour'] != 'none') && ($this->parameter['tick_length'] < 0)) $this->calculated['bottom_inner_padding'] -= $this->parameter['tick_length']; $this->calculated['boundary_box']['bottom'] -= $this->calculated['bottom_inner_padding']; - $this->calculated['left_inner_padding'] = $this->parameter['inner_padding']; + $this->calculated['left_inner_padding'] = $this->parameter['y_inner_padding']; if ($this->parameter['y_axis_text_left']) { if (($this->parameter['y_ticks_colour'] != 'none') && ($this->parameter['tick_length'] < 0)) $this->calculated['left_inner_padding'] -= $this->parameter['tick_length']; } $this->calculated['boundary_box']['left'] += $this->calculated['left_inner_padding']; - $this->calculated['right_inner_padding'] = $this->parameter['inner_padding']; + $this->calculated['right_inner_padding'] = $this->parameter['y_inner_padding']; if ($this->parameter['y_axis_text_right']) { if (($this->parameter['y_ticks_colour'] != 'none') && ($this->parameter['tick_length'] < 0)) $this->calculated['right_inner_padding'] -= $this->parameter['tick_length']; @@ -472,7 +474,7 @@ function draw_legend() { function draw_y_label_right() { if (!$this->parameter['y_label_right']) return; - $x = $this->calculated['boundary_box']['right'] + $this->parameter['inner_padding']; + $x = $this->calculated['boundary_box']['right'] + $this->parameter['y_inner_padding']; if ($this->parameter['y_axis_text_right']) $x += $this->calculated['y_axis_right']['boundary_box_max']['width'] + $this->calculated['right_inner_padding']; $y = ($this->calculated['boundary_box']['bottom'] + $this->calculated['boundary_box']['top']) / 2; @@ -486,7 +488,7 @@ function draw_y_label_right() { function draw_y_label_left() { if (!$this->parameter['y_label_left']) return; - $x = $this->calculated['boundary_box']['left'] - $this->parameter['inner_padding']; + $x = $this->calculated['boundary_box']['left'] - $this->parameter['y_inner_padding']; if ($this->parameter['y_axis_text_left']) $x -= $this->calculated['y_axis_left']['boundary_box_max']['width'] + $this->calculated['left_inner_padding']; $y = ($this->calculated['boundary_box']['bottom'] + $this->calculated['boundary_box']['top']) / 2; @@ -510,7 +512,7 @@ function draw_title() { function draw_x_label() { if (!$this->parameter['x_label']) return; - $y = $this->calculated['boundary_box']['bottom'] + $this->parameter['inner_padding']; + $y = $this->calculated['boundary_box']['bottom'] + $this->parameter['x_inner_padding']; if ($this->parameter['x_axis_text']) $y += $this->calculated['x_axis']['boundary_box_max']['height'] + $this->calculated['bottom_inner_padding']; $x = ($this->calculated['boundary_box']['right'] + $this->calculated['boundary_box']['left']) / 2; @@ -1053,7 +1055,7 @@ function init_y_axis() { $startLeft += $stepLeft; } $this->calculated['boundary_box']['left'] += $this->calculated['y_axis_left']['boundary_box_max']['width'] - + $this->parameter['inner_padding']; + + $this->parameter['y_inner_padding']; } if ($this->parameter['y_axis_text_right']) { @@ -1078,7 +1080,7 @@ function init_y_axis() { $start_right += $step_right; } $this->calculated['boundary_box']['right'] -= $this->calculated['y_axis_right']['boundary_box_max']['width'] - + $this->parameter['inner_padding']; + + $this->parameter['y_inner_padding']; } } @@ -1146,7 +1148,7 @@ function init_x_axis() { } if ($this->parameter['x_axis_text']) $this->calculated['boundary_box']['bottom'] -= $this->calculated['x_axis']['boundary_box_max']['height'] - + $this->parameter['inner_padding']; + + $this->parameter['x_inner_padding']; } // find max and min values for a data array given the resolution.