goffice r2325 - in branches/goffice-0-6: . plugins/plot_boxes plugins/plot_pie

[jbrefort svn gnome org]

Author: jbrefort
Date: Fri Mar  6 09:51:21 2009
New Revision: 2325
URL: http://svn.gnome.org/viewvc/goffice?rev=2325&view=rev

Log:
2009-03-06  Jean Brefort  <jean brefort normalesup org>

	* plugins/plot_distrib/gog-histogram.c: don't show a marker in the
	legend. [#574340]
	* plugins/plot_pie/gog-pie.c: (gog_pie_view_render): skip points when
	the datum is skipped. [#574348]



Modified:
   branches/goffice-0-6/ChangeLog
   branches/goffice-0-6/NEWS
   branches/goffice-0-6/configure.in
   branches/goffice-0-6/plugins/plot_boxes/gog-histogram.c
   branches/goffice-0-6/plugins/plot_pie/gog-pie.c

Modified: branches/goffice-0-6/NEWS
==============================================================================
--- branches/goffice-0-6/NEWS	(original)
+++ branches/goffice-0-6/NEWS	Fri Mar  6 09:51:21 2009
@@ -2,6 +2,8 @@
 
 Jean:
 	* Fixed crash when adding series to bar chart. [#572354]
+	* Don't display markers in histogram legend. [#574340]
+	* Skip points corresponding to invalid valies in pie charts. [#574348]
 	
 --------------------------------------------------------------------------
 goffice 0.6.6:

Modified: branches/goffice-0-6/configure.in
==============================================================================
--- branches/goffice-0-6/configure.in	(original)
+++ branches/goffice-0-6/configure.in	Fri Mar  6 09:51:21 2009
@@ -100,18 +100,14 @@
 	pangocairo		>= 1.8.1
 	libart-2.0		>= 2.3.11
 	cairo			>= 1.2.0
-	cairo-svg		>= 1.2.0
-	cairo-pdf		>= 1.2.0
-	cairo-ps		>= 1.2.0
 "
 goffice_gtk_reqs="
 	gtk+-2.0		>= 2.6.0
 	libglade-2.0		>= 2.3.6
 "
 goffice_gnome_reqs="
-	gconf-2.0
-	libgnomeui-2.0		>= 2.0.0
-	libgsf-gnome-1		>= 1.12.2
+	gnome-vfs-2.0
+	libgnome-2.0
 "
 
 dnl *******************
@@ -174,7 +170,7 @@
 
 dnl  Checks for Xft/XRender
 AC_CHECK_LIB(Xrender, XRenderFindFormat, 
-	[AC_SUBST(RENDER_LIBS, "-lXrender -lXext")
+	[AC_SUBST(RENDER_LIBS, "-lXrender")
 	 AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])],
 	[AC_SUBST(RENDER_LIBS, "")],
 	[-lXext])

Modified: branches/goffice-0-6/plugins/plot_boxes/gog-histogram.c
==============================================================================
--- branches/goffice-0-6/plugins/plot_boxes/gog-histogram.c	(original)
+++ branches/goffice-0-6/plugins/plot_boxes/gog-histogram.c	Fri Mar  6 09:51:21 2009
@@ -193,7 +193,7 @@
 	plot_klass->desc.num_series_max = 1;
 	plot_klass->series_type = gog_histogram_plot_series_get_type ();
 	plot_klass->axis_set = GOG_AXIS_SET_XY;
-	plot_klass->desc.series.style_fields	= GOG_STYLE_LINE | GOG_STYLE_FILL;
+	plot_klass->desc.series.style_fields	= GOG_STYLE_OUTLINE | GOG_STYLE_FILL;
 	plot_klass->axis_get_bounds   		= gog_histogram_plot_axis_get_bounds;
 }
 
@@ -452,14 +452,6 @@
 }
 
 static void
-gog_histogram_plot_series_init_style (GogStyledObject *gso, GogStyle *style)
-{
-	((GogStyledObjectClass*) gog_histogram_plot_series_parent_klass)->init_style (gso, style);
-
-	style->outline.dash_type = GO_LINE_NONE;
-}
-
-static void
 gog_histogram_plot_series_finalize (GObject *obj)
 {
 	GogHistogramPlotSeries *series = GOG_HISTOGRAM_PLOT_SERIES (obj);
@@ -507,7 +499,6 @@
 	gog_histogram_plot_series_parent_klass = g_type_class_peek_parent (obj_klass);
 	obj_klass->update = gog_histogram_plot_series_update;
 	gog_klass->view_type	= gog_histogram_series_view_get_type ();
-	gso_klass->init_style = gog_histogram_plot_series_init_style;
 
 	gog_object_register_roles (gog_klass, roles, G_N_ELEMENTS (roles));
 

Modified: branches/goffice-0-6/plugins/plot_pie/gog-pie.c
==============================================================================
--- branches/goffice-0-6/plugins/plot_pie/gog-pie.c	(original)
+++ branches/goffice-0-6/plugins/plot_pie/gog-pie.c	Fri Mar  6 09:51:21 2009
@@ -728,8 +728,12 @@
 		overrides = gog_series_get_overrides (GOG_SERIES (series));
 		for (k = 0 ; k < series->base.num_elements; k++) {
 			len = fabs (vals[k]) * scale;
-			if (!go_finite (len) || len < 1e-3)
+			if (!go_finite (len) || len < 1e-3) {
+				if ((overrides != NULL) &&
+				    (GOG_SERIES_ELEMENT (overrides->data)->index == k))
+					overrides = overrides->next;
 				continue;
+			}
 
 			gpse = NULL;
 			if ((overrides != NULL) &&