Changeset 1575:438bc5defad1 in lemon-0.x

Timestamp:

07/20/05 14:13:36 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• spellcheck in doc
• getR(),getG(),getB() -> red(),green(),blue()
• reformatting

File:

• lemon/graph_to_eps.h (modified) (11 diffs)

lemon/graph_to_eps.h

@@ -56 +56 @@
   Color(double r,double g,double b) :_r(r),_g(g),_b(b) {};
   ///Returns the red component
- 
-  ///\todo \c red() could be a better name...
-  ///
-  double getR() const {return _r;}
+  double & red() {return _r;}
+  ///Returns the red component
+  const double & red() const {return _r;}
   ///Returns the green component
-  double getG() const {return _g;}
+  double & green() {return _g;}
+  ///Returns the green component
+  const double & green() const {return _g;}
   ///Returns the blue component
-  double getB() const {return _b;}
+  double & blue() {return _b;}
+  ///Returns the blue component
+  const double & blue() const {return _b;}
   ///Set the color components
   void set(double r,double g,double b) { _r=r;_g=g;_b=b; };
@@ -157 +160 @@
 inline Color distantColor(const Color &c) 
 {
-  return Color(c.getR()<.5?1:0,c.getG()<.5?1:0,c.getB()<.5?1:0);
+  return Color(c.red()<.5?1:0,c.green()<.5?1:0,c.blue()<.5?1:0);
 }
 ///Returns black for light colors and white for the dark ones.
@@ -163 +166 @@
 ///Returns black for light colors and white for the dark ones.
 inline Color distantBW(const Color &c){
-  double v=(.2125*c.getR()+.7154*c.getG()+.0721*c.getB())<.5?1:0;
+  double v=(.2125*c.red()+.7154*c.green()+.0721*c.blue())<.5?1:0;
   return Color(v,v,v);
 }
@@ -394 +397 @@
     {
       std::ostringstream os;    
-      os << c.getR() << ' ' << c.getG() << ' ' << c.getB();
+      os << c.red() << ' ' << c.green() << ' ' << c.blue();
       return os.str();
     }
@@ -703 +706 @@
      if(_copyright.size()>0) os << "%%Copyright: " << _copyright << '\n';
 //        << "%%Copyright: XXXX\n"
-    os << "%%Creator: LEMON GraphToEps function\n";
+    os << "%%Creator: LEMON, graphToEps()\n";
     
     {
@@ -726 +729 @@
       os <<"%%BoundingBox: 0 0 596 842\n%%DocumentPaperSizes: a4\n";
     else os << "%%BoundingBox: "
-            << bb.left()*  _scale-_xBorder << ' '
-            << bb.bottom()*_scale-_yBorder << ' '
-            << bb.right()* _scale+_xBorder << ' '
-            << bb.top()*   _scale+_yBorder << '\n';
+            << bb.left()   * _scale - _xBorder << ' '
+            << bb.bottom() * _scale - _yBorder << ' '
+            << bb.right()  * _scale + _xBorder << ' '
+            << bb.top()    * _scale + _yBorder << '\n';
     
     os << "%%EndComments\n";
@@ -866 +869 @@
 //            bez=bez.after((t1+t2)/2);
               os << _edgeWidths[*e]*_edgeWidthScale << " setlinewidth "
-                 << _edgeColors[*e].getR() << ' '
-                 << _edgeColors[*e].getG() << ' '
-                 << _edgeColors[*e].getB() << " setrgbcolor newpath\n"
+                 << _edgeColors[*e].red() << ' '
+                 << _edgeColors[*e].green() << ' '
+                 << _edgeColors[*e].blue() << " setrgbcolor newpath\n"
                  << bez.p1.x << ' ' <<  bez.p1.y << " moveto\n"
                  << bez.p2.x << ' ' << bez.p2.y << ' '
@@ -886 +889 @@
                  << _coords[g.target(*e)].x << ' '
                  << _coords[g.target(*e)].y << ' '
-                 << _edgeColors[*e].getR() << ' '
-                 << _edgeColors[*e].getG() << ' '
-                 << _edgeColors[*e].getB() << ' '
+                 << _edgeColors[*e].red() << ' '
+                 << _edgeColors[*e].green() << ' '
+                 << _edgeColors[*e].blue() << ' '
                  << _edgeWidths[*e]*_edgeWidthScale << " lb\n";
             }
@@ -913 +916 @@
                << _coords[g.source(e)].x << ' '
                << _coords[g.source(e)].y << ' '
-               << _edgeColors[e].getR() << ' '
-               << _edgeColors[e].getG() << ' '
-               << _edgeColors[e].getB() << " arr\n";
+               << _edgeColors[e].red() << ' '
+               << _edgeColors[e].green() << ' '
+               << _edgeColors[e].blue() << " arr\n";
           }
           else os << _coords[g.source(e)].x << ' '
@@ -921 +924 @@
                   << _coords[g.target(e)].x << ' '
                   << _coords[g.target(e)].y << ' '
-                  << _edgeColors[e].getR() << ' '
-                  << _edgeColors[e].getG() << ' '
-                  << _edgeColors[e].getB() << ' '
+                  << _edgeColors[e].red() << ' '
+                  << _edgeColors[e].green() << ' '
+                  << _edgeColors[e].blue() << ' '
                   << _edgeWidths[e]*_edgeWidthScale << " l\n";
       os << "grestore\n";
@@ -932 +935 @@
         os << _coords[n].x << ' ' << _coords[n].y << ' '
            << _nodeSizes[n]*_nodeScale << ' '
-           << _nodeColors[n].getR() << ' '
-           << _nodeColors[n].getG() << ' '
-           << _nodeColors[n].getB() << ' ';
+           << _nodeColors[n].red() << ' '
+           << _nodeColors[n].green() << ' '
+           << _nodeColors[n].blue() << ' ';
         switch(_nodeShapes[n]) {
         case CIRCLE: