X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-case-file.c;h=f869e4b0dbf6aaea22383e7735efa8bd56c49397;hb=57b436a22d9ae0e395fb2e3ce101c2b5c2e6939e;hp=0c8e52a93968430186eed573c37ffff0f46a8b0a;hpb=755ecfd2e8d86bc134fe7202c46fee354ec166d0;p=pspp-builds.git diff --git a/src/ui/gui/psppire-case-file.c b/src/ui/gui/psppire-case-file.c index 0c8e52a9..f869e4b0 100644 --- a/src/ui/gui/psppire-case-file.c +++ b/src/ui/gui/psppire-case-file.c @@ -28,10 +28,11 @@ #include #include +#include #include #include - #include +#include /* --- prototypes --- */ static void psppire_case_file_class_init (PsppireCaseFileClass *class); @@ -132,8 +133,8 @@ psppire_case_file_finalize (GObject *object) { PsppireCaseFile *cf = PSPPIRE_CASE_FILE (object); - if ( cf->casefile) - casefile_destroy(cf->casefile); + if ( cf->flexifile) + casefile_destroy(cf->flexifile); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -141,7 +142,7 @@ psppire_case_file_finalize (GObject *object) static void psppire_case_file_init (PsppireCaseFile *cf) { - cf->casefile = 0; + cf->flexifile = 0; } /** @@ -151,16 +152,55 @@ psppire_case_file_init (PsppireCaseFile *cf) * Creates a new #PsppireCaseFile. */ PsppireCaseFile* -psppire_case_file_new (gint var_cnt) +psppire_case_file_new (gint val_cnt) { PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL); - cf->casefile = casefile_create(var_cnt); + cf->flexifile = flexifile_create(val_cnt); return cf; } +gboolean +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); + + result = flexifile_delete_cases(FLEXIFILE(cf->flexifile), n_cases, first); + + g_signal_emit(cf, signal[CASES_DELETED], 0, n_cases, first); + + return result; +} + +/* Insert a blank case to the case file */ +gboolean +psppire_case_file_insert_case(PsppireCaseFile *cf, + gint posn) +{ + bool result ; + struct ccase cc; + + 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); + + case_destroy (&cc); + + if ( result ) + g_signal_emit(cf, signal[CASE_INSERTED], 0, posn); + else + g_warning("Cannot insert case at position %d\n", posn); + + return result; +} /* Append a case to the case file */ gboolean @@ -171,11 +211,11 @@ psppire_case_file_append_case(PsppireCaseFile *cf, gint posn ; g_return_val_if_fail(cf, FALSE); - g_return_val_if_fail(cf->casefile, FALSE); + g_return_val_if_fail(cf->flexifile, FALSE); - posn = casefile_get_case_cnt(cf->casefile); + posn = casefile_get_case_cnt(cf->flexifile); - result = casefile_append(cf->casefile, c); + result = casefile_append(cf->flexifile, c); g_signal_emit(cf, signal[CASE_INSERTED], 0, posn); @@ -188,10 +228,10 @@ psppire_case_file_get_case_count(const PsppireCaseFile *cf) { g_return_val_if_fail(cf, FALSE); - if ( ! cf->casefile) + if ( ! cf->flexifile) return 0; - return casefile_get_case_cnt(cf->casefile); + return casefile_get_case_cnt(cf->flexifile); } /* Return the IDXth value from case CASENUM. @@ -202,14 +242,16 @@ psppire_case_file_get_value(const PsppireCaseFile *cf, gint casenum, gint idx) { const union value *v; struct ccase c; - struct casereader *reader = casefile_get_random_reader (cf->casefile); - casereader_seek(reader, casenum); + 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); - casereader_read(reader, &c); + flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &c); v = case_data(&c, idx); - casereader_destroy(reader); + case_destroy(&c); return v; @@ -218,22 +260,56 @@ psppire_case_file_get_value(const PsppireCaseFile *cf, gint casenum, gint idx) void psppire_case_file_clear(PsppireCaseFile *cf) { - casefile_destroy(cf->casefile); - cf->casefile = 0; + casefile_destroy(cf->flexifile); + cf->flexifile = 0; g_signal_emit(cf, signal[CASES_DELETED], 0, 0, -1); } -/* Set the IDXth value of case C using FF and DATA */ +/* Set the IDXth value of case C to SYSMIS/EMPTY */ gboolean 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(idx < casefile_get_value_cnt(cf->flexifile), FALSE); + + if ( ! flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &cc) ) + return FALSE; + + if ( width == 0 ) + bytes = MAX_SHORT_STRING; + else + 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); + + g_signal_emit(cf, signal[CASE_CHANGED], 0, casenum); + + return TRUE; +} + + + +/* 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) { struct ccase cc ; - struct casereader *reader = casefile_get_random_reader (cf->casefile); + 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); - casereader_seek(reader, casenum); - casereader_read(reader, &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); @@ -241,9 +317,6 @@ psppire_case_file_set_value(PsppireCaseFile *cf, gint casenum, gint idx, if ( ! data_in(d_in) ) g_warning("Cant set value\n"); - case_destroy(&cc); - casereader_destroy(reader); - g_signal_emit(cf, signal[CASE_CHANGED], 0, casenum); return TRUE; @@ -253,12 +326,45 @@ psppire_case_file_set_value(PsppireCaseFile *cf, gint casenum, gint idx, void psppire_case_file_sort(PsppireCaseFile *cf, const struct sort_criteria *sc) { + struct ccase cc; gint c; - struct casereader *reader = casefile_get_reader(cf->casefile); - cf->casefile = sort_execute(reader, sc); + 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); + + casefile_destroy(cf->flexifile); + + /* Copy casefile into flexifile */ + + reader = casefile_get_destructive_reader(cfile); + cf->flexifile = flexifile_create(value_cnt); + while(casereader_read(reader, &cc)) + casefile_append(cf->flexifile, &cc); + /* 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->casefile) ; ++c ) + for ( c = 0 ; c < casefile_get_case_cnt(cf->flexifile) ; ++c ) g_signal_emit(cf, signal[CASE_CHANGED], 0, c); } + + +/* 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) +{ + g_return_val_if_fail(cf, FALSE); + + if ( ! cf->flexifile ) + { + cf->flexifile = flexifile_create(n_values); + return TRUE; + } + + return flexifile_resize(FLEXIFILE(cf->flexifile), n_values, before); +} +