[goffice] Commit patch for #681846
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Commit patch for #681846
- Date: Tue, 14 Aug 2012 19:15:12 +0000 (UTC)
commit 8b6ba366c6f9de564df0cc89f80fa77aaf361fc2
Author: Jean Brefort <jean brefort normalesup org>
Date: Tue Aug 14 21:14:39 2012 +0200
Commit patch for #681846
ChangeLog | 8 +++
NEWS | 3 +
goffice/canvas/goc-canvas.c | 2 +-
goffice/canvas/goc-group.c | 5 ++
goffice/canvas/goc-group.h | 2 +
goffice/canvas/goc-utils.c | 2 +-
goffice/data/go-data.c | 6 ++
goffice/graph/gog-graph.c | 2 +-
goffice/graph/gog-series-labels.c | 2 +-
goffice/graph/gog-view.c | 2 +-
goffice/math/go-complex.c | 56 +++++++++---------
goffice/math/go-complex.h | 114 ++++++++++++++++++-----------------
goffice/math/go-quad.c | 2 +
goffice/utils/go-font.c | 7 ++
goffice/utils/go-path.c | 59 ++++++++++++++++++
goffice/utils/go-spectre.c | 3 +-
goffice/utils/go-style.c | 59 ++++++++++++++++++
goffice/utils/go-undo.c | 22 +++++++
plugins/plot_xy/gog-bubble-prefs.ui | 70 ++++++++++++++-------
19 files changed, 312 insertions(+), 114 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c6da450..09074c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-14 Jean Brefort <jean brefort normalesup org>
+
+ * plugins/plot_xy/gog-bubble-prefs.ui: one more 3d->3D.
+
+2012-08-14 Quentin Glidic <sardemff7+gnome sardemff7 net>
+ * goffice/utils/go-spectre.c (go_spectre_load_data): fix build with
+ libspectre. [#681846]
+
2012-08-13 Jean BrÃfort <jean brefort normalesup org>
* goffice/graph/gog-plot-impl.h: removed unused field in GogPlotDesc.
diff --git a/NEWS b/NEWS
index 4c19c1a..1c172cc 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ Jean:
Morten:
* Minute accuracy improvement to matrix inversion.
+Quentin Glidic:
+ * Fix build with libspectre. [#681846]
+
--------------------------------------------------------------------------
goffice 0.9.5:
diff --git a/goffice/canvas/goc-canvas.c b/goffice/canvas/goc-canvas.c
index 5dd766d..5a8dc3d 100644
--- a/goffice/canvas/goc-canvas.c
+++ b/goffice/canvas/goc-canvas.c
@@ -596,7 +596,7 @@ goc_canvas_get_cur_event (GocCanvas *canvas)
/**
* goc_canvas_set_direction:
* @canvas: #GocCanvas
- * direction: #GocDirection
+ * @direction: #GocDirection
*
* Sets the direction used by the canvas.
**/
diff --git a/goffice/canvas/goc-group.c b/goffice/canvas/goc-group.c
index d3707ca..763c134 100644
--- a/goffice/canvas/goc-group.c
+++ b/goffice/canvas/goc-group.c
@@ -25,6 +25,11 @@
#include <glib/gi18n-lib.h>
#include <gsf/gsf-impl-utils.h>
+/**
+ * GocGroupClass:
+ * @base: base class.
+ **/
+
static GocItemClass *parent_klass;
enum {
diff --git a/goffice/canvas/goc-group.h b/goffice/canvas/goc-group.h
index d91ce80..e379ba2 100644
--- a/goffice/canvas/goc-group.h
+++ b/goffice/canvas/goc-group.h
@@ -40,6 +40,8 @@ typedef struct _GocGroupClass GocGroupClass;
struct _GocGroupClass
{
GocItemClass base;
+
+ /* <private> */
void (*reserved1) (void);
void (*reserved2) (void);
void (*reserved3) (void);
diff --git a/goffice/canvas/goc-utils.c b/goffice/canvas/goc-utils.c
index 4a633df..8c1e9a5 100644
--- a/goffice/canvas/goc-utils.c
+++ b/goffice/canvas/goc-utils.c
@@ -110,9 +110,9 @@ goc_points_get_type (void)
/**
* GocIntArray:
- * @n: the size of the array.
* @vals: The embedded values.
*
+ * FocIntArray::n is the size of the array.
* A boxed type used to hold an array of integers.
* Since: 0.8.2
**/
diff --git a/goffice/data/go-data.c b/goffice/data/go-data.c
index 095e853..65fde2a 100644
--- a/goffice/data/go-data.c
+++ b/goffice/data/go-data.c
@@ -33,6 +33,12 @@
#define GO_IS_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_DATA))
#define GO_DATA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_DATA, GODataClass))
+/**
+ * GODataMatrixSize:
+ * @rows: rows number, negative if dirty, includes missing values.
+ * @columns: columns number, negative if dirty, includes missing values.
+ **/
+
enum {
CHANGED,
LAST_SIGNAL
diff --git a/goffice/graph/gog-graph.c b/goffice/graph/gog-graph.c
index 4b17ac7..4f21ac9 100644
--- a/goffice/graph/gog-graph.c
+++ b/goffice/graph/gog-graph.c
@@ -97,7 +97,7 @@
/**
* GogDataType:
- * @GOG_DATA_SCALAR: scalar value.
+ * @GOG_DATA_SCALAR: scalar value.
* @GOG_DATA_VECTOR: vector data.
* @GOG_DATA_MATRIX: matrix data.
**/
diff --git a/goffice/graph/gog-series-labels.c b/goffice/graph/gog-series-labels.c
index 28a8400..dc4fe28 100644
--- a/goffice/graph/gog-series-labels.c
+++ b/goffice/graph/gog-series-labels.c
@@ -33,7 +33,7 @@ static GObjectClass *series_labels_parent_klass;
* @str: the string to display.
* @legend_pos: the label position.
* @point: #GogObject
-}
+}
**/
/**
diff --git a/goffice/graph/gog-view.c b/goffice/graph/gog-view.c
index 46d5222..0c13a61 100644
--- a/goffice/graph/gog-view.c
+++ b/goffice/graph/gog-view.c
@@ -36,7 +36,7 @@
* @build_toolkit: builds the associated toolkit.
* @get_tip_at_point: gets tip at pointer position.
* @natural_size: gets natural size.
- *
+ *
* the GogViewClass::clip firled should be set to %TRUE to clip drawings to
* the vew allocation.
**/
diff --git a/goffice/math/go-complex.c b/goffice/math/go-complex.c
index 1f94ae1..c46fc4f 100644
--- a/goffice/math/go-complex.c
+++ b/goffice/math/go-complex.c
@@ -60,7 +60,7 @@
/* ------------------------------------------------------------------------- */
char *
-SUFFIX(go_complex_to_string) (SUFFIX(go_complex) const *src, char const *reformat,
+SUFFIX(go_complex_to_string) (SUFFIX(GOComplex) const *src, char const *reformat,
char const *imformat, char imunit)
{
char *re_buffer = NULL;
@@ -125,7 +125,7 @@ SUFFIX(is_unit_imaginary) (char const *src, DOUBLE *im, char *imunit)
}
int
-SUFFIX(go_complex_from_string) (SUFFIX(go_complex) *dst, char const *src, char *imunit)
+SUFFIX(go_complex_from_string) (SUFFIX(GOComplex) *dst, char const *src, char *imunit)
{
DOUBLE x, y;
char *end;
@@ -179,7 +179,7 @@ SUFFIX(go_complex_from_string) (SUFFIX(go_complex) *dst, char const *src, char *
/* ------------------------------------------------------------------------- */
void
-SUFFIX(go_complex_to_polar) (DOUBLE *mod, DOUBLE *angle, SUFFIX(go_complex) const *src)
+SUFFIX(go_complex_to_polar) (DOUBLE *mod, DOUBLE *angle, SUFFIX(GOComplex) const *src)
{
*mod = SUFFIX(go_complex_mod) (src);
*angle = SUFFIX(go_complex_angle) (src);
@@ -188,7 +188,7 @@ SUFFIX(go_complex_to_polar) (DOUBLE *mod, DOUBLE *angle, SUFFIX(go_complex) cons
/* ------------------------------------------------------------------------- */
void
-SUFFIX(go_complex_from_polar) (SUFFIX(go_complex) *dst, DOUBLE mod, DOUBLE angle)
+SUFFIX(go_complex_from_polar) (SUFFIX(GOComplex) *dst, DOUBLE mod, DOUBLE angle)
{
SUFFIX(go_complex_init) (dst, mod * SUFFIX(cos) (angle), mod * SUFFIX(sin) (angle));
}
@@ -196,7 +196,7 @@ SUFFIX(go_complex_from_polar) (SUFFIX(go_complex) *dst, DOUBLE mod, DOUBLE angle
/* ------------------------------------------------------------------------- */
void
-SUFFIX(go_complex_mul) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SUFFIX(go_complex) const *b)
+SUFFIX(go_complex_mul) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *a, SUFFIX(GOComplex) const *b)
{
SUFFIX(go_complex_init) (dst,
a->re * b->re - a->im * b->im,
@@ -206,7 +206,7 @@ SUFFIX(go_complex_mul) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SU
/* ------------------------------------------------------------------------- */
void
-SUFFIX(go_complex_div) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SUFFIX(go_complex) const *b)
+SUFFIX(go_complex_div) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *a, SUFFIX(GOComplex) const *b)
{
DOUBLE bmod = SUFFIX(go_complex_mod) (b);
@@ -230,7 +230,7 @@ SUFFIX(go_complex_div) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SU
/* ------------------------------------------------------------------------- */
void
-SUFFIX(go_complex_sqrt) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *src)
+SUFFIX(go_complex_sqrt) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *src)
{
if (SUFFIX(go_complex_real_p) (src)) {
if (src->re >= 0)
@@ -246,7 +246,7 @@ SUFFIX(go_complex_sqrt) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *src)
/* ------------------------------------------------------------------------- */
void
-SUFFIX(go_complex_pow) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SUFFIX(go_complex) const *b)
+SUFFIX(go_complex_pow) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *a, SUFFIX(GOComplex) const *b)
{
if (SUFFIX(go_complex_zero_p) (a) && SUFFIX(go_complex_real_p) (b)) {
if (b->re <= 0)
@@ -255,7 +255,7 @@ SUFFIX(go_complex_pow) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SU
SUFFIX(go_complex_real) (dst, 0);
} else {
DOUBLE res_r, res_a1, res_a2, res_a2_pi, r, arg;
- SUFFIX(go_complex) F;
+ SUFFIX(GOComplex) F;
SUFFIX(go_complex_to_polar) (&r, &arg, a);
res_r = SUFFIX(pow) (r, b->re) * SUFFIX(exp) (-b->im * arg);
@@ -290,7 +290,7 @@ SUFFIX(go_complex_pow) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SU
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_init) (SUFFIX(go_complex) *dst, DOUBLE re, DOUBLE im)
+void SUFFIX(go_complex_init) (SUFFIX(GOComplex) *dst, DOUBLE re, DOUBLE im)
{
dst->re = re;
dst->im = im;
@@ -298,13 +298,13 @@ void SUFFIX(go_complex_init) (SUFFIX(go_complex) *dst, DOUBLE re, DOUBLE im)
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_invalid) (SUFFIX(go_complex) *dst)
+void SUFFIX(go_complex_invalid) (SUFFIX(GOComplex) *dst)
{
dst->re = SUFFIX(go_nan);
dst->im = SUFFIX(go_nan);
}
-void SUFFIX(go_complex_real) (SUFFIX(go_complex) *dst, DOUBLE re)
+void SUFFIX(go_complex_real) (SUFFIX(GOComplex) *dst, DOUBLE re)
{
dst->re = re;
dst->im = 0;
@@ -312,35 +312,35 @@ void SUFFIX(go_complex_real) (SUFFIX(go_complex) *dst, DOUBLE re)
/* ------------------------------------------------------------------------- */
-int SUFFIX(go_complex_real_p) (SUFFIX(go_complex) const *src)
+int SUFFIX(go_complex_real_p) (SUFFIX(GOComplex) const *src)
{
return src->im == 0;
}
/* ------------------------------------------------------------------------- */
-int SUFFIX(go_complex_zero_p) (SUFFIX(go_complex) const *src)
+int SUFFIX(go_complex_zero_p) (SUFFIX(GOComplex) const *src)
{
return src->re == 0 && src->im == 0;
}
/* ------------------------------------------------------------------------- */
-int SUFFIX(go_complex_invalid_p) (SUFFIX(go_complex) const *src)
+int SUFFIX(go_complex_invalid_p) (SUFFIX(GOComplex) const *src)
{
return !(SUFFIX(go_finite) (src->re) && SUFFIX(go_finite) (src->im));
}
/* ------------------------------------------------------------------------- */
-DOUBLE SUFFIX(go_complex_mod) (SUFFIX(go_complex) const *src)
+DOUBLE SUFFIX(go_complex_mod) (SUFFIX(GOComplex) const *src)
{
return SUFFIX(hypot) (src->re, src->im);
}
/* ------------------------------------------------------------------------- */
-DOUBLE SUFFIX(go_complex_angle) (SUFFIX(go_complex) const *src)
+DOUBLE SUFFIX(go_complex_angle) (SUFFIX(GOComplex) const *src)
{
return SUFFIX(atan2) (src->im, src->re);
}
@@ -351,7 +351,7 @@ DOUBLE SUFFIX(go_complex_angle) (SUFFIX(go_complex) const *src)
* nice round numbers not suffering from rounding errors).
*/
-DOUBLE SUFFIX(go_complex_angle_pi) (SUFFIX(go_complex) const *src)
+DOUBLE SUFFIX(go_complex_angle_pi) (SUFFIX(GOComplex) const *src)
{
if (src->im == 0)
return (src->re >= 0 ? 0 : -1);
@@ -367,14 +367,14 @@ DOUBLE SUFFIX(go_complex_angle_pi) (SUFFIX(go_complex) const *src)
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_conj) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *src)
+void SUFFIX(go_complex_conj) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *src)
{
SUFFIX(go_complex_init) (dst, src->re, -src->im);
}
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_scale_real) (SUFFIX(go_complex) *dst, DOUBLE f)
+void SUFFIX(go_complex_scale_real) (SUFFIX(GOComplex) *dst, DOUBLE f)
{
dst->re *= f;
dst->im *= f;
@@ -382,21 +382,21 @@ void SUFFIX(go_complex_scale_real) (SUFFIX(go_complex) *dst, DOUBLE f)
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_add) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SUFFIX(go_complex) const *b)
+void SUFFIX(go_complex_add) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *a, SUFFIX(GOComplex) const *b)
{
SUFFIX(go_complex_init) (dst, a->re + b->re, a->im + b->im);
}
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_sub) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *a, SUFFIX(go_complex) const *b)
+void SUFFIX(go_complex_sub) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *a, SUFFIX(GOComplex) const *b)
{
SUFFIX(go_complex_init) (dst, a->re - b->re, a->im - b->im);
}
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_exp) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *src)
+void SUFFIX(go_complex_exp) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *src)
{
SUFFIX(go_complex_init) (dst,
SUFFIX(exp) (src->re) * SUFFIX(cos) (src->im),
@@ -405,7 +405,7 @@ void SUFFIX(go_complex_exp) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_ln) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *src)
+void SUFFIX(go_complex_ln) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *src)
{
SUFFIX(go_complex_init) (dst,
SUFFIX(log) (SUFFIX(go_complex_mod) (src)),
@@ -414,7 +414,7 @@ void SUFFIX(go_complex_ln) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *s
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_sin) ( SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *src)
+void SUFFIX(go_complex_sin) ( SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *src)
{
SUFFIX(go_complex_init) (dst,
SUFFIX(sin) (src->re) * SUFFIX(cosh) (src->im),
@@ -423,7 +423,7 @@ void SUFFIX(go_complex_sin) ( SUFFIX(go_complex) *dst, SUFFIX(go_complex) const
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_cos) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *src)
+void SUFFIX(go_complex_cos) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *src)
{
SUFFIX(go_complex_init) (dst,
SUFFIX(cos) (src->re) * SUFFIX(cosh) (src->im),
@@ -432,9 +432,9 @@ void SUFFIX(go_complex_cos) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const
/* ------------------------------------------------------------------------- */
-void SUFFIX(go_complex_tan) (SUFFIX(go_complex) *dst, SUFFIX(go_complex) const *src)
+void SUFFIX(go_complex_tan) (SUFFIX(GOComplex) *dst, SUFFIX(GOComplex) const *src)
{
- SUFFIX(go_complex) s, c;
+ SUFFIX(GOComplex) s, c;
SUFFIX(go_complex_sin) (&s, src);
SUFFIX(go_complex_cos) (&c, src);
diff --git a/goffice/math/go-complex.h b/goffice/math/go-complex.h
index cf0813e..7620c64 100644
--- a/goffice/math/go-complex.h
+++ b/goffice/math/go-complex.h
@@ -7,82 +7,84 @@ G_BEGIN_DECLS
typedef struct {
double re, im;
-} go_complex;
+} GOComplex;
+#define go_complex GOComplex
#ifdef GOFFICE_WITH_LONG_DOUBLE
typedef struct {
long double re, im;
-} go_complexl;
+} GOComplexl;
+#define go_complexl GOComplexl
#endif
#include "go-math.h"
/* ------------------------------------------------------------------------- */
-char *go_complex_to_string (go_complex const *src, char const *reformat,
+char *go_complex_to_string (GOComplex const *src, char const *reformat,
char const *imformat, char imunit);
-int go_complex_from_string (go_complex *dst, char const *src, char *imunit);
-
-void go_complex_to_polar (double *mod, double *angle, go_complex const *src);
-void go_complex_from_polar (go_complex *dst, double mod, double angle);
-void go_complex_mul (go_complex *dst, go_complex const *a, go_complex const *b);
-void go_complex_div (go_complex *dst, go_complex const *a, go_complex const *b);
-void go_complex_pow (go_complex *dst, go_complex const *a, go_complex const *b);
-void go_complex_sqrt (go_complex *dst, go_complex const *src);
-void go_complex_init (go_complex *dst, double re, double im);
-void go_complex_invalid (go_complex *dst);
-void go_complex_real (go_complex *dst, double re);
-int go_complex_real_p (go_complex const *src);
-int go_complex_zero_p (go_complex const *src);
-int go_complex_invalid_p (go_complex const *src);
-double go_complex_mod (go_complex const *src);
-double go_complex_angle (go_complex const *src);
-double go_complex_angle_pi (go_complex const *src);
-void go_complex_conj (go_complex *dst, go_complex const *src);
-void go_complex_scale_real (go_complex *dst, double f);
-void go_complex_add (go_complex *dst, go_complex const *a, go_complex const *b);
-void go_complex_sub (go_complex *dst, go_complex const *a, go_complex const *b);
-void go_complex_exp (go_complex *dst, go_complex const *src);
-void go_complex_ln (go_complex *dst, go_complex const *src);
-void go_complex_sin (go_complex *dst, go_complex const *src);
-void go_complex_cos (go_complex *dst, go_complex const *src);
-void go_complex_tan (go_complex *dst, go_complex const *src);
+int go_complex_from_string (GOComplex *dst, char const *src, char *imunit);
+
+void go_complex_to_polar (double *mod, double *angle, GOComplex const *src);
+void go_complex_from_polar (GOComplex *dst, double mod, double angle);
+void go_complex_mul (GOComplex *dst, GOComplex const *a, GOComplex const *b);
+void go_complex_div (GOComplex *dst, GOComplex const *a, GOComplex const *b);
+void go_complex_pow (GOComplex *dst, GOComplex const *a, GOComplex const *b);
+void go_complex_sqrt (GOComplex *dst, GOComplex const *src);
+void go_complex_init (GOComplex *dst, double re, double im);
+void go_complex_invalid (GOComplex *dst);
+void go_complex_real (GOComplex *dst, double re);
+int go_complex_real_p (GOComplex const *src);
+int go_complex_zero_p (GOComplex const *src);
+int go_complex_invalid_p (GOComplex const *src);
+double go_complex_mod (GOComplex const *src);
+double go_complex_angle (GOComplex const *src);
+double go_complex_angle_pi (GOComplex const *src);
+void go_complex_conj (GOComplex *dst, GOComplex const *src);
+void go_complex_scale_real (GOComplex *dst, double f);
+void go_complex_add (GOComplex *dst, GOComplex const *a, GOComplex const *b);
+void go_complex_sub (GOComplex *dst, GOComplex const *a, GOComplex const *b);
+void go_complex_exp (GOComplex *dst, GOComplex const *src);
+void go_complex_ln (GOComplex *dst, GOComplex const *src);
+void go_complex_sin (GOComplex *dst, GOComplex const *src);
+void go_complex_cos (GOComplex *dst, GOComplex const *src);
+void go_complex_tan (GOComplex *dst, GOComplex const *src);
/* ------------------------------------------------------------------------- */
/* long double version */
#ifdef GOFFICE_WITH_LONG_DOUBLE
-char *go_complex_to_stringl (go_complexl const *src, char const *reformat,
+char *go_complex_to_stringl (GOComplexl const *src, char const *reformat,
char const *imformat, char imunit);
-int go_complex_from_stringl (go_complexl *dst, char const *src, char *imunit);
-
-void go_complex_to_polarl (long double *mod, long double *angle, go_complexl const *src);
-void go_complex_from_polarl (go_complexl *dst, long double mod, long double angle);
-void go_complex_mull (go_complexl *dst, go_complexl const *a, go_complexl const *b);
-void go_complex_divl (go_complexl *dst, go_complexl const *a, go_complexl const *b);
-void go_complex_powl (go_complexl *dst, go_complexl const *a, go_complexl const *b);
-void go_complex_sqrtl (go_complexl *dst, go_complexl const *src);
-void go_complex_initl (go_complexl *dst, long double re, long double im);
-void go_complex_invalidl (go_complexl *dst);
-void go_complex_reall (go_complexl *dst, long double re);
-int go_complex_real_pl (go_complexl const *src);
-int go_complex_zero_pl (go_complexl const *src);
-int go_complex_invalid_pl (go_complexl const *src);
-long double go_complex_modl (go_complexl const *src);
-long double go_complex_anglel (go_complexl const *src);
-long double go_complex_angle_pil (go_complexl const *src);
-void go_complex_conjl (go_complexl *dst, go_complexl const *src);
-void go_complex_scale_reall (go_complexl *dst, long double f);
-void go_complex_addl (go_complexl *dst, go_complexl const *a, go_complexl const *b);
-void go_complex_subl (go_complexl *dst, go_complexl const *a, go_complexl const *b);
-void go_complex_expl (go_complexl *dst, go_complexl const *src);
-void go_complex_lnl (go_complexl *dst, go_complexl const *src);
-void go_complex_sinl (go_complexl *dst, go_complexl const *src);
-void go_complex_cosl (go_complexl *dst, go_complexl const *src);
-void go_complex_tanl (go_complexl *dst, go_complexl const *src);
+int go_complex_from_stringl (GOComplexl *dst, char const *src, char *imunit);
+
+void go_complex_to_polarl (long double *mod, long double *angle, GOComplexl const *src);
+void go_complex_from_polarl (GOComplexl *dst, long double mod, long double angle);
+void go_complex_mull (GOComplexl *dst, GOComplexl const *a, GOComplexl const *b);
+void go_complex_divl (GOComplexl *dst, GOComplexl const *a, GOComplexl const *b);
+void go_complex_powl (GOComplexl *dst, GOComplexl const *a, GOComplexl const *b);
+void go_complex_sqrtl (GOComplexl *dst, GOComplexl const *src);
+void go_complex_initl (GOComplexl *dst, long double re, long double im);
+void go_complex_invalidl (GOComplexl *dst);
+void go_complex_reall (GOComplexl *dst, long double re);
+int go_complex_real_pl (GOComplexl const *src);
+int go_complex_zero_pl (GOComplexl const *src);
+int go_complex_invalid_pl (GOComplexl const *src);
+long double go_complex_modl (GOComplexl const *src);
+long double go_complex_anglel (GOComplexl const *src);
+long double go_complex_angle_pil (GOComplexl const *src);
+void go_complex_conjl (GOComplexl *dst, GOComplexl const *src);
+void go_complex_scale_reall (GOComplexl *dst, long double f);
+void go_complex_addl (GOComplexl *dst, GOComplexl const *a, GOComplexl const *b);
+void go_complex_subl (GOComplexl *dst, GOComplexl const *a, GOComplexl const *b);
+void go_complex_expl (GOComplexl *dst, GOComplexl const *src);
+void go_complex_lnl (GOComplexl *dst, GOComplexl const *src);
+void go_complex_sinl (GOComplexl *dst, GOComplexl const *src);
+void go_complex_cosl (GOComplexl *dst, GOComplexl const *src);
+void go_complex_tanl (GOComplexl *dst, GOComplexl const *src);
#endif /* GOFFICE_WITH_LONG_DOUBLE */
diff --git a/goffice/math/go-quad.c b/goffice/math/go-quad.c
index 6d11912..b25afbc 100644
--- a/goffice/math/go-quad.c
+++ b/goffice/math/go-quad.c
@@ -107,12 +107,14 @@ static DOUBLE SUFFIX(CST);
*
* Initializes #GOQuad arythmetics. Any use of #GOQuad must occur between calls
* to go_quad_start() and go_quad_end().
+ * Returns: (transfer full): a pointer to pass to go_quad_end() when done.
**/
/**
* go_quad_startl: (skip)
*
* Initializes #GOQuadl arythmetics. Any use of #GOQuadl must occur between calls
* to go_quad_startl() and go_quad_endl().
+ * Returns: (transfer full): a pointer to pass to go_quad_endl() when done.
**/
void *
SUFFIX(go_quad_start) (void)
diff --git a/goffice/utils/go-font.c b/goffice/utils/go-font.c
index c49f76c..ea51f76 100644
--- a/goffice/utils/go-font.c
+++ b/goffice/utils/go-font.c
@@ -23,6 +23,13 @@
#include <pango/pango-layout.h>
#include <string.h>
+/**
+ * GOFontScript:
+ * @GO_FONT_SCRIPT_SUB: subscript.
+ * @GO_FONT_SCRIPT_STANDARD: normal.
+ * @GO_FONT_SCRIPT_SUPER: superscript.
+ **/
+
static GHashTable *font_hash;
static GPtrArray *font_array;
static GSList *font_watchers;
diff --git a/goffice/utils/go-path.c b/goffice/utils/go-path.c
index f70acfe..bc265c7 100644
--- a/goffice/utils/go-path.c
+++ b/goffice/utils/go-path.c
@@ -33,6 +33,65 @@
#include <goffice/utils/go-cairo.h>
#include <string.h>
+/* the five following does not belong there, but they don't in any other .c file */
+
+/**
+ * GOPoint:
+ * @x: horizontal position.
+ * @y: vertical position.
+ **/
+
+/**
+ * GORect:
+ * @top: top.
+ * @left: left.
+ * @bottom: bottom.
+ * @right: right.
+ **/
+
+/**
+ * GOAnchorType:
+ * @GO_ANCHOR_CENTER: anchor center.
+ * @GO_ANCHOR_NORTH: anchor top.
+ * @GO_ANCHOR_NORTH_WEST: anchor top left.
+ * @GO_ANCHOR_NORTH_EAST: anchor top left.
+ * @GO_ANCHOR_SOUTH: anchor bottom.
+ * @GO_ANCHOR_SOUTH_WEST: anchor bottom left.
+ * @GO_ANCHOR_SOUTH_EAST: anchor bottom left.
+ * @GO_ANCHOR_WEST: anchor left.
+ * @GO_ANCHOR_EAST: anchor right.
+ * @GO_ANCHOR_N: anchor top.
+ * @GO_ANCHOR_NW: anchor top left.
+ * @GO_ANCHOR_NE: anchor top left.
+ * @GO_ANCHOR_S: anchor bottom.
+ * @GO_ANCHOR_SW: anchor bottom left.
+ * @GO_ANCHOR_SE: anchor bottom left.
+ * @GO_ANCHOR_W: anchor left.
+ * @GO_ANCHOR_E: anchor right.
+ **/
+
+/**
+ * GODrawingAnchor:
+ * @pos_pts: position in points.
+ * @direction: #GODrawingAnchorDir
+ **/
+
+/**
+ * GODrawingAnchorDir:
+ * @GOD_ANCHOR_DIR_UNKNOWN: unknown.
+ * @GOD_ANCHOR_DIR_UP_LEFT: up left.
+ * @GOD_ANCHOR_DIR_UP_RIGHT: up right.
+ * @GOD_ANCHOR_DIR_DOWN_LEFT: down left.
+ * @GOD_ANCHOR_DIR_DOWN_RIGHT: down right.
+ * @GOD_ANCHOR_DIR_NONE_MASK: mask for none.
+ * @GOD_ANCHOR_DIR_H_MASK: horizontal mask.
+ * @GOD_ANCHOR_DIR_RIGHT: right
+ * @GOD_ANCHOR_DIR_V_MASK: vertical mask.
+ * @GOD_ANCHOR_DIR_DOWN: down
+ **/
+
+/************************************/
+
/**
* GOPathOptions
* @GO_PATH_OPTIONS_SNAP_COORDINATES: round coordinates to avoid aliasing in pixbufs.
diff --git a/goffice/utils/go-spectre.c b/goffice/utils/go-spectre.c
index e6ffee9..f7e9fa6 100644
--- a/goffice/utils/go-spectre.c
+++ b/goffice/utils/go-spectre.c
@@ -65,6 +65,7 @@ static void
go_spectre_load_data (GOImage *image, GsfXMLIn *xin)
{
#ifdef GOFFICE_WITH_EPS
+ GOSpectre *spectre = GO_SPECTRE (image);
int width, height;
char *tmpname;
int f;
@@ -81,7 +82,7 @@ go_spectre_load_data (GOImage *image, GsfXMLIn *xin)
see https://bugs.freedesktop.org/show_bug.cgi?id=42424 */
tmpname = g_strdup ("/tmp/epsXXXXXX.eps");
f = g_mkstemp (tmpname);
- write (f, image->data, spectre->data_length);
+ write (f, image->data, image->data_length);
close (f);
spectre_document_load (spectre->doc, tmpname);
if (spectre_document_status (spectre->doc) != SPECTRE_STATUS_SUCCESS)
diff --git a/goffice/utils/go-style.c b/goffice/utils/go-style.c
index b5d100e..438c570 100644
--- a/goffice/utils/go-style.c
+++ b/goffice/utils/go-style.c
@@ -32,6 +32,65 @@
#include <string.h>
#include <math.h>
+/**
+ * GOImageType:
+ * @GO_IMAGE_STRETCHED: stretch the image so that it fills the whole area.
+ * @GO_IMAGE_WALLPAPER: repeat the image starting from top left.
+ * @GO_IMAGE_CENTERED: use only one image at its natural size, centered in the area.
+ * @GO_IMAGE_CENTERED_WALLPAPER: repeat the image starting from one at center.
+ **/
+
+/**
+ * GOStyleFill:
+ * @GO_STYLE_FILL_NONE: no filling.
+ * @GO_STYLE_FILL_PATTERN: fill with pattern.
+ * @GO_STYLE_FILL_GRADIENT: fill with a gradient.
+ * @GO_STYLE_FILL_IMAGE: fill with an image.
+ **/
+
+/**
+ * GOStyleFlag:
+ * @GO_STYLE_OUTLINE: outline.
+ * @GO_STYLE_FILL: fill.
+ * @GO_STYLE_LINE: line.
+ * @GO_STYLE_MARKER: marker.
+ * @GO_STYLE_FONT: font.
+ * @GO_STYLE_TEXT_LAYOUT: text orientaiton.
+ * @GO_STYLE_INTERPOLATION: curve interpolation.
+ * @GO_STYLE_MARKER_NO_COLOR: marker with no color.
+ * @GO_STYLE_ALL: all elements
+ *
+ * Gives the meaningful fields in @GOStyle. Anyw combination can be used, except
+ * that @GO_STYLE_OUTLINE and @GO_STYLE_OUTLINE should never coexist.
+ **/
+
+/**
+ * GOStyleLine:
+ * @width: line width:
+ * <0 == no line,
+ * =0 == hairline : unscaled, minimum useful (can be bigger than visible) size.
+ * >0 in pts.
+ * @dash_type: #GOLineDashType.
+ * @auto_dash: automatic dash type.
+ * @color: color is used as background for compatibility
+ * (pattern == 0 means filled with background color).
+ * @fore: second color used for patterned lines.
+ * @auto_color: color is automatic.
+ * @auto_fore: fore is automatic.
+ * @pattern: pattern.
+ * @cap: cap style.
+ * @join: join style.
+ * @miter_limit: mitter limit.
+ **/
+
+/**
+ * GOStyleMark:
+ * @mark: the used #GOMarker.
+ * @auto_shape: automatic @marc.
+ * @auto_outline_color: automatic outline color.
+ * @auto_fill_color: automatic fill color.
+ **/
+
#define HSCALE 100
#define VSCALE 120
diff --git a/goffice/utils/go-undo.c b/goffice/utils/go-undo.c
index 7c88352..1dc357e 100644
--- a/goffice/utils/go-undo.c
+++ b/goffice/utils/go-undo.c
@@ -24,6 +24,28 @@
#include <goffice/utils/go-undo.h>
#include <gsf/gsf-impl-utils.h>
+/**
+ * GOUndoClass:
+ * @base: base class.
+ * @undo: undo.
+};
+ **/
+
+/**
+ * GOUndoBinaryClass:
+ * @base: base class.
+ **/
+
+/**
+ * GOUndoGroupClass:
+ * @base: base class.
+ **/
+
+/**
+ * GOUndoUnaryClass:
+ * @base: base class.
+ **/
+
/* ------------------------------------------------------------------------- */
GSF_CLASS (GOUndo, go_undo, NULL, NULL, G_TYPE_OBJECT)
diff --git a/plugins/plot_xy/gog-bubble-prefs.ui b/plugins/plot_xy/gog-bubble-prefs.ui
index f5c83c7..eb86513 100644
--- a/plugins/plot_xy/gog-bubble-prefs.ui
+++ b/plugins/plot_xy/gog-bubble-prefs.ui
@@ -1,42 +1,61 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="value">100</property>
<property name="upper">300</property>
+ <property name="value">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkTable" id="gog_bubble_prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">5</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkCheckButton" id="3d">
- <property name="label" translatable="yes">3_d</property>
+ <property name="label" translatable="yes">3_D</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="area">
<property name="label" translatable="yes">Sur_face</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -44,16 +63,19 @@
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="diameter">
<property name="label" translatable="yes">Dia_meter</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<property name="group">area</property>
</object>
@@ -61,12 +83,13 @@
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="size_display">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Size represented by:</property>
<property name="use_underline">True</property>
@@ -74,16 +97,19 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="vary_style_by_element">
<property name="label" translatable="yes">_Vary colors by bubble</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -91,16 +117,19 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="show_negative_values">
<property name="label" translatable="yes">Show _negative values</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -108,16 +137,18 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkBox" id="scale_box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="scale_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Bubbles scaled to</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">scale</property>
@@ -132,17 +163,20 @@
<object class="GtkSpinButton" id="scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="percent">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">% of default size</property>
</object>
<packing>
@@ -157,20 +191,8 @@
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
