diff -r bd60a2909c53 -r e099638ff236 graph-displayer.cc --- a/graph-displayer.cc Mon May 23 04:48:14 2005 +0000 +++ b/graph-displayer.cc Fri May 27 10:34:20 2005 +0000 @@ -12,6 +12,9 @@ int main(int argc, char *argv[]) { + + //initializing + property_strings=new std::string[PROPERTY_NUM]; property_strings[WIDTH]="Width"; property_strings[COLOR]="Color"; @@ -34,13 +37,14 @@ CoordinatesMap cm(g); Graph::EdgeMap cap(g), map1(g), map2(g), map3(g), map4(g); + Graph::NodeMap nodedata (g); //we create one object to read x coordinates //and one to read y coordinate of nodes and write them to cm NodeMap. - XMap xreader (cm); YMap yreader (cm); - Graph::NodeMap nodedata (g); + + //reading in graph and its maps std::ifstream is(argv[1]); @@ -55,6 +59,8 @@ reader.readEdgeMap("map4", map4); reader.run(); + //initializing MapStorage with the read data + MapStorage ms(g); ms.addNodeMap("data",&nodedata); ms.addEdgeMap("cap",&cap); @@ -63,6 +69,8 @@ ms.addEdgeMap("map3",&map3); ms.addEdgeMap("map4",&map4); + //initializing GUI + Gnome::Canvas::init(); Gtk::Main app(argc, argv);