X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fpsppire-delimited-text.c;h=98f76b4301953f330f881d37b193111eb8893f52;hb=128192d98c77ce9399f90483f8a100942af68205;hp=306fb69bfd01ab77b519d5c49293c9dad30d3864;hpb=6e097c89af440da90b43ce90864394c4d0c843d5;p=pspp diff --git a/src/ui/gui/psppire-delimited-text.c b/src/ui/gui/psppire-delimited-text.c index 306fb69bfd..98f76b4301 100644 --- a/src/ui/gui/psppire-delimited-text.c +++ b/src/ui/gui/psppire-delimited-text.c @@ -71,6 +71,18 @@ count_delims (PsppireDelimitedText *tf) // g_print ("Max Number of delimiters per row: %d\n", tf->max_delimiters); } +static void +cache_invalidate (PsppireDelimitedText *tf) +{ + memset (tf->cache_starts, 0, 512); + if (tf->const_cache.string) + { + ss_dealloc (&tf->const_cache); + tf->const_cache.string = NULL; + tf->cache_row = -1; + } +} + static void psppire_delimited_text_set_property (GObject *object, guint prop_id, @@ -83,11 +95,6 @@ psppire_delimited_text_set_property (GObject *object, { case PROP_FIRST_LINE: tf->first_line = g_value_get_int (value); - if (tf->const_cache.string) - { - ss_dealloc (&tf->const_cache); - tf->cache_row = -1; - } break; case PROP_CHILD: tf->child = g_value_get_object (value); @@ -101,8 +108,8 @@ psppire_delimited_text_set_property (GObject *object, break; }; - if (tf->child) - count_delims (tf); + cache_invalidate (tf); + count_delims (tf); } static void @@ -147,7 +154,7 @@ __tree_get_iter (GtkTreeModel *tree_model, return FALSE; // g_print ("%s:%d %s %s\n", __FILE__, __LINE__, __FUNCTION__, gtk_tree_path_to_string (path)); - + gint *indices = gtk_tree_path_get_indices (path); if (!indices) @@ -159,9 +166,9 @@ __tree_get_iter (GtkTreeModel *tree_model, if (n >= children - file->first_line) return FALSE; - + // g_print ("%s:%d %s %d Children: %d\n", __FILE__, __LINE__, __FUNCTION__, n, children); - + iter->user_data = GINT_TO_POINTER (n); iter->stamp = file->stamp; @@ -177,7 +184,7 @@ __tree_iter_next (GtkTreeModel *tree_model, g_return_val_if_fail (file->stamp == iter->stamp, FALSE); gint n = GPOINTER_TO_INT (iter->user_data); - + // g_print ("%s:%d %s %d\n", __FILE__, __LINE__, __FUNCTION__, n); gint children = gtk_tree_model_iter_n_children (file->child, NULL); @@ -234,7 +241,7 @@ __tree_get_path (GtkTreeModel *tree_model, if (n >= children - file->first_line) return NULL; - + return gtk_tree_path_new_from_indices (n, -1); } @@ -253,10 +260,13 @@ static gint __tree_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter) { - g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__); PsppireDelimitedText *file = PSPPIRE_DELIMITED_TEXT (tree_model); + // g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__); g_assert (iter == NULL); - return 0; + + gint children = gtk_tree_model_iter_n_children (file->child, NULL); + + return children - file->first_line; } static GtkTreeModelFlags @@ -308,6 +318,64 @@ __iter_nth_child (GtkTreeModel *tree_model, } +/* Split row N into it's delimited fields (if it is not already cached) + and set this row as the current cache. */ +static void +split_row_into_fields (PsppireDelimitedText *file, gint n) +{ + if (n == file->cache_row) /* Cache hit */ + { + return; + } + + memset (file->cache_starts, 0, 512); + /* Cache miss */ + if (file->const_cache.string) + { + ss_dealloc (&file->const_cache); + } + ss_alloc_substring_pool (&file->const_cache, + PSPPIRE_TEXT_FILE (file->child)->lines[n], NULL); + struct substring cs = file->const_cache; + int field = 0; + file->cache_starts[0] = cs.string; + for (; + UINT32_MAX != ss_first_mb (cs); + ss_get_mb (&cs)) + { + ucs4_t xx = ss_first_mb (cs); + GSList *del; + for (del = file->delimiters; del; del = g_slist_next (del)) + { + if (xx == GPOINTER_TO_INT (del->data)) + { + field++; + int char_len = ss_first_mblen (cs); + file->cache_starts[field] = cs.string + char_len; + while (char_len > 0) + { + cs.string[char_len - 1] = '\0'; + char_len--; + } + break; + } + } + } + + file->cache_row = n; +} + +const gchar * +psppire_delimited_text_get_header_title (PsppireDelimitedText *file, gint column) +{ + if (file->first_line <= 0) + return NULL; + + split_row_into_fields (file, file->first_line - 1); + + return file->cache_starts [column]; +} + static void __get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, @@ -322,7 +390,7 @@ __get_value (GtkTreeModel *tree_model, gint n = GPOINTER_TO_INT (iter->user_data) + file->first_line; // g_print ("%s:%d Row: %d\n", __FILE__, __LINE__, n); - + if (column == 0) { g_value_init (value, G_TYPE_INT); @@ -332,42 +400,8 @@ __get_value (GtkTreeModel *tree_model, g_value_init (value, G_TYPE_STRING); - if (n != file->cache_row) - { - if (file->const_cache.string) - { - ss_dealloc (&file->const_cache); - } - ss_alloc_substring (&file->const_cache, PSPPIRE_TEXT_FILE (file->child)->lines[n]); - file->cache = file->const_cache; - int field = 0; - file->cache_starts[0] = file->cache.string; - for (; - UINT32_MAX != ss_first_mb (file->cache); - ss_get_mb (&file->cache)) - { - ucs4_t xx = ss_first_mb (file->cache); - GSList *del; - for (del = file->delimiters; del; del = g_slist_next (del)) - { - if (xx == GPOINTER_TO_INT (del->data)) - { - field++; - int char_len = ss_first_mblen (file->cache); - file->cache_starts[field] = file->cache.string + char_len; - while (char_len > 0) - { - file->cache.string[char_len - 1] = '\0'; - char_len--; - } - break; - } - } - } + split_row_into_fields (file, n); - file->cache_row = n; - } - g_value_set_string (value, file->cache_starts [column - 1]); } @@ -443,20 +477,20 @@ psppire_delimited_text_class_init (PsppireDelimitedTextClass *class) P_("The first line to be considered."), 0, 1000, 0, G_PARAM_READWRITE); - + GParamSpec *delimiters_spec = g_param_spec_pointer ("delimiters", "Field Delimiters", P_("A GSList of gunichars which delimit the fields."), G_PARAM_READWRITE); - GParamSpec *child_spec = + GParamSpec *child_spec = g_param_spec_object ("child", "Child Model", P_("The GtkTextModel which this object wraps."), GTK_TYPE_TREE_MODEL, G_PARAM_CONSTRUCT_ONLY |G_PARAM_READWRITE); - + object_class->set_property = psppire_delimited_text_set_property; object_class->get_property = psppire_delimited_text_get_property; @@ -471,7 +505,7 @@ psppire_delimited_text_class_init (PsppireDelimitedTextClass *class) g_object_class_install_property (object_class, PROP_FIRST_LINE, first_line_spec); - + object_class->finalize = psppire_delimited_text_finalize; object_class->dispose = psppire_delimited_text_dispose; } @@ -487,6 +521,7 @@ psppire_delimited_text_init (PsppireDelimitedText *text_file) text_file->const_cache.string = NULL; text_file->const_cache.length = 0; text_file->cache_row = -1; + memset (text_file->cache_starts, 0, 512); text_file->max_delimiters = 0; @@ -495,7 +530,7 @@ psppire_delimited_text_init (PsppireDelimitedText *text_file) } -PsppireDelimitedText * +GtkTreeModel * psppire_delimited_text_new (GtkTreeModel *child) { PsppireDelimitedText *retval =