changeset 1892 | 1d384b30157f |
parent 1884 | 9c061834b33b |
child 1893 | 4a35c7847c77 |
22:b75910dd9776 | 23:0566c03936fa |
---|---|
27 e_combo_array[i]=new MapSelector(eml, mytab.getActiveEdgeMap(i), edge_property_strings[i], true); |
27 e_combo_array[i]=new MapSelector(eml, mytab.getActiveEdgeMap(i), edge_property_strings[i], true); |
28 |
28 |
29 (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3); |
29 (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3); |
30 |
30 |
31 e_combo_array[i]->signal_cbt_ch().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::edgeMapChanged), i)); |
31 e_combo_array[i]->signal_cbt_ch().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::edgeMapChanged), i)); |
32 e_combo_array[i]->signal_newmapwin_needed().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::newMapWinNeeded), i)); |
32 e_combo_array[i]->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &MapWin::newMapWinNeeded)); |
33 } |
33 } |
34 |
34 |
35 vbox.pack_start(*(new Gtk::Label("Edge properties"))); |
35 vbox.pack_start(*(new Gtk::Label("Edge properties"))); |
36 |
36 |
37 vbox.pack_start(*table); |
37 vbox.pack_start(*table); |
47 n_combo_array[i]=new MapSelector(nml, mytab.getActiveNodeMap(i), node_property_strings[i], false); |
47 n_combo_array[i]=new MapSelector(nml, mytab.getActiveNodeMap(i), node_property_strings[i], false); |
48 |
48 |
49 (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3); |
49 (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3); |
50 |
50 |
51 n_combo_array[i]->signal_cbt_ch().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::nodeMapChanged), i)); |
51 n_combo_array[i]->signal_cbt_ch().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::nodeMapChanged), i)); |
52 n_combo_array[i]->signal_newmapwin_needed().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::newMapWinNeeded), i)); |
52 n_combo_array[i]->signal_newmapwin_needed().connect(sigc::mem_fun(*this, &MapWin::newMapWinNeeded)); |
53 } |
53 } |
54 |
54 |
55 add(vbox); |
55 add(vbox); |
56 |
56 |
57 vbox.pack_start(*(new Gtk::Label("Node properties"))); |
57 vbox.pack_start(*(new Gtk::Label("Node properties"))); |
74 void MapWin::edgeMapChanged(std::string mapname, int prop) |
74 void MapWin::edgeMapChanged(std::string mapname, int prop) |
75 { |
75 { |
76 mytab.propertyChange(true, prop, mapname); |
76 mytab.propertyChange(true, prop, mapname); |
77 } |
77 } |
78 |
78 |
79 void MapWin::newMapWinNeeded(bool itisedge, int prop) |
79 void MapWin::newMapWinNeeded(bool itisedge) |
80 { |
80 { |
81 mytab.popupNewMapWin(itisedge, prop); |
81 mytab.popupNewMapWin(itisedge); |
82 } |
82 } |
83 |
83 |
84 void MapWin::update(std::vector<std::string> eml, std::vector<std::string> nml) |
84 void MapWin::update(std::vector<std::string> eml, std::vector<std::string> nml) |
85 { |
85 { |
86 for(int i=0;i<EDGE_PROPERTY_NUM;i++) |
86 for(int i=0;i<EDGE_PROPERTY_NUM;i++) |