Changeset 859

Timestamp:

Nov 20, 2009, 12:15:33 AM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #97. Improvements to summary plot.

Location:

trunk/lib

Files:

• Graph.cc (modified) (3 diffs)
• Graph.h (modified) (2 diffs)
• Stats.cc (modified) (5 diffs)

trunk/lib/Graph.cc

@@ -33 +33 @@
     pls_.init();
     pls_.adv(0);
-    pls_.scolbg(0,100,0);
-    pls_.rgb(255,0,0);
     pls_.vsta();
   }
+
 
   Graph::~Graph(void)
   {
   }
+
 
   bool Graph::date_xticks(void)
@@ -48 +48 @@
 
 
+  void Graph::fgcolour(unsigned char r, unsigned char g, unsigned char b)
+  {
+    pls_.rgb(r,g,b);
+  }
+
+
   void Graph::plot(const std::vector<unsigned int>& x)
   {
-    pls_.wind(0, x.size(), 0, x.back());
-    pls_.box("bcnstd", 100, 5, "bcnstv", 100, 5);
+    pls_.wind(0, x.size(), 0, yrange_);
+    pls_.box("bcnstv", 10, 1, "bcnstv", yrange_/5, 1);
     for (unsigned int i=1; i<x.size(); ++i) {
       pls_.join(i-1,x[i-1],i-1,x[i]);
@@ -67 +73 @@
   double Graph::yrange(double ymax)
   {
-    return ymax;
+    return yrange_=ymax;
   }
 

trunk/lib/Graph.h

@@ -47 +47 @@
     static bool date_xticks(void);
 
+    void fgcolour(unsigned char r, unsigned char g, unsigned char b);
     void plot(const std::vector<unsigned int>&);
 
@@ -56 +57 @@
     plstream pls_;
     static std::vector<std::string> xticks_;
+    double yrange_;
   };
 

trunk/lib/Stats.cc

@@ -410 +410 @@
 //    gp->plot(total);
 
-//    gp->command("unset multiplot");
-
     return filename;
   }
@@ -429 +427 @@
 //    gp->command("set key height 2");
 //    gp->linetitle(ss.str());
-//    gp->linestyle("steps 2");
-//    gp->plot(x);
+    gp.fgcolour(255,255,0);
+    gp.plot(x);
 
     ss.str("");
@@ -437 +435 @@
 //    gp->command("set key height 4");
 //    gp->linetitle(ss.str());
-//    gp->linestyle("steps 3");
-//    gp->plot(x);
+    gp.fgcolour(0,0,255);
+    gp.plot(x);
 
     ss.str("");
@@ -445 +443 @@
 //    gp->command("set key height 6");
 //    gp->linetitle(ss.str());
-//    gp->linestyle("steps 4");
-//    gp->plot(x);
+    gp.fgcolour(0,255,0);
+    gp.plot(x);
 
     ss.str("");
@@ -452 +450 @@
 //    gp->command("set key height 0");
 //    gp->linetitle(ss.str());
-//    gp->linestyle("steps 1");
+    gp.fgcolour(255,0,0);
     gp.plot(total);
-
-//    gp->command("unset multiplot");
   }