equal
deleted
inserted
replaced
34 { |
34 { |
35 XmlIo x(is); |
35 XmlIo x(is); |
36 std::map<int, XY > m; |
36 std::map<int, XY > m; |
37 x("arrow_pos", m); |
37 x("arrow_pos", m); |
38 |
38 |
39 if ((int)m.size() != countEdges(mapstorage->graph)) return; |
39 if ((int)m.size() == countEdges(mapstorage->graph)) |
40 |
40 { |
41 for (EdgeIt e(mapstorage->graph); e != INVALID; ++e) |
41 for (EdgeIt e(mapstorage->graph); e != INVALID; ++e) |
42 { |
42 { |
43 int edgeid = (int)(*mapstorage->edgemap_storage["label"])[e]; |
43 int edgeid = (int)(*mapstorage->edgemap_storage["label"])[e]; |
44 mapstorage->arrow_pos.set(e, m[edgeid]); |
44 mapstorage->arrow_pos.set(e, m[edgeid]); |
45 } |
45 } |
46 mapstorage->ArrowPosReadOK(); |
46 mapstorage->ArrowPosReadOK(); |
47 |
47 } |
|
48 |
48 std::map<int, std::string> nm; |
49 std::map<int, std::string> nm; |
49 x("active_nodemaps", nm); |
50 x("active_nodemaps", nm); |
50 |
51 |
51 for(int i=0;i<NODE_PROPERTY_NUM;i++) |
52 for(int i=0;i<NODE_PROPERTY_NUM;i++) |
52 { |
53 { |