1.1 --- a/mapstorage.cc	Thu Mar 01 14:45:07 2007 +0000
     1.2 +++ b/mapstorage.cc	Thu Mar 01 16:28:13 2007 +0000
     1.3 @@ -591,8 +591,9 @@
     1.4    background_scaling = scaling;
     1.5  }
     1.6  
     1.7 -void MapStorage::exportGraphToEPS(std::vector<bool> options, std::string filename)
     1.8 +void MapStorage::exportGraphToEPS(std::vector<bool> options, std::string filename, std::string shapemap)
     1.9  {
    1.10 +  Graph::NodeMap<int> _shapes(graph, 0);
    1.11    Graph::NodeMap<int> _nodeColors(graph, 0);
    1.12    Graph::EdgeMap<int> _edgeColors(graph, 0);
    1.13    Graph::NodeMap<double> _nodeSizes(graph, 6.0);
    1.14 @@ -642,6 +643,13 @@
    1.15  	    }
    1.16  	}
    1.17      }
    1.18 +  if(shapemap!="")
    1.19 +    {
    1.20 +      if((minOfNodeMap(shapemap)>=0)&&(maxOfNodeMap(shapemap)<=4))
    1.21 +	{
    1.22 +	  _shapes=*(nodemap_storage[shapemap]);
    1.23 +	}
    1.24 +    }
    1.25  
    1.26    Palette palette;
    1.27    Palette paletteW(true);
    1.28 @@ -652,11 +660,12 @@
    1.29      absoluteNodeSizes().absoluteEdgeWidths().
    1.30      nodeScale(2).nodeSizes(_nodeSizes).
    1.31      coords(coords).
    1.32 +    nodeShapes(_shapes).
    1.33      nodeColors(composeMap(paletteW,_nodeColors)).
    1.34      edgeColors(composeMap(palette,_edgeColors)).
    1.35      edgeWidthScale(0.3).edgeWidths(_edgeWidths).
    1.36      nodeTexts(_nodeTextMap).nodeTextSize(7).
    1.37 -    enableParallel(_enableParallel).parEdgeDist(4).
    1.38 +    enableParallel(_enableParallel).parEdgeDist(5).
    1.39      drawArrows(_drawArrows).arrowWidth(7).arrowLength(7).
    1.40      run();
    1.41