From: Andrea Zagli Date: Wed, 21 Sep 2011 14:57:04 +0000 (+0200) Subject: Finita la funzione SolipaUtils::gtktreemodel_copy. X-Git-Tag: 0.5.0~33 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=ebde003b2ebc1f3cc97dbd787982dcf8d6bdabd8;p=solipa%2Flibsolipa Finita la funzione SolipaUtils::gtktreemodel_copy. Aggiunto il test per SolipaUtils::gtktreemodel_copy. Aggiunti i file di Anjuta. closes #37 --- diff --git a/.anjuta/default.profile b/.anjuta/default.profile new file mode 100644 index 0000000..6937de0 --- /dev/null +++ b/.anjuta/default.profile @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/.anjuta/session/anjuta.session b/.anjuta/session/anjuta.session new file mode 100644 index 0000000..b447efe --- /dev/null +++ b/.anjuta/session/anjuta.session @@ -0,0 +1,26 @@ + +[Anjuta] +Maximized=1 +Geometry=1365x746+1+0 + +[Project Manager] +Shortcut=libsolipa//libsolipa//src//libsolipa.la%%%libsolipa//libsolipa//src//libsolipaooo.la%%%libsolipa//libsolipa//tests//allegato%%%libsolipa//libsolipa//tests//mail%%%libsolipa//libsolipa//tests//mail_get_addresses_from_string%%%libsolipa//libsolipa//tests//mailui%%%libsolipa//libsolipa//tests//ooo%%%libsolipa//libsolipa//tests//progresswindow%%%libsolipa//libsolipa//tests//utils%%%libsolipa//libsolipa//tests//utils_codfisc_piva%%%libsolipa//libsolipa//tests//utils_format_money%%%libsolipa//libsolipa//tests//utils_gdatetime%%%libsolipa//libsolipa//tests//utils_infobar%%%libsolipa//libsolipa//tests//utils_round +Expand=libsolipa.la%%%libsolipa + +[Document Manager] +bookmarks=\n\n + +[Execution] +Run in terminal=2 +Working directories=file:///home/andreaz/files/comune/solipa/libsolipa + +[Build] +Configuration list=1:Default:%%%1:Debug:Debug%%%1:Profiling:Profiling%%%1:Optimized:Optimized +Selected Configuration=Default +BuildArgs/Default=--enable-maintainer-mode +BuildArgs/Debug=--enable-maintainer-mode 'CFLAGS=-g -O0' 'CXXFLAGS=-g -O0' 'JFLAGS=-g -O0' 'FFLAGS=-g -O0' +BuildArgs/Profiling=--enable-maintainer-mode 'CFLAGS=-g -pg' 'CXXFLAGS=-g -pg' 'JFLAGS=-g -pg' 'FFLAGS=-g -pg' +BuildArgs/Optimized=--enable-maintainer-mode 'CFLAGS=-O2' 'CXXFLAGS=-O2' 'JFLAGS=-O2' 'FFLAGS=-O2' + +[Debugger] +Stop at beginning=2 diff --git a/.anjuta/session/dock-layout.xml b/.anjuta/session/dock-layout.xml new file mode 100644 index 0000000..b35c6db --- /dev/null +++ b/.anjuta/session/dock-layout.xml @@ -0,0 +1,2 @@ + + diff --git a/.anjuta_sym_db.db b/.anjuta_sym_db.db new file mode 100644 index 0000000..3dbbcb5 Binary files /dev/null and b/.anjuta_sym_db.db differ diff --git a/.gitignore b/.gitignore index 18d6412..79bd7c2 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ tests/utils tests/utils_codfisc_piva tests/utils_format_money tests/utils_gdatetime +tests/utils_gtktreemodel_copy tests/utils_infobar tests/utils_round *.csv diff --git a/libsolipa.anjuta b/libsolipa.anjuta new file mode 100644 index 0000000..5e1cf44 --- /dev/null +++ b/libsolipa.anjuta @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/utils.c b/src/utils.c index 8d48408..9da2b57 100644 --- a/src/utils.c +++ b/src/utils.c @@ -511,6 +511,68 @@ GType return ret; } +static void +solipa_gtktreemodel_copy_iter (GtkTreeModel *ret, + GtkTreeModel *model, + GtkTreeModel *model_child, + gboolean is_list_store, + guint cols, + GtkTreeIter *iter, + GtkTreeIter *iter_parent) +{ + GtkTreeIter iter_new; + GtkTreeIter iter_child; + + guint col; + + do + { + if (is_list_store) + { + gtk_list_store_append (GTK_LIST_STORE (ret), &iter_new); + } + else + { + gtk_tree_store_append (GTK_TREE_STORE (ret), &iter_new, iter_parent); + } + + for (col = 0; col < cols; col++) + { + GValue gval = {0}; + + if (model_child != NULL) + { + gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model), &iter_child, iter); + gtk_tree_model_get_value (model_child, &iter_child, col, &gval); + } + else + { + gtk_tree_model_get_value (model, iter, col, &gval); + } + + if (is_list_store) + { + gtk_list_store_set_value (GTK_LIST_STORE (ret), &iter_new, col, &gval); + } + else + { + gtk_tree_store_set_value (GTK_TREE_STORE (ret), &iter_new, col, &gval); + } + + g_value_unset (&gval); + } + + if (!is_list_store) + { + /* is_tree_store */ + if (gtk_tree_model_iter_children (model, &iter_child, iter)) + { + solipa_gtktreemodel_copy_iter (ret, model, model_child, is_list_store, cols, &iter_child, &iter_new); + } + } + } while (gtk_tree_model_iter_next (model, iter)); +} + GtkTreeModel *solipa_gtktreemodel_copy (GtkTreeModel *model, gboolean only_schema) { @@ -524,8 +586,6 @@ GtkTreeModel GtkTreeModel *model_child; GtkTreeIter iter; - GtkTreeIter iter_child; - GtkTreeIter iter_new; ret = NULL; @@ -550,26 +610,7 @@ GtkTreeModel { if (gtk_tree_model_get_iter_first (model, &iter)) { - do - { - gtk_list_store_append (GTK_LIST_STORE (ret), &iter_new); - for (col = 0; col < cols; col++) - { - GValue gval = {0}; - - if (model_child != NULL) - { - gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model), &iter_child, &iter); - gtk_tree_model_get_value (model_child, &iter_child, col, &gval); - } - else - { - gtk_tree_model_get_value (model, &iter, col, &gval); - } - gtk_list_store_set_value (GTK_LIST_STORE (ret), &iter_new, col, &gval); - g_value_unset (&gval); - } - } while (gtk_tree_model_iter_next (model, &iter)); + solipa_gtktreemodel_copy_iter (ret, model, model_child, TRUE, cols, &iter, NULL); } } } @@ -580,7 +621,10 @@ GtkTreeModel if (!only_schema) { - + if (gtk_tree_model_get_iter_first (model, &iter)) + { + solipa_gtktreemodel_copy_iter (ret, model, model_child, FALSE, cols, &iter, NULL); + } } } else diff --git a/tests/Makefile.am b/tests/Makefile.am index e80c512..864b442 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,5 +23,6 @@ noinst_PROGRAMS = allegato \ utils_codfisc_piva \ utils_format_money \ utils_gdatetime \ + utils_gtktreemodel_copy \ utils_infobar \ utils_round diff --git a/tests/utils_gtktreemodel_copy.c b/tests/utils_gtktreemodel_copy.c new file mode 100644 index 0000000..f2ddc56 --- /dev/null +++ b/tests/utils_gtktreemodel_copy.c @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2011 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +GtkTreeModel *copia; + +guint id; +gchar *cognome; +gchar *nome; + +static void +do_child (GtkTreeIter *iter) +{ + GtkTreeIter iter_child; + + do + { + gtk_tree_model_get (copia, iter, + 0, &id, + 1, &cognome, + 2, &nome, + -1); + g_printf ("%d\t%s\t%s\n", id, cognome, nome); + + if (gtk_tree_model_iter_children (copia, &iter_child, iter)) + { + do_child (&iter_child); + } + } while (gtk_tree_model_iter_next (copia, iter)); +} + +int +main (int argc, char *argv[]) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreeIter iter_child; + + gtk_init (&argc, &argv); + + /* copia di un LIST_STORE */ + g_printf ("COPIA DEL LIST_STORE\n" + "====================\n"); + + model = GTK_TREE_MODEL (gtk_list_store_new (3, + G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_STRING)); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + 0, 1, + 1, "Rossi", + 2, "Mario", + -1); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + 0, 2, + 1, "Verdi", + 2, "Giuseppe", + -1); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + 0, 3, + 1, "Bianchi", + 2, "Giovanna", + -1); + + copia = solipa_gtktreemodel_copy (model, FALSE); + + if (gtk_tree_model_get_iter_first (copia, &iter)) + { + do + { + gtk_tree_model_get (copia, &iter, + 0, &id, + 1, &cognome, + 2, &nome, + -1); + g_printf ("%d\t%s\t%s\n", id, cognome, nome); + } while (gtk_tree_model_iter_next (copia, &iter)); + } + else + { + g_error ("Copia del GTK_LIST_STORE vuota."); + } + + /* copia di un TREE_STORE */ + g_printf ("\n\nCOPIA DEL TREE_STORE\n" + "====================\n"); + + model = GTK_TREE_MODEL (gtk_tree_store_new (3, + G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_STRING)); + + gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter, + 0, 1, + 1, "Rossi", + 2, "Mario", + -1); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter_child, &iter); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter_child, + 0, 11, + 1, "- Rossi", + 2, "Annamaria", + -1); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter_child, &iter); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter_child, + 0, 12, + 1, "- Rossi", + 2, "Giancarlo", + -1); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter, + 0, 2, + 1, "Verdi", + 2, "Giuseppe", + -1); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter_child, &iter); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter_child, + 0, 21, + 1, "- Verdi", + 2, "Sandro", + -1); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter, + 0, 3, + 1, "Bianchi", + 2, "Giovanna", + -1); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter_child, &iter); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter_child, + 0, 31, + 1, "- Bianchi", + 2, "Rosalia", + -1); + GtkTreeIter iter_child_child; + gtk_tree_store_append (GTK_TREE_STORE (model), &iter_child_child, &iter_child); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter_child_child, + 0, 311, + 1, "-- Blu", + 2, "Rosso", + -1); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter_child, &iter); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter_child, + 0, 32, + 1, "- Bianchi", + 2, "Rosario", + -1); + + copia = solipa_gtktreemodel_copy (model, FALSE); + + if (gtk_tree_model_get_iter_first (copia, &iter)) + { + do_child (&iter); + } + else + { + g_error ("Copia del GTK_TREE_STORE vuota."); + } + + return 0; +}