glemon-0.x: comparison mapstorage.cc

equal deleted inserted replaced

-:04933d0a5ffa
+:5cd85492e57d
 edgemap_storage["arrow_pos_x"] = new Graph::EdgeMap<double>(graph);
 arrow_pos.setXMap(*edgemap_storage["arrow_pos_x"]);
 edgemap_storage["arrow_pos_y"] = new Graph::EdgeMap<double>(graph);
 arrow_pos.setYMap(*edgemap_storage["arrow_pos_y"]);
-nodemap_storage["id"] = new Graph::NodeMap<double>(graph);
+nodemap_storage["label"] = new Graph::NodeMap<double>(graph);
-edgemap_storage["id"] = new Graph::EdgeMap<double>(graph);
+edgemap_storage["label"] = new Graph::EdgeMap<double>(graph);
-nodemap_default["id"] = 1.0;
+nodemap_default["label"] = 1.0;
-edgemap_default["id"] = 1.0;
+edgemap_default["label"] = 1.0;
 active_nodemaps.resize(NODE_PROPERTY_NUM);
 for(int i=0;i<NODE_PROPERTY_NUM;i++)
 {
 active_nodemaps[i]="";
 else if (*it == "coordinates_y")
 {
 read_y = true;
 //std::cout << "read Y nodemap" << std::endl;
 }
-else if (*it == "id")
+else if (*it == "label")
 {
 //std::cout << "read id nodemap" << std::endl;
 }
 else
 {
 greader.readNodeMap(*it, *nodemap_storage[*it]);
 }
 for (std::vector<std::string>::const_iterator it = edgeMapNames.begin();
 it != edgeMapNames.end(); ++it)
 {
-if (*it == "id")
+if (*it == "label")
 {
 //std::cout << "read id edgemap" << std::endl;
 }
 else
 {
 return 1;
 }
 if (!read_edge_id)
 {
-edgemap_storage["id"] = new Graph::EdgeMap<double>(graph);
+edgemap_storage["label"] = new Graph::EdgeMap<double>(graph);
 int i = 1;
 for (EdgeIt e(graph); e != INVALID; ++e)
 {
-(*edgemap_storage["id"])[e] = i++;
+(*edgemap_storage["label"])[e] = i++;
 }
 }
 if (!read_x || !read_y)
 {
 // fill in the default values for the maps
 for (std::map<std::string, Graph::NodeMap<double>*>::const_iterator it =
 nodemap_storage.begin(); it != nodemap_storage.end(); ++it)
 {
-if ((it->first != "id") &&
+if ((it->first != "label") &&
 (it->first != "coordiantes_x") &&
 (it->first != "coordinates_y"))
 {
 nodemap_default[it->first] = 0.0;
 }
-else if (it->first == "id")
+else if (it->first == "label")
 {
 NodeIt n(graph);
-double max = (*nodemap_storage["id"])[n];
+double max = (*nodemap_storage["label"])[n];
 for (; n != INVALID; ++n)
 {
-if ((*nodemap_storage["id"])[n] > max)
+if ((*nodemap_storage["label"])[n] > max)
-max = (*nodemap_storage["id"])[n];
+max = (*nodemap_storage["label"])[n];
 }
-nodemap_default["id"] = max + 1.0;
+nodemap_default["label"] = max + 1.0;
 }
 }
 for (std::map<std::string, Graph::EdgeMap<double>*>::const_iterator it =
 edgemap_storage.begin(); it != edgemap_storage.end(); ++it)
 {
-if (it->first != "id")
+if (it->first != "label")
 {
 edgemap_default[it->first] = 0.0;
 }
 else
 {
 double max = std::numeric_limits<double>::min();
 for (EdgeIt e(graph); e != INVALID; ++e)
 {
-if ((*edgemap_storage["id"])[e] > max)
+if ((*edgemap_storage["label"])[e] > max)
-max = (*edgemap_storage["id"])[e];
+max = (*edgemap_storage["label"])[e];
 }
 if (max > std::numeric_limits<double>::min())
-edgemap_default["id"] = max + 1.0;
+edgemap_default["label"] = max + 1.0;
 else
-edgemap_default["id"] = 1.0;
+edgemap_default["label"] = 1.0;
 }
 }
 return 0;
 }
 for (std::map<std::string, Graph::NodeMap<double>*>::iterator it =
 nodemap_storage.begin(); it != nodemap_storage.end(); ++it)
 {
 if ((it->first != "coordinates_x") &&
 (it->first != "coordinates_y") &&
-(it->first != "id"))
+(it->first != "label"))
 {
 delete it->second;
 nodemap_storage.erase(it);
 }
 }
 for (std::map<std::string, Graph::EdgeMap<double>*>::iterator it =
 edgemap_storage.begin(); it != edgemap_storage.end(); ++it)
 {
-if ((it->first != "id") &&
+if ((it->first != "label") &&
 (it->first != "arrow_pos_x") &&
 (it->first != "arrow_pos_y"))
 {
 delete it->second;
 edgemap_storage.erase(it);
 }
 }
 for (std::map<std::string, double>::iterator it =
 nodemap_default.begin(); it != nodemap_default.end(); ++it)
 {
-if (it->first != "id")
+if (it->first != "label")
 nodemap_default.erase(it);
 }
 for (std::map<std::string, double>::iterator it =
 edgemap_default.begin(); it != edgemap_default.end(); ++it)
 {
-if (it->first != "id")
+if (it->first != "label")
 edgemap_default.erase(it);
 }
 graph.clear();
 file_name = "";
 modified = false;

branch	gui
changeset 134	82e19031c319
parent 128	3a4b6b31afb3
child 135	84996003b01c