[gnumeric] write loext:*intercept*
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] write loext:*intercept*
- Date: Mon, 26 Jan 2015 07:42:42 +0000 (UTC)
commit 64388169ea6ccb744e28968c2ec0a7f117efbd81
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Mon Jan 26 00:40:46 2015 -0700
write loext:*intercept*
2015-01-25 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (odf_write_plot_style_affine): new
(odf_write_lin_reg): call odf_write_plot_style_affine
(odf_write_polynom_reg): call odf_write_plot_style_affine
(odf_write_exp_reg): call odf_write_plot_style_affine
plugins/openoffice/ChangeLog | 7 +++++++
plugins/openoffice/openoffice-write.c | 20 ++++++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 61eeb4f..23c8239 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,12 @@
2015-01-25 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-write.c (odf_write_plot_style_affine): new
+ (odf_write_lin_reg): call odf_write_plot_style_affine
+ (odf_write_polynom_reg): call odf_write_plot_style_affine
+ (odf_write_exp_reg): call odf_write_plot_style_affine
+
+2015-01-25 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-write.c (odf_write_data_attribute): add argument, change all callers
and write loext extendion if appropriate
(odf_write_reg_name): pass loext extension name to odf_write_data_attribute
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 750225e..cd04424 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -8120,15 +8120,26 @@ odf_write_reg_name (GnmOOExport *state, GogObject const *obj)
}
static void
+odf_write_plot_style_affine (GsfXMLOut *xml, GogObject const *plot, float intercept)
+{
+ gboolean b;
+ if (gnm_object_has_readable_prop (plot, "affine", G_TYPE_BOOLEAN, &b)) {
+ odf_add_bool (xml, GNMSTYLE "regression-affine", b);
+ odf_add_bool (xml, LOEXT "regression-force-intercept", !b);
+ gsf_xml_out_add_float (xml, LOEXT "regression-intercept-value", intercept, -1);
+ }
+}
+
+
+static void
odf_write_lin_reg (GnmOOExport *state, G_GNUC_UNUSED GOStyle const *style,
GogObject const *obj)
{
gsf_xml_out_add_cstr (state->xml, CHART "regression-type", "linear");
if (state->with_extension) {
- odf_write_plot_style_bool (state->xml, obj,
- "affine", GNMSTYLE "regression-affine");
odf_write_plot_style_uint (state->xml, obj,
"dims", GNMSTYLE "regression-polynomial-dims");
+ odf_write_plot_style_affine (state->xml, obj, 0.);
}
odf_write_reg_name (state, obj);
}
@@ -8142,8 +8153,7 @@ odf_write_polynom_reg (GnmOOExport *state, G_GNUC_UNUSED GOStyle const *style,
GNMSTYLE "polynomial");
odf_write_plot_style_uint (state->xml, obj,
"dims", GNMSTYLE "regression-polynomial-dims");
- odf_write_plot_style_bool (state->xml, obj,
- "affine", GNMSTYLE "regression-affine");
+ odf_write_plot_style_affine (state->xml, obj, 0.);
}
odf_write_reg_name (state, obj);
}
@@ -8153,6 +8163,8 @@ odf_write_exp_reg (GnmOOExport *state, G_GNUC_UNUSED GOStyle const *style,
G_GNUC_UNUSED GogObject const *obj)
{
gsf_xml_out_add_cstr (state->xml, CHART "regression-type", "exponential");
+ if (state->with_extension)
+ odf_write_plot_style_affine (state->xml, obj, 1.);
odf_write_reg_name (state, obj);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]