Changeset 2174:f9e43b5cc617 in lemon-0.x

Timestamp:

08/10/06 15:52:56 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Some color constants added (BLACK, WHITE, RED etc)

Files:

• demo/disjoint_paths_demo.cc (modified) (1 diff)
• demo/strongly_connected_orientation.cc (modified) (1 diff)
• demo/topology_demo.cc (modified) (1 diff)
• lemon/Makefile.am (modified) (1 diff)
• lemon/color.cc (added)
• lemon/color.h (modified) (4 diffs)
• lemon/eps.h (modified) (2 diffs)
• lemon/graph_to_eps.h (modified) (2 diffs)

demo/disjoint_paths_demo.cc

@@ -42 +42 @@
 
 Color color(bool b) {
-  return b ? Color(1.0, 0.0, 0.0) : Color(0.0, 0.0, 0.0);
+  return b ? RED : BLACK;
 }
 

demo/strongly_connected_orientation.cc

@@ -46 +46 @@
 
 Color color(bool c) {
-  return c ? Color(0.0, 0.0, 0.0) : Color(1.0, 0.0, 0.0);
+  return c ? BLACK : RED;
 }
 

demo/topology_demo.cc

@@ -41 +41 @@
 
 Color color(bool val) {
-  return val ? Color(1.0, 0.0, 0.0) : Color(0.0, 0.0, 1.0);
+  return val ? RED : BLUE;
 }
 

lemon/Makefile.am

@@ -11 +11 @@
         lemon/lp_skeleton.cc \
         lemon/base.cc \
+        lemon/color.cc \
         lemon/eps.cc \
         lemon/bits/mingw32_rand.cc \

lemon/color.h

@@ -44 +44 @@
 
 namespace lemon {
+
+  /// \addtogroup misc
+  /// @{
 
 ///Data structure representing RGB colors.
@@ -73 +76 @@
 };
 
+  /// White color constant
+  extern const Color WHITE;  
+  /// Black color constant
+  extern const Color BLACK;
+  /// Red color constant
+  extern const Color RED;
+  /// Green color constant
+  extern const Color GREEN;
+  /// Blue color constant
+  extern const Color BLUE;
+  /// Yellow color constant
+  extern const Color YELLOW;
+  /// Magenta color constant
+  extern const Color MAGENTA;
+  /// Cyan color constant
+  extern const Color CYAN;
+  /// Grey color constant
+  extern const Color GREY;
+  /// Dark red color constant
+  extern const Color DARK_RED;
+  /// Dark green color constant
+  extern const Color DARK_GREEN;
+  /// Drak blue color constant
+  extern const Color DARK_BLUE;
+  /// Dark yellow color constant
+  extern const Color DARK_YELLOW;
+  /// Dark magenta color constant
+  extern const Color DARK_MAGENTA;
+  /// Dark cyan color constant
+  extern const Color DARK_CYAN;
+
 ///Maps <tt>int</tt>s to different \ref Color "Color"s
 
@@ -92 +126 @@
   ///amongst the provided color (\c true) or not (\c false). If it is true,
   ///white will be assigned to \c 0.
-  ///\param num the number of the allocated colors. If it is \c 0
-  ///the default color configuration is set up (26 color plus the while).
+  ///\param num the number of the allocated colors. If it is \c 0,
+  ///the default color configuration is set up (26 color plus the white).
   ///If \c num is less then 26/27 then the default color list is cut. Otherwise
   ///the color list is filled repeatedly with the default color list.
@@ -168 +202 @@
 ///Returns black for light colors and white for the dark ones.
 inline Color distantBW(const Color &c){
-  double v=(.2125*c.red()+.7154*c.green()+.0721*c.blue())<.5?1:0;
-  return Color(v,v,v);
+  return (.2125*c.red()+.7154*c.green()+.0721*c.blue())<.5 ? WHITE : BLACK;
 }
 
+/// @}
+
 } //END OF NAMESPACE LEMON
 

lemon/eps.h

@@ -287 +287 @@
     ///\param brd Color of the node border. The default color is black
     EpsDrawer &node(NodeShapes t, double x, double y, double r,
-                    Color col=Color(1,1,1), Color brd=Color(0,0,0));
+                    Color col=WHITE, Color brd=BLACK);
     ///Draw a node shape
     
@@ -298 +298 @@
     template<class T>
     EpsDrawer &node(NodeShapes t, xy<T> pos, double r,
-                    Color col=Color(1,1,1), Color brd=Color(0,0,0))
+                    Color col=WHITE, Color brd=BLACK)
     {
       return node(t,pos.x,pos.y,r,col,brd);

lemon/graph_to_eps.h

@@ -145 +145 @@
     g(_g), os(_os),
     _coords(xy<double>(1,1)), _nodeSizes(1.0), _nodeShapes(0),
-    _nodeColors(Color(1,1,1)), _edgeColors(Color(0,0,0)),
+    _nodeColors(WHITE), _edgeColors(BLACK),
     _edgeWidths(1), _edgeWidthScale(0.3),
     _nodeScale(1.0), _xBorder(10), _yBorder(10), _scale(1.0),
@@ -156 +156 @@
     _undirected(false),
     _pleaseRemoveOsStream(_pros), _scaleToA4(false),
-    _nodeTextColorType(SAME_COL), _nodeTextColors(Color(0,0,0)),
+    _nodeTextColorType(SAME_COL), _nodeTextColors(BLACK),
     _autoNodeScale(false),
     _autoEdgeWidthScale(false),