Changeset 1088:358526a620f8 in lemon-0.x for src

Timestamp:

01/19/05 13:17:11 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

One more node-shape added.

Location:

src

Files:

• demo/graph_to_eps_demo.cc (modified) (1 diff)
• lemon/graph_to_eps.h (modified) (5 diffs)

src/demo/graph_to_eps_demo.cc

@@ -73 +73 @@
   
   coords[n1]=Xy(50,50);  sizes[n1]=1; colors[n1]=1; shapes[n1]=0;
-  coords[n2]=Xy(50,70);  sizes[n2]=2; colors[n2]=2; shapes[n2]=0;
+  coords[n2]=Xy(50,70);  sizes[n2]=2; colors[n2]=2; shapes[n2]=2;
   coords[n3]=Xy(70,70);  sizes[n3]=1; colors[n3]=3; shapes[n3]=0;
   coords[n4]=Xy(70,50);  sizes[n4]=2; colors[n4]=4; shapes[n4]=1;
-  coords[n5]=Xy(85,60);  sizes[n5]=3; colors[n5]=5; shapes[n5]=0;
+  coords[n5]=Xy(85,60);  sizes[n5]=3; colors[n5]=5; shapes[n5]=2;
   
   Edge e;

src/lemon/graph_to_eps.h

@@ -158 +158 @@
   bool dontPrint;
 
-  enum NodeShapes { CIRCLE=0, SQUARE=1 };
+  enum NodeShapes { CIRCLE=0, SQUARE=1, DIAMOND=2 };
                    
   class edgeLess {
@@ -415 +415 @@
     case SQUARE:
       return p.x<=r&&p.x>=-r&&p.y<=r&&p.y>=-r;
+    case DIAMOND:
+      return p.x+p.y<=r && p.x-p.y<=r && -p.x+p.y<=r && -p.x-p.y<=r;
     }
     return false;
@@ -450 +452 @@
        << "      2 index 1 index add 2 index 2 index sub lineto\n"
        << "      closepath pop pop pop} bind def\n";
+    //x y r
+    os << "/di { newpath 2 index 1 index add 2 index moveto\n"
+       << "      2 index             2 index 2 index add lineto\n"
+       << "      2 index 1 index sub 2 index             lineto\n"
+       << "      2 index             2 index 2 index sub lineto\n"
+       << "      closepath pop pop pop} bind def\n";
     // x y r cr cg cb
     os << "/nc { setrgbcolor 2 index 2 index 2 index c fill\n"
@@ -460 +468 @@
        << _nodeBorderQuotient << " mul setlinewidth "
        << 1+_nodeBorderQuotient/2 << " div sq stroke\n"
+       << "   } bind def\n";
+    os << "/ndi { setrgbcolor 2 index 2 index 2 index di fill\n"
+       << "     0 0 0 setrgbcolor dup "
+       << _nodeBorderQuotient << " mul setlinewidth "
+       << 1+_nodeBorderQuotient/2 << " div di stroke\n"
        << "   } bind def\n";
     os << "/arrl " << _arrowLength << " def\n";
@@ -620 +633 @@
         case SQUARE:
           os<< "nsq";break;
+        case DIAMOND:
+          os<< "ndi";break;
         }
         os<<'\n';