diff -r c1084e2bff10 -r d6cc0579b94b mapstorage.cc --- a/mapstorage.cc Thu Mar 01 14:45:07 2007 +0000 +++ b/mapstorage.cc Thu Mar 01 16:28:13 2007 +0000 @@ -591,8 +591,9 @@ background_scaling = scaling; } -void MapStorage::exportGraphToEPS(std::vector options, std::string filename) +void MapStorage::exportGraphToEPS(std::vector options, std::string filename, std::string shapemap) { + Graph::NodeMap _shapes(graph, 0); Graph::NodeMap _nodeColors(graph, 0); Graph::EdgeMap _edgeColors(graph, 0); Graph::NodeMap _nodeSizes(graph, 6.0); @@ -642,6 +643,13 @@ } } } + if(shapemap!="") + { + if((minOfNodeMap(shapemap)>=0)&&(maxOfNodeMap(shapemap)<=4)) + { + _shapes=*(nodemap_storage[shapemap]); + } + } Palette palette; Palette paletteW(true); @@ -652,11 +660,12 @@ absoluteNodeSizes().absoluteEdgeWidths(). nodeScale(2).nodeSizes(_nodeSizes). coords(coords). + nodeShapes(_shapes). nodeColors(composeMap(paletteW,_nodeColors)). edgeColors(composeMap(palette,_edgeColors)). edgeWidthScale(0.3).edgeWidths(_edgeWidths). nodeTexts(_nodeTextMap).nodeTextSize(7). - enableParallel(_enableParallel).parEdgeDist(4). + enableParallel(_enableParallel).parEdgeDist(5). drawArrows(_drawArrows).arrowWidth(7).arrowLength(7). run();