X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-case-file.c;h=ec50b1525b74d516de207ddd4e8a33277cdb06a8;hb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;hp=5ad96ad94b8e85dc9adf86f2827cd0cf8ee7c6dc;hpb=03660262a395494be666ae271d7d08408d34007d;p=pspp-builds.git diff --git a/src/ui/gui/psppire-case-file.c b/src/ui/gui/psppire-case-file.c index 5ad96ad9..ec50b152 100644 --- a/src/ui/gui/psppire-case-file.c +++ b/src/ui/gui/psppire-case-file.c @@ -1,7 +1,6 @@ -/* +/* PSPPIRE --- A Graphical User Interface for PSPP Copyright (C) 2006 Free Software Foundation - Written by John Darrington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,17 +17,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - +#include #include #include -#include "psppire-object.h" #include "psppire-case-file.h" #include #include #include +#include "flexifile-factory.h" #include #include #include @@ -43,12 +42,12 @@ static void psppire_case_file_finalize (GObject *object); /* --- variables --- */ static GObjectClass *parent_class = NULL; -enum {CASE_CHANGED, +enum {CASE_CHANGED, CASE_INSERTED, CASES_DELETED, n_SIGNALS}; -static guint signal[n_SIGNALS]; +static guint signals [n_SIGNALS]; /* --- functions --- */ @@ -75,7 +74,7 @@ psppire_case_file_get_type (void) (GInstanceInitFunc) psppire_case_file_init, }; - object_type = g_type_register_static (G_TYPE_PSPPIRE_OBJECT, "PsppireCaseFile", + object_type = g_type_register_static (G_TYPE_OBJECT, "PsppireCaseFile", &object_info, 0); } @@ -92,38 +91,38 @@ psppire_case_file_class_init (PsppireCaseFileClass *class) object_class->finalize = psppire_case_file_finalize; - signal[CASE_CHANGED] = + signals [CASE_CHANGED] = g_signal_new ("case_changed", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, + G_TYPE_NONE, 1, G_TYPE_INT); - signal[CASE_INSERTED] = + signals [CASE_INSERTED] = g_signal_new ("case_inserted", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, + G_TYPE_NONE, 1, G_TYPE_INT); - signal[CASES_DELETED] = + signals [CASES_DELETED] = g_signal_new ("cases_deleted", - G_TYPE_FROM_CLASS(class), + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, gtkextra_VOID__INT_INT, - G_TYPE_NONE, + G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); } @@ -132,9 +131,9 @@ static void psppire_case_file_finalize (GObject *object) { PsppireCaseFile *cf = PSPPIRE_CASE_FILE (object); - - if ( cf->flexifile) - casefile_destroy(cf->flexifile); + + if ( cf->flexifile) + casefile_destroy (cf->flexifile); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -145,151 +144,156 @@ psppire_case_file_init (PsppireCaseFile *cf) cf->flexifile = 0; } + /** * psppire_case_file_new: * @returns: a new #PsppireCaseFile object - * - * Creates a new #PsppireCaseFile. + * + * Creates a new #PsppireCaseFile. */ PsppireCaseFile* -psppire_case_file_new (gint val_cnt) +psppire_case_file_new (void) { PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL); - cf->flexifile = flexifile_create(val_cnt); + cf->flexifile = flexifile_create (0); return cf; } +void +psppire_case_file_replace_flexifile (PsppireCaseFile *cf, struct flexifile *ff) +{ + cf->flexifile = (struct casefile *) ff; +} + + + gboolean -psppire_case_file_delete_cases(PsppireCaseFile *cf, gint n_cases, gint first) +psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first) { int result; - g_return_val_if_fail(cf, FALSE); - g_return_val_if_fail(cf->flexifile, FALSE); + g_return_val_if_fail (cf, FALSE); + g_return_val_if_fail (cf->flexifile, FALSE); - result = flexifile_delete_cases(FLEXIFILE(cf->flexifile), n_cases, first); + result = flexifile_delete_cases (FLEXIFILE (cf->flexifile), n_cases, first); - g_signal_emit(cf, signal[CASES_DELETED], 0, n_cases, first); + g_signal_emit (cf, signals [CASES_DELETED], 0, n_cases, first); return result; } -/* Insert a blank case to the case file */ +/* Insert case CC into the case file before POSN */ gboolean -psppire_case_file_insert_case(PsppireCaseFile *cf, - gint posn) +psppire_case_file_insert_case (PsppireCaseFile *cf, + struct ccase *cc, + gint posn) { bool result ; - struct ccase cc; - g_return_val_if_fail(cf, FALSE); - g_return_val_if_fail(cf->flexifile, FALSE); + g_return_val_if_fail (cf, FALSE); + g_return_val_if_fail (cf->flexifile, FALSE); - case_create (&cc, casefile_get_value_cnt(cf->flexifile)); + result = flexifile_insert_case (FLEXIFILE (cf->flexifile), cc, posn); - result = flexifile_insert_case(FLEXIFILE(cf->flexifile), &cc, posn); - - case_destroy (&cc); - - if ( result ) - g_signal_emit(cf, signal[CASE_INSERTED], 0, posn); + if ( result ) + g_signal_emit (cf, signals [CASE_INSERTED], 0, posn); else - g_warning("Cannot insert case at position %d\n", posn); - + g_warning ("Cannot insert case at position %d\n", posn); + return result; } + /* Append a case to the case file */ gboolean -psppire_case_file_append_case(PsppireCaseFile *cf, +psppire_case_file_append_case (PsppireCaseFile *cf, struct ccase *c) { bool result ; gint posn ; - g_return_val_if_fail(cf, FALSE); - g_return_val_if_fail(cf->flexifile, FALSE); + g_return_val_if_fail (cf, FALSE); + g_return_val_if_fail (cf->flexifile, FALSE); - posn = casefile_get_case_cnt(cf->flexifile); + posn = casefile_get_case_cnt (cf->flexifile); + + result = casefile_append (cf->flexifile, c); + + g_signal_emit (cf, signals [CASE_INSERTED], 0, posn); - result = casefile_append(cf->flexifile, c); - - g_signal_emit(cf, signal[CASE_INSERTED], 0, posn); - return result; } inline gint -psppire_case_file_get_case_count(const PsppireCaseFile *cf) +psppire_case_file_get_case_count (const PsppireCaseFile *cf) { - g_return_val_if_fail(cf, FALSE); - - if ( ! cf->flexifile) + g_return_val_if_fail (cf, FALSE); + + if ( ! cf->flexifile) return 0; - return casefile_get_case_cnt(cf->flexifile); + return casefile_get_case_cnt (cf->flexifile); } /* Return the IDXth value from case CASENUM. The return value must not be freed or written to */ const union value * -psppire_case_file_get_value(const PsppireCaseFile *cf, gint casenum, gint idx) +psppire_case_file_get_value (const PsppireCaseFile *cf, gint casenum, gint idx) { - const union value *v; + const union value *v; struct ccase c; - g_return_val_if_fail(cf, NULL); - g_return_val_if_fail(cf->flexifile, NULL); + g_return_val_if_fail (cf, NULL); + g_return_val_if_fail (cf->flexifile, NULL); - g_return_val_if_fail(idx < casefile_get_value_cnt(cf->flexifile), NULL); + g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), NULL); - flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &c); + flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &c); - v = case_data(&c, idx); - - case_destroy(&c); + v = case_data_idx (&c, idx); + case_destroy (&c); return v; } void -psppire_case_file_clear(PsppireCaseFile *cf) +psppire_case_file_clear (PsppireCaseFile *cf) { - casefile_destroy(cf->flexifile); + casefile_destroy (cf->flexifile); cf->flexifile = 0; - g_signal_emit(cf, signal[CASES_DELETED], 0, 0, -1); + g_signal_emit (cf, signals [CASES_DELETED], 0, 0, -1); } /* Set the IDXth value of case C to SYSMIS/EMPTY */ gboolean -psppire_case_file_set_value(PsppireCaseFile *cf, gint casenum, gint idx, +psppire_case_file_set_value (PsppireCaseFile *cf, gint casenum, gint idx, union value *v, gint width) { struct ccase cc ; int bytes; - g_return_val_if_fail(cf, FALSE); - g_return_val_if_fail(cf->flexifile, FALSE); + g_return_val_if_fail (cf, FALSE); + g_return_val_if_fail (cf->flexifile, FALSE); - g_return_val_if_fail(idx < casefile_get_value_cnt(cf->flexifile), FALSE); + g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), FALSE); - if ( ! flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &cc) ) + if ( ! flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &cc) ) return FALSE; - if ( width == 0 ) + if ( width == 0 ) bytes = MAX_SHORT_STRING; else - bytes = DIV_RND_UP(width, MAX_SHORT_STRING) * MAX_SHORT_STRING ; + bytes = DIV_RND_UP (width, MAX_SHORT_STRING) * MAX_SHORT_STRING ; /* Cast away const in flagrant abuse of the casefile */ - memcpy((union value *)case_data(&cc, idx), v, bytes); + memcpy ((union value *)case_data_idx (&cc, idx), v, bytes); - g_signal_emit(cf, signal[CASE_CHANGED], 0, casenum); + g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum); return TRUE; } @@ -298,88 +302,82 @@ psppire_case_file_set_value(PsppireCaseFile *cf, gint casenum, gint idx, /* Set the IDXth value of case C using D_IN */ gboolean -psppire_case_file_data_in(PsppireCaseFile *cf, gint casenum, gint idx, - struct data_in *d_in) +psppire_case_file_data_in (PsppireCaseFile *cf, gint casenum, gint idx, + struct substring input, const struct fmt_spec *fmt) { struct ccase cc ; - g_return_val_if_fail(cf, FALSE); - g_return_val_if_fail(cf->flexifile, FALSE); + g_return_val_if_fail (cf, FALSE); + g_return_val_if_fail (cf->flexifile, FALSE); - g_return_val_if_fail(idx < casefile_get_value_cnt(cf->flexifile), FALSE); + g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), FALSE); - if ( ! flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &cc) ) + if ( ! flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &cc) ) return FALSE; /* Cast away const in flagrant abuse of the casefile */ - d_in->v = (union value *) case_data(&cc, idx); - - if ( ! data_in(d_in) ) - g_warning("Cant set value\n"); + if (!data_in (input, fmt->type, 0, 0, + (union value *) case_data_idx (&cc, idx), fmt_var_width (fmt))) + g_warning ("Cant set value\n"); - g_signal_emit(cf, signal[CASE_CHANGED], 0, casenum); + g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum); return TRUE; } void -psppire_case_file_sort(PsppireCaseFile *cf, const struct sort_criteria *sc) +psppire_case_file_sort (PsppireCaseFile *cf, const struct sort_criteria *sc) { - struct ccase cc; gint c; + + struct casereader *reader = casefile_get_reader (cf->flexifile, NULL); struct casefile *cfile; - struct casereader *reader = casefile_get_reader(cf->flexifile); - const int value_cnt = casefile_get_value_cnt(cf->flexifile); - cfile = sort_execute(reader, sc); + struct casefile_factory *factory = flexifile_factory_create (); - casefile_destroy(cf->flexifile); + cfile = sort_execute (reader, sc, factory); - /* Copy casefile into flexifile */ + casefile_destroy (cf->flexifile); - reader = casefile_get_destructive_reader(cfile); - cf->flexifile = flexifile_create(value_cnt); - while(casereader_read(reader, &cc)) - casefile_append(cf->flexifile, &cc); - + cf->flexifile = cfile; /* FIXME: Need to have a signal to change a range of cases, instead of calling a signal many times */ - for ( c = 0 ; c < casefile_get_case_cnt(cf->flexifile) ; ++c ) - g_signal_emit(cf, signal[CASE_CHANGED], 0, c); + for ( c = 0 ; c < casefile_get_case_cnt (cf->flexifile) ; ++c ) + g_signal_emit (cf, signals [CASE_CHANGED], 0, c); + + flexifile_factory_destroy (factory); } -/* Resize the cases in the casefile, by inserting N_VALUES into every +/* Resize the cases in the casefile, by inserting N_VALUES into every one of them. */ -gboolean -psppire_case_file_insert_values(PsppireCaseFile *cf, - gint n_values, gint before) +gboolean +psppire_case_file_insert_values (PsppireCaseFile *cf, + gint n_values, gint before) { - g_return_val_if_fail(cf, FALSE); + g_return_val_if_fail (cf, FALSE); - if ( ! cf->flexifile ) + if ( ! cf->flexifile ) { - cf->flexifile = flexifile_create(n_values); + cf->flexifile = flexifile_create (n_values); + return TRUE; } - return flexifile_resize(FLEXIFILE(cf->flexifile), n_values, before); + return flexifile_resize (FLEXIFILE (cf->flexifile), n_values, before); } - - - /* Fills C with the CASENUMth case. Returns true on success, false otherwise. */ gboolean -psppire_case_file_get_case(const PsppireCaseFile *cf, gint casenum, +psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum, struct ccase *c) { - g_return_val_if_fail(cf, FALSE); - g_return_val_if_fail(cf->flexifile, FALSE); + g_return_val_if_fail (cf, FALSE); + g_return_val_if_fail (cf->flexifile, FALSE); - return flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, c); + return flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, c); }