
2000-02-24 Christopher James Lahey <clahey@helixcode.com> * test-table.c: Added duplicate_value and add_value. Use the new compare functions. Made it so we only create one model to better test model view stuff. Changed the test to not have as many extra, useless, columns. * test-cols.c, test-check.c: Added duplicate_value and add_value. Use the new compare functions. * e-table.c, e-table.h: Use all the new features of e-table-groups (sorting and grouping). Handle on the fly reorganization of groups in an idle loop. Compare functions now are to return -1 if the first item is greater, 0 if they are equal, or 1 if the second item is greater. * e-table-subset.c, e-table-subset.h: Made e-table-subset disconnect properly from its signals when it dies. * e-table-subset-variable.c, e-table-subset-variable.h: Virtualized the add and remove commands so that e_table_sorted_variable could override the add command to do sorting. * e-table-sorted.c: Fixed this to inherit properly from ETableSubset. * e-table-simple.h, e-table-simple.c: Added handling of duplicate_value and free_value; * e-table-model.c, e-table-model.h: Added duplicate_value and free_value for memory allocation of table elements outside the table. * e-table-item.c: Fixed a crashing bug. * e-table-group.c: Added sorting. Fixed destruction to delete the right things. * e-table-group-leaf.c, e-table-group-leaf.h: Pass column and sort order information into the e_table_sorted_variable. Properly destroy things when deleted. * e-table-group-container.c, e-table-group-container.h: Properly handle the list of subgroups. Handle proper sorting and grouping of subgroups. * e-table-sorted-variable.c, e-table-sorted-variable.h: Files to do a sorted model that stays sorted as you add and remove rows. * Makefile.am: Added e-table-sorted-variable.c and e-table-sorted-variable.h. svn path=/trunk/; revision=1930
149 lines
4.7 KiB
C
149 lines
4.7 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
/*
|
|
* E-table-sorted.c: Implements a table that sorts another table
|
|
*
|
|
* Author:
|
|
* Miguel de Icaza (miguel@gnu.org)
|
|
*
|
|
* (C) 1999 Helix Code, Inc.
|
|
*/
|
|
#include <config.h>
|
|
#include <stdlib.h>
|
|
#include <gtk/gtksignal.h>
|
|
#include <string.h>
|
|
#include "e-util/e-util.h"
|
|
#include "e-table-sorted-variable.h"
|
|
|
|
#define PARENT_TYPE E_TABLE_SUBSET_VARIABLE_TYPE
|
|
|
|
#define INCREMENT_AMOUNT 10
|
|
|
|
static ETableSubsetVariableClass *etsv_parent_class;
|
|
|
|
static void etsv_proxy_model_changed (ETableModel *etm, ETableSortedVariable *etsv);
|
|
static void etsv_proxy_model_row_changed (ETableModel *etm, int row, ETableSortedVariable *etsv);
|
|
static void etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETableSortedVariable *etsv);
|
|
static void etsv_add (ETableSubsetVariable *etssv, gint row);
|
|
|
|
static void
|
|
etsv_destroy (GtkObject *object)
|
|
{
|
|
ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (object);
|
|
ETableSubset *etss = E_TABLE_SUBSET (object);
|
|
|
|
gtk_signal_disconnect (GTK_OBJECT (etss->source),
|
|
etsv->table_model_changed_id);
|
|
gtk_signal_disconnect (GTK_OBJECT (etss->source),
|
|
etsv->table_model_row_changed_id);
|
|
gtk_signal_disconnect (GTK_OBJECT (etss->source),
|
|
etsv->table_model_cell_changed_id);
|
|
|
|
etsv->table_model_changed_id = 0;
|
|
etsv->table_model_row_changed_id = 0;
|
|
etsv->table_model_cell_changed_id = 0;
|
|
|
|
GTK_OBJECT_CLASS (etsv_parent_class)->destroy (object);
|
|
}
|
|
|
|
static void
|
|
etsv_class_init (GtkObjectClass *object_class)
|
|
{
|
|
ETableSubsetVariableClass *etssv_class = E_TABLE_SUBSET_VARIABLE_CLASS(object_class);
|
|
|
|
etsv_parent_class = gtk_type_class (PARENT_TYPE);
|
|
|
|
object_class->destroy = etsv_destroy;
|
|
|
|
etssv_class->add = etsv_add;
|
|
}
|
|
|
|
E_MAKE_TYPE(e_table_sorted_variable, "ETableSortedVariable", ETableSortedVariable, etsv_class_init, NULL, PARENT_TYPE);
|
|
|
|
static void
|
|
etsv_add (ETableSubsetVariable *etssv,
|
|
gint row)
|
|
{
|
|
ETableModel *etm = E_TABLE_MODEL(etssv);
|
|
ETableSubset *etss = E_TABLE_SUBSET(etssv);
|
|
ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE(etssv);
|
|
int i;
|
|
int col = etsv->sort_col;
|
|
GCompareFunc comp = etsv->compare;
|
|
gint ascending = etsv->ascending;
|
|
|
|
void *val = e_table_model_value_at(etss->source, col, row);
|
|
|
|
/* FIXME: binary search anyone? */
|
|
for ( i = 0; i < etss->n_map; i++ ) {
|
|
int comp_val = (*comp)(val, e_table_model_value_at(etss->source, col, etss->map_table[i]));
|
|
if ( (ascending && comp_val < 0) || ((!ascending) && comp_val > 0) )
|
|
break;
|
|
}
|
|
if ( etss->n_map + 1 > etssv->n_vals_allocated ) {
|
|
etss->map_table = g_realloc(etss->map_table, (etssv->n_vals_allocated + INCREMENT_AMOUNT) * sizeof(int));
|
|
etssv->n_vals_allocated += INCREMENT_AMOUNT;
|
|
}
|
|
if ( i < etss->n_map )
|
|
memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int));
|
|
etss->map_table[i] = row;
|
|
etss->n_map++;
|
|
if ( !etm->frozen )
|
|
e_table_model_changed(etm);
|
|
}
|
|
|
|
ETableModel *
|
|
e_table_sorted_variable_new (ETableModel *source, int col, int ascending, GCompareFunc compare)
|
|
{
|
|
ETableSortedVariable *etsv = gtk_type_new (E_TABLE_SORTED_VARIABLE_TYPE);
|
|
ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE (etsv);
|
|
|
|
if (e_table_subset_variable_construct (etssv, source) == NULL){
|
|
gtk_object_destroy (GTK_OBJECT (etsv));
|
|
return NULL;
|
|
}
|
|
|
|
etsv->sort_col = col;
|
|
etsv->ascending = ascending;
|
|
etsv->compare = compare;
|
|
|
|
etsv->table_model_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_changed",
|
|
GTK_SIGNAL_FUNC (etsv_proxy_model_changed), etsv);
|
|
etsv->table_model_row_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_row_changed",
|
|
GTK_SIGNAL_FUNC (etsv_proxy_model_row_changed), etsv);
|
|
etsv->table_model_cell_changed_id = gtk_signal_connect (GTK_OBJECT (source), "model_cell_changed",
|
|
GTK_SIGNAL_FUNC (etsv_proxy_model_cell_changed), etsv);
|
|
|
|
return E_TABLE_MODEL(etsv);
|
|
}
|
|
|
|
static void
|
|
etsv_proxy_model_changed (ETableModel *etm, ETableSortedVariable *etsv)
|
|
{
|
|
if ( !E_TABLE_MODEL(etsv)->frozen ) {
|
|
/* FIXME: do_resort(); */
|
|
}
|
|
}
|
|
|
|
static void
|
|
etsv_proxy_model_row_changed (ETableModel *etm, int row, ETableSortedVariable *etsv)
|
|
{
|
|
ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE(etsv);
|
|
if ( !E_TABLE_MODEL(etsv)->frozen ) {
|
|
if(e_table_subset_variable_remove(etssv, row))
|
|
e_table_subset_variable_add(etssv, row);
|
|
}
|
|
}
|
|
|
|
static void
|
|
etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETableSortedVariable *etsv)
|
|
{
|
|
ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE(etsv);
|
|
if ( !E_TABLE_MODEL(etsv)->frozen ) {
|
|
if ( col == etsv->sort_col ) {
|
|
if(e_table_subset_variable_remove(etssv, row))
|
|
e_table_subset_variable_add(etssv, row);
|
|
}
|
|
}
|
|
}
|
|
|