Changeset 1234:49d018060749 in lemon-0.x for src/lemon/graph_to_eps.h

Timestamp:

03/21/05 12:46:13 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1661

Message:

Several changes in order to compile with gcc-3.4

File:

• src/lemon/graph_to_eps.h (modified) (6 diffs)

src/lemon/graph_to_eps.h

@@ -27 +27 @@
 #include<vector>
 
+#include<lemon/invalid.h>
 #include<lemon/xy.h>
 #include<lemon/maps.h>
@@ -192 +193 @@
   ConstMap<typename Graph::Edge,double > _edgeWidths;
 
-  static const double A4HEIGHT = 841.8897637795276;
-  static const double A4WIDTH  = 595.275590551181;
-  static const double A4BORDER = 15;
-
-  
   double _edgeWidthScale;
   
@@ -272 +268 @@
 template<class T> class GraphToEps : public T 
 {
+  // Can't believe it is required by the C++ standard
+  using T::g;
+  using T::os;
+
+  using T::_coords;
+  using T::_nodeSizes;
+  using T::_nodeShapes;
+  using T::_nodeColors;
+  using T::_edgeColors;
+  using T::_edgeWidths;
+
+  using T::_edgeWidthScale;
+  using T::_nodeScale;
+  using T::_xBorder;
+  using T::_yBorder;
+  using T::_scale;
+  using T::_nodeBorderQuotient;
+  
+  using T::_drawArrows;
+  using T::_arrowLength;
+  using T::_arrowWidth;
+  
+  using T::_showNodes;
+  using T::_showEdges;
+
+  using T::_enableParallel;
+  using T::_parEdgeDist;
+
+  using T::_showNodeText;
+  using T::_nodeTexts;  
+  using T::_nodeTextSize;
+
+  using T::_showNodePsText;
+  using T::_nodePsTexts;  
+  using T::_nodePsTextsPreamble;
+  
+  using T::_undir;
+  using T::_pleaseRemoveOsStream;
+
+  using T::_scaleToA4;
+
+  using T::_title;
+  using T::_copyright;
+
+  using T::NodeTextColorType;
+  using T::CUST_COL;
+  using T::DIST_COL;
+  using T::DIST_BW;
+  using T::_nodeTextColorType;
+  using T::_nodeTextColors;
+  // dradnats ++C eht yb deriuqer si ti eveileb t'naC
+
   typedef typename T::Graph Graph;
   typedef typename Graph::Node Node;
@@ -281 +329 @@
 
   static const int INTERPOL_PREC=20;
+  static const double A4HEIGHT = 841.8897637795276;
+  static const double A4WIDTH  = 595.275590551181;
+  static const double A4BORDER = 15;
 
   bool dontPrint;
@@ -324 +375 @@
   bool isParallel(Edge e,Edge f) const
   {
-    return (g.source(e)==g.source(f)&&g.target(e)==g.target(f))||
-      (g.source(e)==g.target(f)&&g.target(e)==g.source(f));
+    return (g.source(e)==g.source(f)&&
+            g.target(e)==g.target(f)) ||
+      (g.source(e)==g.target(f)&&
+       g.target(e)==g.source(f));
   }
   template<class TT>
@@ -584 +637 @@
   ///\sa nodePsTexts()
   GraphToEps<T> & nodePsTextsPreamble(const char *str) {
-    _nodePsTextsPreamble=s ;return *this;
+    _nodePsTextsPreamble=str ;return *this;
   }
   ///Sets whether the the graph is undirected