diff -r 587a823bcdd0 -r 6d94de269ab1 gui/map_win.cc
--- a/gui/map_win.cc	Wed Jun 29 15:41:33 2005 +0000
+++ b/gui/map_win.cc	Wed Jun 29 19:44:30 2005 +0000
@@ -23,45 +23,15 @@
 
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-
-    std::map< std::string,Graph::EdgeMap<double> * >::iterator emsi=ms.beginOfEdgeMaps();
-    std::set<int> props;
-
-    int actprop;
-
-    //here we find out, which map is the default in MapStorage for this property, which are not
-    for(int j=0;j<ms.numOfEdgeMaps();j++)
-    {
-      //this is the default value for this property
-      if(emsi->second==&(ms.default_edgemaps[i]))
-      {
-	actprop=j;
-      }
-      //these are the maps NOT to show for this property
-      for(int k=0;k<EDGE_PROPERTY_NUM;k++)
-      {
-	if(emsi->second==&(ms.default_edgemaps[k]))
-	{
-	  props.insert(j);
-	}
-      }
-      emsi++;
-    }
-
     //filling in combo box with choices
     std::list<Glib::ustring> listStrings;
 
     listStrings.push_back("Default");
 
-    emsi=ms.beginOfEdgeMaps();
-
-    for(int j=0;j<ms.numOfEdgeMaps();j++)
+    std::map< std::string,Graph::EdgeMap<double> * >::iterator emsi=ms.beginOfEdgeMaps();
+    for(;emsi!=ms.endOfEdgeMaps();emsi++)
     {
-      if( ( props.find(j) )==( props.end() ) )
-      {
 	listStrings.push_back(emsi->first);
-      }
-      emsi++;
     }
 
     e_combo_array[i].set_popdown_strings(listStrings);
@@ -102,45 +72,16 @@
 
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-
-    std::map< std::string,Graph::NodeMap<double> * >::iterator emsi=ms.beginOfNodeMaps();
-    std::set<int> props;
-
-    int actprop;
-
-    //here we find out, which map is the default in MapStorage for this property, which are not
-    for(int j=0;j<ms.numOfNodeMaps();j++)
-    {
-      //these are the maps NOT to show for this property
-      if(emsi->second==&(ms.default_nodemaps[i]))
-      {
-	actprop=j;
-      }
-      //this is the other maps to show for this property
-      for(int k=0;k<NODE_PROPERTY_NUM;k++)
-      {
-	if(emsi->second==&(ms.default_nodemaps[k]))
-	{
-	  props.insert(j);
-	}
-      }
-      emsi++;
-    }
-
     //filling in combo box with choices
     std::list<Glib::ustring> listStrings;
 
     listStrings.push_back("Default");
 
-    emsi=ms.beginOfNodeMaps();
+    std::map< std::string,Graph::NodeMap<double> * >::iterator emsi=ms.beginOfNodeMaps();
 
-    for(int j=0;j<ms.numOfNodeMaps();j++)
+    for(;emsi!=ms.endOfNodeMaps();emsi++)
     {
-      if( ( props.find(j) )==( props.end() ) )
-      {
-	listStrings.push_back(emsi->first);
-      }
-      emsi++;
+      listStrings.push_back(emsi->first);
     }
 
     n_combo_array[i].set_popdown_strings(listStrings);
@@ -188,12 +129,7 @@
     Glib::ustring mapname = entry->get_text();
     if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
     {
-      if(mapname=="Default")
-      {
-	mapname=edge_property_strings[prop];
-      }
-
-      if( (ms.edgemap_storage).find(mapname) != (ms.edgemap_storage).end() )
+      if( ( (ms.edgemap_storage).find(mapname) != (ms.edgemap_storage).end() ) || (mapname=="Default") )
       {
 	switch(prop)
 	{
@@ -224,12 +160,7 @@
     Glib::ustring mapname = entry->get_text();
     if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
     {
-      if(mapname=="Default")
-      {
-	mapname=node_property_strings[prop];
-      }
-
-      if( (ms.nodemap_storage).find(mapname) != (ms.nodemap_storage).end() )
+      if( ( (ms.nodemap_storage).find(mapname) != (ms.nodemap_storage).end() ) || (mapname=="Default") )
       {
 	switch(prop)
 	{
@@ -261,18 +192,12 @@
 	  Glib::ustring mapname = entry->get_text();
 	  if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
 	    {
-	      if(mapname=="Default")
-		{
-		  mapname=node_property_strings[i];
-		}
-
-	      if( (ms.nodemap_storage).find(mapname) != (ms.nodemap_storage).end() )
+	      if( ( (ms.nodemap_storage).find(mapname) != (ms.nodemap_storage).end() ) || (mapname=="Default") )
 		{
 		  switch(i)
 		    {
 		    case N_RADIUS:
-		      //gdc.changeNodeRadius(mapname, node);
-		      std::cout << "If default map-value problem is solved, uncomment line in MapWin::node_update!" << std::endl;
+		      gdc.changeNodeRadius(mapname, node);
 		      break;
 		    case N_COLOR:
 		      gdc.changeNodeColor(mapname, node);
@@ -301,18 +226,13 @@
 	  Glib::ustring mapname = entry->get_text();
 	  if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
 	    {
-	      if(mapname=="Default")
-		{
-		  mapname=edge_property_strings[i];
-		}
 
-	      if( (ms.edgemap_storage).find(mapname) != (ms.edgemap_storage).end() )
+	      if( ( (ms.edgemap_storage).find(mapname) != (ms.edgemap_storage).end() ) || (mapname=="Default") )
 		{
 		  switch(i)
 		    {
 		    case E_WIDTH:
-		      //gdc.changeEdgeWidth(mapname, edge);
-		      std::cout << "If default map-value problem is solved, uncomment line in MapWin::edge_update!" << std::endl;
+		      gdc.changeEdgeWidth(mapname, edge);
 		      break;
 		    case E_COLOR:
 		      gdc.changeEdgeColor(mapname, edge);