[goffice] fixed xl surfaces
- From: Jean Bréfort <jbrefort src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [goffice] fixed xl surfaces
- Date: Fri, 4 Sep 2009 06:50:04 +0000 (UTC)
commit e5c16cb764af67ea5cbcdf0ea40ccf51e906e8de
Author: Jean Brefort <jean brefort normalesup org>
Date: Fri Sep 4 08:38:43 2009 +0200
fixed xl surfaces
ChangeLog | 7 +++++++
NEWS | 2 +-
plugins/plot_surface/gog-surface.c | 1 -
plugins/plot_surface/xl-surface.c | 5 ++++-
4 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 73b5344..0090c09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-04 Jean Brefort <jean brefort normalesup org>
+
+ * plugins/plot_surface/xl-surface.c
+ (xl_xyz_series_init_style): avoid edition of unused styles,
+ (xl_contour_plot_class_init), (xl_surface_plot_class_init):
+ allow series insertion, and fix surface series style. [#594070, #594077]
+
2009-09-03 Jody Goldberg <jody gnome org>
* goffice/Makefile.am : move win32 .def file from foocanvas to goc
diff --git a/NEWS b/NEWS
index 751c8fa..a4adf78 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ goffice 0.7.12:
Jean:
* Deprecated GOStyle::outline. [#593608]
- * Fixed import of surface plots from excel. [#593937]
+ * Fixed import of surface plots from excel. [#593937, #594070, #594077]
Jody:
* [win32] build fixes.
diff --git a/plugins/plot_surface/gog-surface.c b/plugins/plot_surface/gog-surface.c
index 55eb9ef..d3e55e2 100644
--- a/plugins/plot_surface/gog-surface.c
+++ b/plugins/plot_surface/gog-surface.c
@@ -168,7 +168,6 @@ gog_surface_view_render (GogView *view, GogViewAllocation const *bbox)
return;
}
-
style = go_styled_object_get_style (GO_STYLED_OBJECT (series));
/* Build the tiles list */
diff --git a/plugins/plot_surface/xl-surface.c b/plugins/plot_surface/xl-surface.c
index d6314c9..1baa432 100644
--- a/plugins/plot_surface/xl-surface.c
+++ b/plugins/plot_surface/xl-surface.c
@@ -66,6 +66,7 @@ static void
xl_xyz_series_init_style (GogStyledObject *gso, GOStyle *style)
{
series_parent_klass->init_style (gso, style);
+ style->interesting_fields = 0; /* a quick hack to hide the style in the guru */
}
static void
@@ -308,6 +309,7 @@ xl_contour_plot_class_init (GogContourPlotClass *klass)
gog_plot_klass->desc.series.style_fields = 0;
}
/* Fill in GogPlotClass methods */
+ gog_plot_klass->desc.num_series_max = G_MAXINT;
gog_plot_klass->axis_get_bounds = xl_xyz_plot_axis_get_bounds;
gog_plot_klass->series_type = xl_xyz_series_get_type();
@@ -397,9 +399,10 @@ xl_surface_plot_class_init (GogSurfacePlotClass *klass)
};
gog_plot_klass->desc.series.dim = dimensions;
gog_plot_klass->desc.series.num_dim = G_N_ELEMENTS (dimensions);
- gog_plot_klass->desc.series.style_fields = 0;
+ gog_plot_klass->desc.series.style_fields = GO_STYLE_LINE | GO_STYLE_FILL;
}
/* Fill in GogPlotClass methods */
+ gog_plot_klass->desc.num_series_max = G_MAXINT;
gog_plot_klass->axis_get_bounds = xl_xyz_plot_axis_get_bounds;
gog_plot_klass->series_type = xl_xyz_series_get_type();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]