[Lemon-commits] ladanyi: r3431 - glemon/branches/akos

[Lemon SVN]

Author: ladanyi
Date: Wed Jan  2 21:44:10 2008
New Revision: 3431

Modified:
   glemon/branches/akos/file_import_dialog.cc

Log:
Do not double import maps which are sources of some coordiante.


Modified: glemon/branches/akos/file_import_dialog.cc
==============================================================================
--- glemon/branches/akos/file_import_dialog.cc	(original)
+++ glemon/branches/akos/file_import_dialog.cc	Wed Jan  2 21:44:10 2008
@@ -591,30 +591,30 @@
       return;
     }
 
-    for (Gtk::TreeModel::Children::iterator it =
-        refNodeMapStore->children().begin();
-        it != refNodeMapStore->children().end(); ++it)
+    for (std::vector<tree_view_record>::const_iterator it =
+        node_tree_view_records.begin(); it != node_tree_view_records.end();
+        ++it)
     {
-      Gtk::TreeModel::Row row = *it;
-      if (row[NodeMapColumns.colReadAsNumeric])
-        p_data->numeric_node_map_names.push_back(
-            static_cast<Glib::ustring>(row[NodeMapColumns.colName]));
-      if (row[NodeMapColumns.colReadAsString])
-        p_data->string_node_map_names.push_back(
-            static_cast<Glib::ustring>(row[NodeMapColumns.colName]));
+      if (it->visible)
+      {
+        if (it->numeric)
+          p_data->numeric_node_map_names.push_back(it->name);
+        if (it->string)
+          p_data->string_node_map_names.push_back(it->name);
+      }
     }
 
-    for (Gtk::TreeModel::Children::iterator it =
-        refEdgeMapStore->children().begin();
-        it != refEdgeMapStore->children().end(); ++it)
+    for (std::vector<tree_view_record>::const_iterator it =
+        edge_tree_view_records.begin(); it != edge_tree_view_records.end();
+        ++it)
     {
-      Gtk::TreeModel::Row row = *it;
-      if (row[EdgeMapColumns.colReadAsNumeric])
-        p_data->numeric_edge_map_names.push_back(
-            static_cast<Glib::ustring>(row[EdgeMapColumns.colName]));
-      if (row[EdgeMapColumns.colReadAsString])
-        p_data->string_edge_map_names.push_back(
-            static_cast<Glib::ustring>(row[EdgeMapColumns.colName]));
+      if (it->visible)
+      {
+        if (it->numeric)
+          p_data->numeric_edge_map_names.push_back(it->name);
+        if (it->string)
+          p_data->string_edge_map_names.push_back(it->name);
+      }
     }
   }
 }