X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-case-file.c;h=8b194528089d95f3642913bd3709e8f5ec2524ee;hb=d0371553a98cd169353bf6d211e375e5ffc3a3bd;hp=8a4f196df7fd17b58d2cc41edda66d31c6518df2;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp-builds.git diff --git a/src/ui/gui/psppire-case-file.c b/src/ui/gui/psppire-case-file.c index 8a4f196d..8b194528 100644 --- a/src/ui/gui/psppire-case-file.c +++ b/src/ui/gui/psppire-case-file.c @@ -1,21 +1,18 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP - Copyright (C) 2006 Free Software Foundation +/* PSPPIRE - a graphical user interface for PSPP. + Copyright (C) 2006 Free Software Foundation - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #include #include @@ -28,11 +25,12 @@ #include #include #include +#include #include #include #include "xalloc.h" -#include "xallocsa.h" +#include "xmalloca.h" /* --- prototypes --- */ static void psppire_case_file_class_init (PsppireCaseFileClass *class); @@ -93,7 +91,7 @@ psppire_case_file_class_init (PsppireCaseFileClass *class) object_class->finalize = psppire_case_file_finalize; signals [CASE_CHANGED] = - g_signal_new ("case_changed", + g_signal_new ("case-changed", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, @@ -105,7 +103,7 @@ psppire_case_file_class_init (PsppireCaseFileClass *class) signals [CASE_INSERTED] = - g_signal_new ("case_inserted", + g_signal_new ("case-inserted", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, @@ -117,7 +115,7 @@ psppire_case_file_class_init (PsppireCaseFileClass *class) signals [CASES_DELETED] = - g_signal_new ("cases_deleted", + g_signal_new ("cases-deleted", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, 0, @@ -133,7 +131,8 @@ psppire_case_file_finalize (GObject *object) { PsppireCaseFile *cf = PSPPIRE_CASE_FILE (object); - datasheet_destroy (cf->datasheet); + if ( cf->accessible) + datasheet_destroy (cf->datasheet); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -142,6 +141,7 @@ static void psppire_case_file_init (PsppireCaseFile *cf) { cf->datasheet = NULL; + cf->accessible = FALSE; } @@ -152,33 +152,30 @@ psppire_case_file_init (PsppireCaseFile *cf) * Creates a new #PsppireCaseFile. */ PsppireCaseFile* -psppire_case_file_new (void) +psppire_case_file_new (const struct casereader *reader) { PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL); - cf->datasheet = datasheet_create (NULL); + cf->datasheet = datasheet_create (casereader_clone (reader)); + cf->accessible = TRUE; return cf; } -void -psppire_case_file_replace_datasheet (PsppireCaseFile *cf, struct datasheet *ds) -{ - cf->datasheet = ds; -} - - - gboolean -psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first) +psppire_case_file_delete_cases (PsppireCaseFile *cf, casenumber n_cases, casenumber first) { g_return_val_if_fail (cf, FALSE); g_return_val_if_fail (cf->datasheet, FALSE); + g_return_val_if_fail (cf->accessible, FALSE); + + g_return_val_if_fail (first + n_cases <= + psppire_case_file_get_case_count (cf), FALSE); datasheet_delete_rows (cf->datasheet, first, n_cases); - g_signal_emit (cf, signals [CASES_DELETED], 0, n_cases, first); + g_signal_emit (cf, signals [CASES_DELETED], 0, first, n_cases); return TRUE; } @@ -186,14 +183,15 @@ psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first) /* Insert case CC into the case file before POSN */ gboolean psppire_case_file_insert_case (PsppireCaseFile *cf, - struct ccase *cc, - gint posn) + struct ccase *cc, + casenumber posn) { struct ccase tmp; bool result ; g_return_val_if_fail (cf, FALSE); g_return_val_if_fail (cf->datasheet, FALSE); + g_return_val_if_fail (cf->accessible, FALSE); case_clone (&tmp, cc); result = datasheet_insert_rows (cf->datasheet, posn, &tmp, 1); @@ -201,39 +199,17 @@ psppire_case_file_insert_case (PsppireCaseFile *cf, if ( result ) g_signal_emit (cf, signals [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 -psppire_case_file_append_case (PsppireCaseFile *cf, - struct ccase *c) -{ - struct ccase tmp; - bool result ; - gint posn ; - - g_return_val_if_fail (cf, FALSE); - g_return_val_if_fail (cf->datasheet, FALSE); - - posn = datasheet_get_row_cnt (cf->datasheet); - - case_clone (&tmp, c); - result = datasheet_insert_rows (cf->datasheet, posn, &tmp, 1); - - g_signal_emit (cf, signals [CASE_INSERTED], 0, posn); + g_warning ("Cannot insert case at position %ld\n", posn); return result; } -inline gint +inline casenumber psppire_case_file_get_case_count (const PsppireCaseFile *cf) { g_return_val_if_fail (cf, FALSE); + g_return_val_if_fail (cf->accessible, FALSE); if ( ! cf->datasheet) return 0; @@ -250,13 +226,13 @@ psppire_case_file_get_value (const PsppireCaseFile *cf, union value *value, int width) { bool allocated; - + g_return_val_if_fail (cf, false); g_return_val_if_fail (cf->datasheet, false); g_return_val_if_fail (idx < datasheet_get_column_cnt (cf->datasheet), false); - if (value == NULL) + if (value == NULL) { value = xnmalloc (value_cnt_from_width (width), sizeof *value); allocated = true; @@ -265,7 +241,7 @@ psppire_case_file_get_value (const PsppireCaseFile *cf, allocated = false; if (!datasheet_get_value (cf->datasheet, casenum, idx, value, width)) { - if (allocated) + if (allocated) free (value); value = NULL; } @@ -283,7 +259,7 @@ psppire_case_file_clear (PsppireCaseFile *cf) /* Set the IDXth value of case C to V. Returns true if successful, false on I/O error. */ gboolean -psppire_case_file_set_value (PsppireCaseFile *cf, gint casenum, gint idx, +psppire_case_file_set_value (PsppireCaseFile *cf, casenumber casenum, gint idx, union value *v, gint width) { bool ok; @@ -303,7 +279,7 @@ 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, +psppire_case_file_data_in (PsppireCaseFile *cf, casenumber casenum, gint idx, struct substring input, const struct fmt_spec *fmt) { union value *value; @@ -316,15 +292,15 @@ psppire_case_file_data_in (PsppireCaseFile *cf, gint casenum, gint idx, g_return_val_if_fail (idx < datasheet_get_column_cnt (cf->datasheet), FALSE); width = fmt_var_width (fmt); - value = xallocsa (value_cnt_from_width (width) * sizeof *value); + value = xmalloca (value_cnt_from_width (width) * sizeof *value); ok = (datasheet_get_value (cf->datasheet, casenum, idx, value, width) - && data_in (input, fmt->type, 0, 0, value, width) + && data_in (input, LEGACY_NATIVE, fmt->type, 0, 0, value, width) && datasheet_put_value (cf->datasheet, casenum, idx, value, width)); if (ok) g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum); - freesa (value); + freea (value); return TRUE; } @@ -347,29 +323,38 @@ psppire_case_file_sort (PsppireCaseFile *cf, struct case_ordering *ordering) /* Resize the cases in the casefile, by inserting N_VALUES into every - one of them. */ + one of them at the position immediately preceeding WHERE. +*/ gboolean psppire_case_file_insert_values (PsppireCaseFile *cf, - gint n_values, gint before) + gint n_values, gint where) { - union value *values; g_return_val_if_fail (cf, FALSE); + g_return_val_if_fail (cf->accessible, FALSE); + + if ( n_values == 0 ) + return FALSE; + + g_assert (n_values > 0); if ( ! cf->datasheet ) cf->datasheet = datasheet_create (NULL); - values = xcalloc (n_values, sizeof *values); - datasheet_insert_columns (cf->datasheet, values, n_values, before); + { + union value *values = xcalloc (n_values, sizeof *values); + datasheet_insert_columns (cf->datasheet, values, n_values, where); free (values); + } return TRUE; } + /* 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, casenumber casenum, struct ccase *c) { g_return_val_if_fail (cf, FALSE); @@ -377,3 +362,14 @@ psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum, return datasheet_get_row (cf->datasheet, casenum, c); } + + + +struct casereader * +psppire_case_file_make_reader (PsppireCaseFile *cf) +{ + struct casereader *r = datasheet_make_reader (cf->datasheet); + cf->accessible = FALSE; + return r; +} +