Uh, long comment arrives... Zoom update does not happen after editorial steps. Nodes initial color is light blue, if there is any item under them. Strange node-text relations disappeared. Initial values of new items are given now in a more common way. The wood-cutter way of handling default values of properties is now changed.
4 bool MapWin::closeIfEscapeIsPressed(GdkEventKey* e)
6 if(e->keyval==GDK_Escape)
13 MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc):gdc(grdispc),ms(mapst)
16 set_default_size(200, 50);
18 signal_key_press_event().connect(sigc::mem_fun(*this, &MapWin::closeIfEscapeIsPressed));
20 e_combo_array=new Gtk::Combo [EDGE_PROPERTY_NUM];
22 table=new Gtk::Table(EDGE_PROPERTY_NUM, 2, false);
24 for(int i=0;i<EDGE_PROPERTY_NUM;i++)
26 //filling in combo box with choices
27 std::list<Glib::ustring> listStrings;
29 listStrings.push_back("Default");
31 std::map< std::string,Graph::EdgeMap<double> * >::iterator emsi=ms.beginOfEdgeMaps();
32 for(;emsi!=ms.endOfEdgeMaps();emsi++)
34 listStrings.push_back(emsi->first);
37 e_combo_array[i].set_popdown_strings(listStrings);
39 //Restrict it to these choices only:
40 e_combo_array[i].set_value_in_list();
42 //binding signal to the actual entry
43 e_combo_array[i].get_entry()->signal_changed().connect
47 sigc::mem_fun(*this, &MapWin::eComboChanged),
52 //placing actual entry in the right place
55 label->set_text(edge_property_strings[i]);
57 (*table).attach(*label,0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
58 (*table).attach(e_combo_array[i],1,2,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
63 vbox.pack_start(*(new Gtk::Label("Edge properties")));
65 vbox.pack_start(*table);
67 vbox.pack_start(*(new Gtk::HSeparator));
69 n_combo_array=new Gtk::Combo [NODE_PROPERTY_NUM];
71 table=new Gtk::Table(NODE_PROPERTY_NUM, 2, false);
73 for(int i=0;i<NODE_PROPERTY_NUM;i++)
75 //filling in combo box with choices
76 std::list<Glib::ustring> listStrings;
78 listStrings.push_back("Default");
80 std::map< std::string,Graph::NodeMap<double> * >::iterator emsi=ms.beginOfNodeMaps();
82 for(;emsi!=ms.endOfNodeMaps();emsi++)
84 listStrings.push_back(emsi->first);
87 n_combo_array[i].set_popdown_strings(listStrings);
89 //Restrict it to these choices only:
90 n_combo_array[i].set_value_in_list();
92 //binding signal to thew actual entry
93 n_combo_array[i].get_entry()->signal_changed().connect
97 sigc::mem_fun(*this, &MapWin::nComboChanged),
102 //placing actual entry in the right place
104 label=new Gtk::Label;
105 label->set_text(node_property_strings[i]);
107 (*table).attach(*label,0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
108 (*table).attach(n_combo_array[i],1,2,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
115 vbox.pack_start(*(new Gtk::Label("Node properties")));
117 vbox.pack_start(*table);
123 void MapWin::eComboChanged(int prop)
125 Gtk::Entry* entry = e_combo_array[prop].get_entry();
129 Glib::ustring mapname = entry->get_text();
130 if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
132 if( ( (ms.edgemap_storage).find(mapname) != (ms.edgemap_storage).end() ) || (mapname=="Default") )
137 gdc.changeEdgeWidth(mapname);
140 gdc.changeEdgeColor(mapname);
143 gdc.changeEdgeText(mapname);
146 std::cout<<"Error\n";
153 void MapWin::nComboChanged(int prop)
156 Gtk::Entry* entry = n_combo_array[prop].get_entry();
160 Glib::ustring mapname = entry->get_text();
161 if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
163 if( ( (ms.nodemap_storage).find(mapname) != (ms.nodemap_storage).end() ) || (mapname=="Default") )
168 gdc.changeNodeRadius(mapname);
171 gdc.changeNodeColor(mapname);
174 gdc.changeNodeText(mapname);
177 std::cout<<"Error\n";
184 void MapWin::updateNode(Graph::Node node)
186 for(int i=0;i<NODE_PROPERTY_NUM;i++)
188 Gtk::Entry* entry = n_combo_array[i].get_entry();
192 Glib::ustring mapname = entry->get_text();
193 if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
195 if( ( (ms.nodemap_storage).find(mapname) != (ms.nodemap_storage).end() ) || (mapname=="Default") )
200 gdc.changeNodeRadius(mapname, node);
203 gdc.changeNodeColor(mapname, node);
206 gdc.changeNodeText(mapname, node);
209 std::cout<<"Error\n";
217 void MapWin::updateEdge(Graph::Edge edge)
219 for(int i=0;i<EDGE_PROPERTY_NUM;i++)
222 Gtk::Entry* entry = e_combo_array[i].get_entry();
226 Glib::ustring mapname = entry->get_text();
227 if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
230 if( ( (ms.edgemap_storage).find(mapname) != (ms.edgemap_storage).end() ) || (mapname=="Default") )
235 gdc.changeEdgeWidth(mapname, edge);
238 gdc.changeEdgeColor(mapname, edge);
241 gdc.changeEdgeText(mapname, edge);
244 std::cout<<"Error\n";