struct tower_node unit_node;
};
+void
+psppire_axis_impl_dump (const PsppireAxisImpl *a)
+{
+ struct tower_node *n = tower_first (&a->unit_tower);
+
+ g_debug ("Axis %p", a);
+ while (n)
+ {
+ const struct axis_node *an = tower_data (n, struct axis_node, unit_node);
+ const struct tower_node *pn = &an->pixel_node;
+ g_debug ("%ld units of height %g",
+ n->size, pn->size / (float) n->size);
+
+ n = tower_next (&a->unit_tower, n);
+ }
+ g_debug ("\n");
+}
+
static gint
unit_at_pixel (const PsppireAxis *axis, glong pixel)
{
NULL
};
-
object_type = g_type_register_static (G_TYPE_PSPPIRE_AXIS,
"PsppireAxisImpl",
&object_info, 0);
-
g_type_add_interface_static (object_type,
PSPPIRE_TYPE_AXIS_IFACE,
&interface_info);
g_return_if_fail (n_units > 0);
- node = pool_alloc (a->pool, sizeof *node);
+ node = pool_malloc (a->pool, sizeof *node);
tower_insert (&a->unit_tower, n_units, &node->unit_node, NULL);
tower_insert (&a->pixel_tower, size * n_units, &node->pixel_node, NULL);
fraction = (posn - start) / (gfloat) existing_unit_size;
- new_node = pool_alloc (a->pool, sizeof (*new_node));
+ new_node = pool_malloc (a->pool, sizeof (*new_node));
tower_resize (&a->unit_tower, &existing_node->unit_node, posn - start);
psppire_axis_impl_insert (PsppireAxisImpl *a, gint posn, gint size)
{
struct axis_node *before = NULL;
- struct axis_node *new_node = pool_alloc (a->pool, sizeof (*new_node));
+ struct axis_node *new_node;
+
+ g_return_if_fail ( posn >= 0);
+ g_return_if_fail ( posn <= tower_height (&a->unit_tower));
- if ( posn > 0)
+ if ( posn < tower_height (&a->unit_tower))
{
unsigned long int start = 0;
struct tower_node *n;
before = tower_data (n, struct axis_node, unit_node);
}
+ new_node = pool_malloc (a->pool, sizeof (*new_node));
+
tower_insert (&a->unit_tower,
1,
&new_node->unit_node,
before ? &before->unit_node : NULL);
-
tower_insert (&a->pixel_tower,
size,
&new_node->pixel_node,
g_assert (1 == tower_node_get_size (n));
-
return tower_data (n, struct axis_node, unit_node);
}
+
static void
resize (PsppireAxis *axis, gint posn, glong size)
{
struct axis_node *an;
g_return_if_fail (posn >= 0);
+ g_return_if_fail (size > 0);
/* Silently ignore this request if the position is greater than the number of
units in the axis */
void
psppire_axis_impl_delete (PsppireAxisImpl *a, gint first, gint n_units)
{
- gint i;
- g_warning ("%s FIXME: This is an inefficient implementation", __FUNCTION__);
-
+ gint units_to_delete = n_units;
+ unsigned long int start;
+ struct tower_node *unit_node ;
g_return_if_fail (first + n_units < tower_height (&a->unit_tower));
- for (i = first; i < first + n_units; ++i)
+ split (a, first);
+ split (a, first + n_units);
+
+ unit_node = tower_lookup (&a->unit_tower, first, &start);
+ g_assert (start == first);
+
+ while (units_to_delete > 0)
{
- struct axis_node *an = make_single (a, first);
+ struct tower_node *next_unit_node;
+ struct axis_node *an = tower_data (unit_node,
+ struct axis_node, unit_node);
+
+ g_assert (unit_node == &an->unit_node);
+ g_assert (unit_node->size <= n_units);
+
+ units_to_delete -= unit_node->size;
- tower_delete (&a->unit_tower, &an->unit_node);
+ next_unit_node = tower_next (&a->unit_tower, unit_node);
+
+ tower_delete (&a->unit_tower, unit_node);
tower_delete (&a->pixel_tower, &an->pixel_node);
+
+ pool_free (a->pool, an);
+
+ unit_node = next_unit_node;
}
}