goffice r2038 - in trunk: . goffice/graph

[jbrefort svn gnome org]

Author: jbrefort
Date: Thu Feb 28 11:03:05 2008
New Revision: 2038
URL: http://svn.gnome.org/viewvc/goffice?rev=2038&view=rev

Log:
2008-02-28  Jean Brefort  <jean brefort normalesup org>

	* goffice/graph/gog-axis-line.c: (x_process), (xy_process),
	(radar_process): remove the unuseful tmp.



Modified:
   trunk/ChangeLog
   trunk/goffice/graph/gog-axis-line.c

Modified: trunk/goffice/graph/gog-axis-line.c
==============================================================================
--- trunk/goffice/graph/gog-axis-line.c	(original)
+++ trunk/goffice/graph/gog-axis-line.c	Thu Feb 28 11:03:05 2008
@@ -1496,7 +1496,6 @@
 	GogAxisType axis_type = gog_axis_get_atype (axis_base->axis);
 	GogChartMap *c_map;
 	GogAxisMap *a_map;
-	GogViewAllocation tmp = *plot_area;
 	GogViewAllocation axis_line_bbox;
 	double ax, ay, bx, by;
 	double start, stop;
@@ -1525,10 +1524,10 @@
 							     view->renderer, ax, ay, bx - ax, by - ay, 
 							     GO_SIDE_RIGHT, -1.,
 							     axis_base->major_tick_labeled);
-			padding->wl = MAX (0., tmp.x - axis_line_bbox.x);
-			padding->ht = MAX (0., tmp.y - axis_line_bbox.y);
-			padding->wr = MAX (0., axis_line_bbox.x + axis_line_bbox.w - tmp.x - tmp.w);
-			padding->hb = MAX (0., axis_line_bbox.y + axis_line_bbox.h - tmp.y - tmp.h);
+			padding->wl = MAX (0., plot_area->x - axis_line_bbox.x);
+			padding->ht = MAX (0., plot_area->y - axis_line_bbox.y);
+			padding->wr = MAX (0., axis_line_bbox.x + axis_line_bbox.w - plot_area->x - plot_area->w);
+			padding->hb = MAX (0., axis_line_bbox.y + axis_line_bbox.h - plot_area->y - plot_area->h);
 			break;
 
 		case GOG_AXIS_BASE_POINT:
@@ -1550,7 +1549,6 @@
 	GogAxis *cross_axis;
 	GogChartMap *c_map;
 	GogAxisMap *a_map;
-	GogViewAllocation tmp = *plot_area;
 	GogViewAllocation axis_line_bbox;
 	double ax, ay, bx, by;
 	GogAxisType axis_type = gog_axis_get_atype (axis_base->axis);
@@ -1619,10 +1617,10 @@
 			axis_line_bbox = axis_line_get_bbox (GOG_AXIS_BASE (view->model),
 							     view->renderer, ax, ay, bx - ax, by - ay, side, -1.,
 							     axis_base->major_tick_labeled);
-			padding->wl = MAX (0., tmp.x - axis_line_bbox.x);
-			padding->ht = MAX (0., tmp.y - axis_line_bbox.y);
-			padding->wr = MAX (0., axis_line_bbox.x + axis_line_bbox.w - tmp.x - tmp.w);
-			padding->hb = MAX (0., axis_line_bbox.y + axis_line_bbox.h - tmp.y - tmp.h);
+			padding->wl = MAX (0., plot_area->x - axis_line_bbox.x);
+			padding->ht = MAX (0., plot_area->y - axis_line_bbox.y);
+			padding->wr = MAX (0., axis_line_bbox.x + axis_line_bbox.w - plot_area->x - plot_area->w);
+			padding->hb = MAX (0., axis_line_bbox.y + axis_line_bbox.h - plot_area->y - plot_area->h);
 			break;
 
 		case GOG_AXIS_BASE_POINT:
@@ -1646,7 +1644,6 @@
 	GogAxisMap *a_map;
 	GogAxisType axis_type = gog_axis_get_atype (axis_base->axis);
 	GogChartMapPolarData *parms;
-	GogViewAllocation tmp = *area;
 	GogViewAllocation bbox;
 	GOGeometrySide side;
 	double start, stop, minimum, maximum;
@@ -1710,10 +1707,10 @@
 					view->renderer, parms->cx, parms->cy,
 					bx - parms->cx, by - parms->cy, side, -1.,
 					axis_base->major_tick_labeled);
-				padding->wl = MAX (0., tmp.x - bbox.x);
-				padding->ht = MAX (0., tmp.y - bbox.y);
-				padding->wr = MAX (0., bbox.x + bbox.w - tmp.x - tmp.w);
-				padding->hb = MAX (0., bbox.y + bbox.h - tmp.y - tmp.h);
+				padding->wl = MAX (0., area->x - bbox.x);
+				padding->ht = MAX (0., area->y - bbox.y);
+				padding->wr = MAX (0., bbox.x + bbox.w - area->x - area->w);
+				padding->hb = MAX (0., bbox.y + bbox.h - area->y - area->h);
 				break;
 			case GOG_AXIS_BASE_POINT:
 				if (gog_axis_is_discrete (cross_axis))
@@ -1750,10 +1747,10 @@
 			case GOG_AXIS_BASE_PADDING_REQUEST:
 				bbox = axis_circle_get_bbox (axis_base, view->renderer, c_map,
 							     axis_base->major_tick_labeled);
-				padding->wl = MAX (0., tmp.x - bbox.x);
-				padding->ht = MAX (0., tmp.y - bbox.y);
-				padding->wr = MAX (0., bbox.x + bbox.w - tmp.x - tmp.w);
-				padding->hb = MAX (0., bbox.y + bbox.h - tmp.y - tmp.h);
+				padding->wl = MAX (0., area->x - bbox.x);
+				padding->ht = MAX (0., area->y - bbox.y);
+				padding->wr = MAX (0., bbox.x + bbox.w - area->x - area->w);
+				padding->hb = MAX (0., bbox.y + bbox.h - area->y - area->h);
 				break;
 			case GOG_AXIS_BASE_POINT:
 				point = axis_circle_point (x, y, parms->cx, parms->cy, parms->rx, parms->th1);