Changeset 1907:9f9eeb4d5c69 in lemon-0.x

Timestamp:

01/26/06 07:43:59 (17 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

MALE and FEMALE node shape added.

Files:

• doc/images/nodeshape_3.eps (added)
• doc/images/nodeshape_3.png (added)
• doc/images/nodeshape_4.eps (added)
• doc/images/nodeshape_4.png (added)
• lemon/graph_to_eps.h (modified) (5 diffs)

lemon/graph_to_eps.h

@@ -386 +386 @@
     ///\image latex nodeshape_2.eps "DIAMOND shape (2)" width=2cm
     ///
-    DIAMOND=2
+    DIAMOND=2,
+    /// = 3
+    ///\image html nodeshape_3.png
+    ///\image latex nodeshape_2.eps "MALE shape (4)" width=2cm
+    ///
+    MALE=3,
+    /// = 4
+    ///\image html nodeshape_4.png
+    ///\image latex nodeshape_2.eps "FEMALE shape (4)" width=2cm
+    ///
+    FEMALE=4
   };
 
@@ -751 +761 @@
     switch(t) {
     case CIRCLE:
+    case MALE:
+    case FEMALE:
       return p.normSquare()<=r*r;
     case SQUARE:
@@ -814 +826 @@
       double ns=_nodeSizes[n]*_nodeScale;
       xy<double> p(ns,ns);
-      bb.add(p+mycoords[n]);
-      bb.add(-p+mycoords[n]);
+      switch(_nodeShapes[n]) {
+      case CIRCLE:
+      case SQUARE:
+      case DIAMOND:
+        bb.add(p+mycoords[n]);
+        bb.add(-p+mycoords[n]);
+        break;
+      case MALE:
+        bb.add(-p+mycoords[n]);
+        bb.add(xy<double>(1.5*ns,1.5*sqrt(3)*ns)+mycoords[n]);
+        break;
+      case FEMALE:
+        bb.add(p+mycoords[n]);
+        bb.add(xy<double>(-ns,-3.01*ns)+mycoords[n]);
+        break;
+      }
     }
     if (bb.empty()) {
@@ -859 +885 @@
        << "     setrgbcolor " << 1+_nodeBorderQuotient << " div di fill\n"
        << "   } bind def\n";
+    os << "/nfemale { 0 0 0 setrgbcolor 3 index "
+       << _nodeBorderQuotient/(1+_nodeBorderQuotient)
+       << " 1.5 mul mul setlinewidth\n"
+       << "  newpath 5 index 5 index moveto "
+       << "5 index 5 index 5 index 3.01 mul sub\n"
+       << "  lineto 5 index 4 index .7 mul sub 5 index 5 index 2.2 mul sub moveto\n"
+       << "  5 index 4 index .7 mul add 5 index 5 index 2.2 mul sub lineto stroke\n"
+       << "  5 index 5 index 5 index c fill\n"
+       << "  setrgbcolor " << 1+_nodeBorderQuotient << " div c fill\n"
+       << "  } bind def\n";
+    os << "/nmale {\n"
+       << "  0 0 0 setrgbcolor 3 index "
+       << _nodeBorderQuotient/(1+_nodeBorderQuotient)
+       <<" 1.5 mul mul setlinewidth\n"
+       << "  newpath 5 index 5 index moveto\n"
+       << "  5 index 4 index 1 mul 1.5 mul add\n"
+       << "  5 index 5 index 3 sqrt 1.5 mul mul add\n"
+       << "  1 index 1 index lineto\n"
+       << "  1 index 1 index 7 index sub moveto\n"
+       << "  1 index 1 index lineto\n"
+       << "  exch 5 index 3 sqrt .5 mul mul sub exch 5 index .5 mul sub lineto\n"
+       << "  stroke\n"
+       << "  5 index 5 index 5 index c fill\n"
+       << "  setrgbcolor " << 1+_nodeBorderQuotient << " div c fill\n"
+       << "  } bind def\n";
+    
+
     os << "/arrl " << _arrowLength << " def\n";
     os << "/arrw " << _arrowWidth << " def\n";
@@ -1040 +1093 @@
         case DIAMOND:
           os<< "ndi";break;
+        case MALE:
+          os<< "nmale";break;
+        case FEMALE:
+          os<< "nfemale";break;
         }
         os<<'\n';