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
-get_unit_at_pixel (const PsppireAxis *axis, glong pixel)
+unit_at_pixel (const PsppireAxis *axis, glong pixel)
{
PsppireAxisImpl *a = PSPPIRE_AXIS_IMPL (axis);
/* Returns the pixel at the start of UNIT */
static glong
-pixel_start (const PsppireAxis *axis, gint unit)
+start_pixel (const PsppireAxis *axis, gint unit)
{
gfloat fraction;
PsppireAxisImpl *a = PSPPIRE_AXIS_IMPL (axis);
}
+static void resize (PsppireAxis *axis, gint posn, glong size);
+
static void
{
iface->unit_size = unit_size;
iface->unit_count = unit_count;
- iface->pixel_start = pixel_start;
- iface->get_unit_at_pixel = get_unit_at_pixel;
+ iface->start_pixel = start_pixel;
+ iface->unit_at_pixel = unit_at_pixel;
iface->total_size = total_size;
+ iface->resize = resize;
}
/* --- functions --- */
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);
void
psppire_axis_impl_append_n (PsppireAxisImpl *a, gint n_units, gint size)
{
- struct axis_node *node = pool_alloc (a->pool, sizeof *node);
+ struct axis_node *node;
+ g_return_if_fail (n_units > 0);
+
+ 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);
unsigned long int start;
gfloat fraction;
struct axis_node *new_node ;
- struct tower_node *n = tower_lookup (&a->unit_tower, posn, &start);
+ struct tower_node *n;
+ struct axis_node *existing_node;
+
+ g_return_if_fail (posn <= tower_height (&a->unit_tower));
- struct axis_node *existing_node =
- tower_data (n, struct axis_node, unit_node);
+ /* Nothing needs to be done */
+ if ( posn == 0 || posn == tower_height (&a->unit_tower))
+ return;
+
+ n = tower_lookup (&a->unit_tower, posn, &start);
+
+ existing_node = tower_data (n, struct axis_node, unit_node);
/* Nothing needs to be done, if the range element is already split here */
if ( posn - start == 0)
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);
void
psppire_axis_impl_insert (PsppireAxisImpl *a, gint posn, gint size)
{
- struct tower_node *n;
- unsigned long int start;
- struct axis_node *before;
- struct axis_node *new_node = pool_alloc (a->pool, sizeof (*new_node));
+ struct axis_node *before = NULL;
+ struct axis_node *new_node;
- split (a, posn);
+ g_return_if_fail ( posn >= 0);
+ g_return_if_fail ( posn <= tower_height (&a->unit_tower));
- n = tower_lookup (&a->unit_tower, posn, &start);
- g_assert (posn == start);
+ if ( posn < tower_height (&a->unit_tower))
+ {
+ unsigned long int start = 0;
+ struct tower_node *n;
+
+ split (a, posn);
- before = tower_data (n, struct axis_node, unit_node);
+ n = tower_lookup (&a->unit_tower, posn, &start);
+ g_assert (posn == start);
+
+ 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->unit_node);
-
+ before ? &before->unit_node : NULL);
tower_insert (&a->pixel_tower,
size,
&new_node->pixel_node,
- &before->pixel_node);
+ before ? &before->pixel_node : NULL);
}
{
unsigned long int start;
struct tower_node *n;
+
+ g_return_val_if_fail (posn < tower_height (&a->unit_tower), NULL);
+
n = tower_lookup (&a->unit_tower, posn, &start);
if ( 1 != tower_node_get_size (n))
g_assert (1 == tower_node_get_size (n));
-
return tower_data (n, struct axis_node, unit_node);
}
-void
-psppire_axis_impl_resize (PsppireAxisImpl *a, gint posn, gint size)
+
+static void
+resize (PsppireAxis *axis, gint posn, glong size)
{
- struct axis_node *an = make_single (a, posn);
+ PsppireAxisImpl *a = PSPPIRE_AXIS_IMPL (axis);
+
+ 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 */
+ if (posn >= tower_height (&a->unit_tower))
+ return ;
+
+ an = make_single (a, posn);
tower_resize (&a->pixel_tower, &an->pixel_node, size);
}
+void
+psppire_axis_impl_resize (PsppireAxisImpl *a, gint posn, gint size)
+{
+ resize (PSPPIRE_AXIS (a), posn, size);
+}
+
+
+
void
psppire_axis_impl_clear (PsppireAxisImpl *a)
void
-psppire_axis_impl_delete (PsppireAxisImpl *a, gint first, gint n_cases)
+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));
+
+ split (a, first);
+ split (a, first + n_units);
- for (i = first; i < first + n_cases; ++i)
+ 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, i);
+ 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;
}
}
projects / pspp-builds.git / blobdiff