X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=094a4f6988ada771e840e81b037be42e9b5203db;hb=f994fab43f6aeb00cfb40d24c4c4c6ed518a05b9;hp=be911ba6d69817d928264eb13effd969272d029b;hpb=7fbfc32fc3c636959b0a25b3e76609f86519e84a;p=pspp-builds.git diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index be911ba6..094a4f69 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. 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 @@ -21,10 +21,10 @@ #include "psppire-data-editor.h" #include "psppire-var-sheet.h" -#include #include "psppire-data-store.h" +#include #include -#include "helper.h" +#include "executor.h" #include #include @@ -743,13 +743,10 @@ update_data_ref_entry (const PsppireSheet *sheet, gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER, var_get_name (var)); - gchar *s = pspp_locale_to_utf8 (text, -1, 0); - g_free (text); - - gtk_entry_set_text (GTK_ENTRY (de->cell_ref_entry), s); + gtk_entry_set_text (GTK_ENTRY (de->cell_ref_entry), text); - g_free (s); + g_free (text); } else goto blank_entry; @@ -1205,9 +1202,13 @@ popup_variable_row_menu (PsppireSheet *sheet, gint row, PsppireVarStore *var_store = PSPPIRE_VAR_STORE (psppire_sheet_get_model (sheet)); + + PsppireDict *dict; + const struct variable *v ; - const struct variable *v = - psppire_dict_get_variable (var_store->dict, row); + g_object_get (var_store, "dictionary", &dict, NULL); + + v = psppire_dict_get_variable (dict, row); if ( v && event->button == 3) { @@ -1247,21 +1248,13 @@ popup_cases_menu (PsppireSheet *sheet, gint row, static void do_sort (PsppireDataStore *ds, int var, gboolean descend) { - GString *string = g_string_new ("SORT CASES BY "); - const struct variable *v = psppire_dict_get_variable (ds->dict, var); + gchar *syntax; - g_string_append_printf (string, "%s", var_get_name (v)); - - if ( descend ) - g_string_append (string, " (D)"); - - g_string_append (string, "."); - - execute_syntax (create_syntax_string_source (string->str)); - - g_string_free (string, TRUE); + syntax = g_strdup_printf ("SORT CASES BY %s%s.", + var_get_name (v), descend ? " (D)" : ""); + g_free (execute_syntax_string (syntax)); } @@ -1301,13 +1294,15 @@ psppire_data_editor_insert_variable (PsppireDataEditor *de) switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de))) { case PSPPIRE_DATA_EDITOR_DATA_VIEW: - if ( de->data_sheet[0]->state == PSPPIRE_SHEET_COLUMN_SELECTED ) + if ( PSPPIRE_SHEET (de->data_sheet[0])->select_status + == PSPPIRE_SHEET_COLUMN_SELECTED ) posn = PSPPIRE_SHEET (de->data_sheet[0])->range.col0; else posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.col; break; case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW: - if ( de->var_sheet->state == PSPPIRE_SHEET_ROW_SELECTED ) + if ( PSPPIRE_SHEET (de->var_sheet)->select_status + == PSPPIRE_SHEET_ROW_SELECTED ) posn = PSPPIRE_SHEET (de->var_sheet)->range.row0; else posn = PSPPIRE_SHEET (de->var_sheet)->active_cell.row; @@ -1326,10 +1321,14 @@ psppire_data_editor_insert_case (PsppireDataEditor *de) { glong posn = -1; - if ( de->data_sheet[0]->state == PSPPIRE_SHEET_ROW_SELECTED ) - posn = PSPPIRE_SHEET (de->data_sheet[0])->range.row0; + if ( PSPPIRE_SHEET (de->data_sheet[0])->select_status == PSPPIRE_SHEET_ROW_SELECTED ) + { + posn = PSPPIRE_SHEET (de->data_sheet[0])->range.row0; + } else - posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.row; + { + posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.row; + } if ( posn == -1 ) posn = 0; @@ -1353,6 +1352,7 @@ psppire_data_editor_delete_cases (PsppireDataEditor *de) void psppire_data_editor_delete_variables (PsppireDataEditor *de) { + PsppireDict *dict = NULL; gint first, n; switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de))) @@ -1370,7 +1370,9 @@ psppire_data_editor_delete_variables (PsppireDataEditor *de) break; } - psppire_dict_delete_variables (de->var_store->dict, first, n); + g_object_get (de->var_store, "dictionary", &dict, NULL); + + psppire_dict_delete_variables (dict, first, n); psppire_sheet_unselect_range (PSPPIRE_SHEET (de->data_sheet[0])); psppire_sheet_unselect_range (PSPPIRE_SHEET (de->var_sheet)); @@ -1557,43 +1559,45 @@ data_sheet_set_clip (PsppireSheet *sheet) struct case_map *map = NULL; casenumber max_rows; size_t max_columns; + gint row0, rowi; + gint col0, coli; ds = PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet)); psppire_sheet_get_selected_range (sheet, &range); + col0 = MIN (range.col0, range.coli); + coli = MAX (range.col0, range.coli); + row0 = MIN (range.row0, range.rowi); + rowi = MAX (range.row0, range.rowi); + /* If nothing selected, then use active cell */ - if ( range.row0 < 0 || range.col0 < 0 ) + if ( row0 < 0 || col0 < 0 ) { gint row, col; psppire_sheet_get_active_cell (sheet, &row, &col); - range.row0 = range.rowi = row; - range.col0 = range.coli = col; + row0 = rowi = row; + col0 = coli = col; } /* The sheet range can include cells that do not include data. Exclude them from the range. */ max_rows = psppire_data_store_get_case_count (ds); - if (range.rowi >= max_rows) + if (rowi >= max_rows) { if (max_rows == 0) return; - range.rowi = max_rows - 1; + rowi = max_rows - 1; } max_columns = dict_get_var_cnt (ds->dict->dict); - if (range.coli >= max_columns) + if (coli >= max_columns) { if (max_columns == 0) return; - range.coli = max_columns - 1; + coli = max_columns - 1; } - g_return_if_fail (range.rowi >= range.row0); - g_return_if_fail (range.row0 >= 0); - g_return_if_fail (range.coli >= range.col0); - g_return_if_fail (range.col0 >= 0); - /* Destroy any existing clip */ if ( clip_datasheet ) { @@ -1609,16 +1613,14 @@ data_sheet_set_clip (PsppireSheet *sheet) /* Construct clip dictionary. */ clip_dict = dict_create (); - for (i = range.col0; i <= range.coli; i++) - { - const struct variable *old = dict_get_var (ds->dict->dict, i); - dict_clone_var_assert (clip_dict, old, var_get_name (old)); - } + dict_set_encoding (clip_dict, dict_get_encoding (ds->dict->dict)); + for (i = col0; i <= coli; i++) + dict_clone_var_assert (clip_dict, dict_get_var (ds->dict->dict, i)); /* Construct clip data. */ map = case_map_by_name (ds->dict->dict, clip_dict); - writer = autopaging_writer_create (dict_get_next_value_idx (clip_dict)); - for (i = range.row0; i <= range.rowi ; ++i ) + writer = autopaging_writer_create (dict_get_proto (clip_dict)); + for (i = row0; i <= rowi ; ++i ) { struct ccase *old = psppire_data_store_get_case (ds, i); if (old != NULL) @@ -1645,17 +1647,14 @@ static void data_out_g_string (GString *string, const struct variable *v, const struct ccase *cc) { - char *buf ; - const struct fmt_spec *fs = var_get_print_format (v); const union value *val = case_data (cc, v); - buf = xzalloc (fs->w); - data_out (val, fs, buf); + char *s = data_out (val, var_get_encoding (v), fs); - g_string_append_len (string, buf, fs->w); + g_string_append (string, s); - g_free (buf); + g_free (s); } static GString * @@ -1664,7 +1663,7 @@ clip_to_text (void) casenumber r; GString *string; - const size_t val_cnt = casereader_get_value_cnt (clip_datasheet); + const size_t val_cnt = caseproto_get_n_widths (casereader_get_proto (clip_datasheet)); const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet); const size_t var_cnt = dict_get_var_cnt (clip_dict); @@ -1706,13 +1705,15 @@ clip_to_html (void) casenumber r; GString *string; - const size_t val_cnt = casereader_get_value_cnt (clip_datasheet); + const size_t val_cnt = caseproto_get_n_widths (casereader_get_proto (clip_datasheet)); const casenumber case_cnt = casereader_get_case_cnt (clip_datasheet); const size_t var_cnt = dict_get_var_cnt (clip_dict); - /* Guestimate the size needed */ - string = g_string_sized_new (20 * val_cnt * case_cnt); + string = g_string_sized_new (80 + 20 * val_cnt * case_cnt); + + g_string_append (string, + "\n"); g_string_append (string, "\n"); for (r = 0 ; r < case_cnt ; ++r )