Commit e161caa8 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

Release 1.2.9


2004-04-05  Jody Goldberg <jody@gnome.org>

	* Release 1.2.9
parent 32a155ed
......@@ -123,7 +123,7 @@ gog_barcol_update_stacked_and_percentage (GogPlot1_5d *model,
if (i >= lengths[j])
continue;
tmp = vals[j][i];
if (!finite (tmp))
if (!finitegnum (tmp))
continue;
if (tmp > 0.)
pos_sum += tmp;
......@@ -317,7 +317,7 @@ gog_barcol_view_render (GogView *view, GogViewAllocation const *bbox)
if (i >= lengths[j])
continue;
tmp = vals[j][i];
if (!finite (tmp))
if (!finitegnum (tmp))
continue;
if (tmp > 0.)
sum += tmp;
......@@ -334,7 +334,7 @@ gog_barcol_view_render (GogView *view, GogViewAllocation const *bbox)
if (i >= lengths[j])
continue;
tmp = vals[j][i];
if (!finite (tmp))
if (!finitegnum (tmp))
continue;
tmp *= data_scale;
if (tmp >= 0.) {
......
......@@ -105,7 +105,7 @@ gog_line_update_stacked_and_percentage (GogPlot1_5d *model,
if (i >= lengths[j])
continue;
tmp = vals[j][i];
if (!finite (tmp))
if (!finitegnum (tmp))
continue;
sum += tmp;
abs_sum += fabs (tmp);
......@@ -292,7 +292,7 @@ gog_line_view_render (GogView *view, GogViewAllocation const *bbox)
if (type == GOG_1_5D_AS_PERCENTAGE) {
for (i = 0; i < num_series; i++)
if (finite (vals[i][j-1]))
if (finitegnum (vals[i][j-1]))
abs_sum += fabs (vals[i][j-1]);
is_null = (gnumeric_sub_epsilon (abs_sum) <= 0.);
} else
......@@ -302,7 +302,7 @@ gog_line_view_render (GogView *view, GogViewAllocation const *bbox)
if (j > lengths[i])
continue;
value = (vals[i] && finite (vals[i][j-1])) ? vals[i][j-1] : 0.0;
value = (vals[i] && finitegnum (vals[i][j-1])) ? vals[i][j-1] : 0.0;
k = 2 * lengths[i] - j + 1;
if (is_area_plot && (type != GOG_1_5D_NORMAL)) {
......
......@@ -393,7 +393,7 @@ gog_pie_view_render (GogView *view, GogViewAllocation const *bbox)
vals = go_data_vector_get_values (GO_DATA_VECTOR (series->base.values[1].data));
for (k = 0 ; k < series->base.num_elements; k++) {
len = fabs (vals[k]) * scale;
if (!finite (len) || len < 1e-3)
if (!finitegnum (len) || len < 1e-3)
continue;
/* only separate the outer ring */
......@@ -540,7 +540,7 @@ gog_pie_series_update (GogObject *obj)
series->base.num_elements = len;
for (total = 0. ; len-- > 0 ;)
if (finite (vals[len]))
if (finitegnum (vals[len]))
total += fabs (vals[len]);
series->total = total;
......
......@@ -28,6 +28,7 @@
#include <gtk/gtkradiobutton.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkspinbutton.h>
#include <string.h>
GtkWidget *gog_bubble_plot_pref (GogBubblePlot *bubble, GnmCmdContext *cc);
......
......@@ -96,7 +96,7 @@ gog_2d_plot_update (GogObject *obj)
go_data_vector_get_minmax (GO_DATA_VECTOR (
series->base.values[0].data), &tmp_min, &tmp_max);
if (!finite (tmp_min) || !finite (tmp_max) ||
if (!finitegnum (tmp_min) || !finitegnum (tmp_max) ||
tmp_min > tmp_max) {
tmp_min = 0;
tmp_max = go_data_vector_get_len (
......@@ -176,8 +176,8 @@ gog_2d_plot_axis_get_bounds (GogPlot *plot, GogAxisType axis,
bounds->val.minima = model->x.minima;
bounds->val.maxima = model->x.maxima;
bounds->is_discrete = model->x.minima > model->x.maxima ||
!finite (model->x.minima) ||
!finite (model->x.maxima);
!finitegnum (model->x.minima) ||
!finitegnum (model->x.maxima);
if (bounds->fmt == NULL && model->x.fmt != NULL)
bounds->fmt = go_format_ref (model->x.fmt);
......@@ -593,7 +593,7 @@ gog_xy_view_render (GogView *view, GogViewAllocation const *bbox)
double zmin;
go_data_vector_get_minmax (GO_DATA_VECTOR (series->base.values[2].data), &zmin, &zmax);
show_negatives = GOG_BUBBLE_PLOT (view->model)->show_negatives;
if ((! finite (zmax)) || (!show_negatives && (zmax <= 0))) continue;
if ((! finitegnum (zmax)) || (!show_negatives && (zmax <= 0))) continue;
rmax = MIN (view->residual.w, view->residual.h) / BUBBLE_MAX_RADIUS_RATIO
* GOG_BUBBLE_PLOT (view->model)->bubble_scale;
size_as_area = GOG_BUBBLE_PLOT (view->model)->size_as_area;
......@@ -639,19 +639,19 @@ gog_xy_view_render (GogView *view, GogViewAllocation const *bbox)
y = *y_vals++;
valid = !isnan (y) && !isnan (x);
if (valid) {
/* We are checking with finite here because isinf
/* We are checking with finitegnum here because isinf
if not available everywhere. Note, that NANs
have been ruled out. */
if (!finite (y))
if (!finitegnum (y))
y = 0; /* excel is just sooooo consistent */
if (!finite (x))
if (!finitegnum (x))
x = i;
#warning "move map into axis"
x = x_off + x_scale * x;
y = y_off + y_scale * y;
if (GOG_IS_BUBBLE_PLOT (model)) {
z = *z_vals++;
if (!finite (z)) continue;
if (!finitegnum (z)) continue;
if (z < 0) {
if (GOG_BUBBLE_PLOT(model)->show_negatives) {
gog_renderer_push_style (view->renderer, neg_style);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment