Changeset 201:879e47e5b731 in glemon-0.x for map_win.cc

Timestamp:

01/02/08 22:03:09 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3431

Message:

Merge branches/akos to trunk.

File:

• map_win.cc (modified) (6 diffs)

map_win.cc

@@ -32 +32 @@
 }
 
-MapWin::MapWin(const std::string& title, std::vector<std::string> eml, std::vector<std::string> nml, NoteBookTab & mw):mytab(mw)
+MapWin::MapWin(const std::string& title,
+    std::vector<std::string> n_eml,
+    std::vector<std::string> s_eml,
+    std::vector<std::string> n_nml,
+    std::vector<std::string> s_nml,
+    NoteBookTab & mw):mytab(mw)
 {
   set_title(title);
@@ -49 +54 @@
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]=new MapSelector(eml, mytab.getActiveEdgeMap(i), edge_property_strings[i], true);
+    switch (i)
+    {
+      case E_WIDTH:
+        e_combo_array[i]=new MapSelector(n_eml, s_eml,
+            mytab.getActiveEdgeMap(i), edge_property_strings[i],
+            true, true, NUM);
+        break;
+      case E_COLOR:
+        e_combo_array[i]=new MapSelector(n_eml, s_eml,
+            mytab.getActiveEdgeMap(i), edge_property_strings[i],
+            true, true, NUM);
+        break;
+      case E_TEXT:
+        e_combo_array[i]=new MapSelector(n_eml, s_eml,
+            mytab.getActiveEdgeMap(i), edge_property_strings[i],
+            true, true, ALL);
+        break;
+    }
 
     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -69 +91 @@
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]=new MapSelector(nml, mytab.getActiveNodeMap(i), node_property_strings[i], false);
+    switch (i)
+    {
+      case N_RADIUS:
+        n_combo_array[i]=new MapSelector(n_nml, s_nml,
+            mytab.getActiveNodeMap(i), node_property_strings[i],
+            false, true, NUM);
+        break;
+      case N_COLOR:
+        n_combo_array[i]=new MapSelector(n_nml, s_nml,
+            mytab.getActiveNodeMap(i), node_property_strings[i],
+            false, true, NUM);
+        break;
+      case N_TEXT:
+        n_combo_array[i]=new MapSelector(n_nml, s_nml,
+            mytab.getActiveNodeMap(i), node_property_strings[i],
+            false, true, ALL);
+        break;
+    }
 
     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
@@ -83 +122 @@
   vbox.pack_start(*table);
 
+  update(n_eml, s_eml, n_nml, s_nml);
+
   show_all_children();
 
@@ -102 +143 @@
 }
 
-void MapWin::update(std::vector<std::string> eml, std::vector<std::string> nml)
+void MapWin::update(
+    std::vector<std::string> n_eml,
+    std::vector<std::string> s_eml,
+    std::vector<std::string> n_nml,
+    std::vector<std::string> s_nml)
 {
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]->update_list(eml);
+    e_combo_array[i]->update_list(n_eml, s_eml);
   }
 
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]->update_list(nml);
+    n_combo_array[i]->update_list(n_nml, s_nml);
   }
 
@@ -117 +162 @@
 }
 
-void MapWin::registerNewEdgeMap(std::string newmapname)
+void MapWin::registerNewEdgeMap(std::string newmapname, MapValue::Type type)
 {
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
     //filling in combo box with choices
-    e_combo_array[i]->append_text((Glib::ustring)newmapname);
-  }
-}
-
-void MapWin::registerNewNodeMap(std::string newmapname)
+    e_combo_array[i]->append_text((Glib::ustring)newmapname, type);
+  }
+}
+
+void MapWin::registerNewNodeMap(std::string newmapname, MapValue::Type type)
 {
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
     //filling in combo box with choices
-    n_combo_array[i]->append_text((Glib::ustring)newmapname);
+    n_combo_array[i]->append_text((Glib::ustring)newmapname, type);
   }
 }