From: Michael Wiebusch <m.wiebusch@gsi.de>
Date: Mon, 27 Feb 2017 16:36:14 +0000 (+0100)
Subject: fixed HPlot/adcmon incompatibility with Gnuplot 5
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e34622468d88adf6946f24f44e183013ea12348b;p=mvdsensorcontrol.git

fixed HPlot/adcmon incompatibility with Gnuplot 5
---

diff --git a/tools/HPlot.pm b/tools/HPlot.pm
index 2c64165..88e5ceb 100644
--- a/tools/HPlot.pm
+++ b/tools/HPlot.pm
@@ -4,33 +4,52 @@ use Data::Dumper;
 use warnings;
 use strict;
 use FileHandle;
+use Storable qw(lock_store lock_retrieve);
 
 my $p;
+my $storefile;
+my $plotstring;
 
-use constant {TYPE_HISTORY => 1};
+use constant {TYPE_HISTORY => 1, TYPE_BARGRAPH => 2, TYPE_HEATMAP => 3};
 
 use constant {OUT_PNG    => 1,
               OUT_SVG    => 2,  #n/a
               OUT_SCREEN => 3}; #n/a
 
-my @color= ('#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd');
+my @color= ('#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd','#dddd22','#8888dd','#8822bb','#444444',
+ '#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd','#dddd22','#8888dd','#8822bb','#444444');
 
 sub plot_write {
-  my ($file,$str,$no) = @_;
+  my ($file,$str,$no,$save) = @_;
   return unless $str;
   if($no || 0) {
     print $file $str;
+#      print $str;
     }
   else {
     print $file $str."\n";
+#      print $str."\n";
     }
+  if(defined $save) {$plotstring->{$save} .= $str;}  
   }
 
 
 sub makeTimeString{
-  return strftime("set label 100 \"%H:%M:%S\" at screen 0.02,0.02 left tc rgb \"#000044\" font \"monospace,8\"\n", localtime());
+  return strftime("set label 100 \"%H:%M:%S\" at screen 0.02,0.02 left tc rgb \"#000044\" font \"monospace,8\"\n", localtime())
   }
 
+sub setranges { 
+  my ($fh,$name,$min,$max) = @_;
+  if(defined $min && defined $max) {
+    plot_write($fh,"set $name [$min:$max]");
+    }
+  elsif(defined $max) {
+    plot_write($fh,"set $name [:$max]");
+    }
+  elsif(defined $min) {
+    plot_write($fh,"set $name [$min:]");
+    }  
+  }
 
 sub PlotInit {
   my ($c) = @_;
@@ -38,14 +57,15 @@ sub PlotInit {
   my $name      = $c->{name};
 
   my $fn = "gnuplot";
-  my $fh = new FileHandle ("|$fn") or  die "error: no gnuplot";
+  #my $fh = new FileHandle ("|$fn") or  die "error: no gnuplot";
+  open my $fh, "|$fn" or  die "error: no gnuplot";
   $fh->autoflush(1);
 
 
-
   $p->{$name} = $c;
   $p->{$name}->{fh} = $fh;
   $p->{$name}->{run} = 0;
+  $p->{$name}->{buffer} = $p->{$name}->{buffer} || 0;
   $p->{$name}->{sizex} = $p->{$name}->{sizex} || 600 ;
   $p->{$name}->{sizey} = $p->{$name}->{sizey} || 400 ;
   $p->{$name}->{file} = $p->{$name}->{file} || "dummy" ;
@@ -53,19 +73,35 @@ sub PlotInit {
   $p->{$name}->{xscale} = $p->{$name}->{xscale} || 1;
   $p->{$name}->{type}   or die "No plot type specified";
   $p->{$name}->{output} or die "No destination specified";
+  $p->{$name}->{colors} = $p->{$name}->{colors} || \@color;
+  $p->{$name}->{showvalues} = $p->{$name}->{showvalues} || 0;
+  $p->{$name}->{storable} = $p->{$name}->{storable} || 0;
+  $p->{$name}->{xticks} = $p->{$name}->{xticks} || 0;
+  $p->{$name}{additional} = $p->{$name}{additional} || '';
 
-  @color = @{$p->{$name}->{colors}} if($p->{$name}->{colors});
-
+  my $filename = $p->{$name}->{file};
+  $filename =~ s%/%%;
+  $storefile->{$name} = $name.'-'.$p->{$name}->{curves}.'-'.$p->{$name}->{entries}.'-'.$filename.'.store';
+  $storefile->{$name} =~ s%/%%g;
+  $storefile->{$name} = "/dev/shm/".$storefile->{$name};
+  
   foreach my $i (0..($c->{entries}-1)) {
     for my $j (0..($c->{curves}-1)) {
-      push(@{$p->{$name}->{value}->[$j]},"NaN") ;
+      push(@{$p->{$name}->{value}->[$j]},0) ;
+      }
+    }
+  
+  if($p->{$name}->{storable}) {
+    if (-e $storefile->{$name}) {
+      $p->{$name}->{value} = lock_retrieve($storefile->{$name});
       }
     }
 
+
   if($p->{$name}->{output} == OUT_PNG) {
     $p->{$name}->{file} or die "No filename specified";
-    plot_write($fh,"set term png size ".$p->{$name}->{sizex}.",".$p->{$name}->{sizey}." font \"monospace,8\"");
-    plot_write($fh,"set out \"".$p->{$name}->{file}.".png\"");
+    plot_write($fh,"set term png size ".$p->{$name}->{sizex}.",".$p->{$name}->{sizey}." truecolor font \"monospace,8\"");
+    plot_write($fh,"set out \"".$p->{$name}->{file}.($p->{$name}->{buffer}?"tmp":"").".png\"");
     }
   elsif($p->{$name}->{output} == OUT_SCREEN) {
     plot_write($fh,"set term x11 size ".$p->{$name}->{sizex}.",".$p->{$name}->{sizey});
@@ -77,21 +113,23 @@ sub PlotInit {
   if  ($p->{$name}->{nokey}) {
     plot_write($fh,"unset key");
     }
+  else {
+    plot_write($fh,"set key left top");
+    }
+
 
-  plot_write($fh,"set datafile missing \"NaN\"");
   plot_write($fh,"set xlabel \"".$p->{$name}->{xlabel}."\"") if $p->{$name}->{xlabel};
   plot_write($fh,"set ylabel \"".$p->{$name}->{ylabel}."\"") if $p->{$name}->{ylabel};
 
-  if(defined $p->{$name}->{ymin} && defined $p->{$name}->{ymax}) {
-    plot_write($fh,"set yrange [".$p->{$name}->{ymin}.":".$p->{$name}->{ymax}."]");
-    }
-  elsif(defined $p->{$name}->{ymax}) {
-    plot_write($fh,"set yrange [:".$p->{$name}->{ymax}."]");
-    }
-  elsif(defined $p->{$name}->{ymin}) {
-    plot_write($fh,"set yrange [".$p->{$name}->{ymin}.":]");
-    }
+  setranges($fh,'xrange',$p->{$name}->{xmin},$p->{$name}->{xmax});
+  setranges($fh,'yrange',$p->{$name}->{ymin},$p->{$name}->{ymax});
+  setranges($fh,'zrange',$p->{$name}->{zmin},$p->{$name}->{zmax});
+  setranges($fh,'cbrange',$p->{$name}->{cbmin},$p->{$name}->{cbmax});
 
+  if($p->{$name}->{addCmd} && $p->{$name}->{addCmd} ne "") {  
+    plot_write($fh,$p->{$name}->{addCmd});
+    }
+    
   if($p->{$name}->{type} == TYPE_HISTORY) {
     if($p->{$name}->{fill}) {
       plot_write($fh,"set style fill solid 1.00");
@@ -103,21 +141,71 @@ sub PlotInit {
     plot_write($fh,"set autoscale fix");
     plot_write($fh,"set xtics autofreq"); #$p->{$name}->{entries}
     plot_write($fh,"set grid");
+    plot_write($fh,$p->{$name}{additional}) if $p->{$name}{additional};
 #     plot_write($fh,"set style fill solid 1.0");
-    plot_write($fh,"plot ",1);
+    plot_write($fh,"plot ",1,$name);
     for(my $j=0; $j<$p->{$name}->{curves};$j++) {
       if($p->{$name}->{fill}) {
-        plot_write($fh,"'-' using 1:2 with filledcurves x1 lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
+        plot_write($fh,"'-' using 1:2 with filledcurves x1 lt rgb \"".$p->{$name}->{colors}->[$j]."\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1,$name);
         }
       elsif($p->{$name}->{dots}) {
-        plot_write($fh,"'-' using 1:2 with points pointsize 0.6 pointtype 2 lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
+        plot_write($fh,"'-' using 1:2 with points pointsize 0.6 pointtype 2 lt rgb \"".$p->{$name}->{colors}->[$j]."\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1,$name);
         }
       else {
-        plot_write($fh,"'-' using 1:2 with lines  lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1);
+        plot_write($fh,"'-' using 1:2 with lines  lt rgb \"".$p->{$name}->{colors}->[$j]."\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1,$name);
+        }
+      plot_write($fh,', ',1,$name) unless ($j+1==$p->{$name}->{curves});
+      }
+    plot_write($fh," ",0,$name);
+    }
+  elsif($p->{$name}->{type} == TYPE_BARGRAPH) {
+    my $stacked = $p->{$name}{stacked}?' rowstacked':'';
+    print $stacked;
+    plot_write($fh,"set style fill   solid 1.00 border -1");
+    plot_write($fh,"set grid noxtics ytics");
+    plot_write($fh,"set boxwidth ".($p->{$name}->{curvewidth}||4)." absolute");
+    plot_write($fh,"set style histogram  gap ".($p->{$name}->{bargap}||1).' '.$stacked);
+#title offset character 0, 0, 0
+    
+    if($p->{$name}->{xticks}) {
+      plot_write("set xtics rotate by 90 offset .7,-1.7 scale .7 ");
+      }
+    
+    if(defined $p->{$name}->{bartitle} && scalar @{$p->{$name}->{bartitle}}) {
+      plot_write($fh,"set xtics (",1);
+      for(my $j=0; $j<scalar @{$p->{$name}->{bartitle}};$j++) {
+        plot_write($fh,', ',1) if $j;
+        plot_write($fh,"'".$p->{$name}->{bartitle}->[$j]."' $j ",1);
         }
-      plot_write($fh,', ',1) unless ($j+1==$p->{$name}->{curves});
+      plot_write($fh,") offset 2.5,0 scale 0");
+      }
+    plot_write($fh,"set style data histograms");
+    plot_write($fh,$p->{$name}{additional});
+    
+    plot_write($fh,"plot ",1,$name);
+    for(my $j=0; $j<$p->{$name}->{curves};$j++) {
+      plot_write($fh,', ',1,$name) if $j;
+      plot_write($fh,"'-' with histograms ",1,$name);
+      plot_write($fh,"using 2:xticlabels(1) ",1,$name) if ($p->{$name}->{xticks});
+      plot_write($fh, "lt rgb \"".$p->{$name}->{colors}->[$j]."\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1,$name);
+      }
+    plot_write($fh," ",0,$name);
+    }
+  elsif($p->{$name}->{type} == TYPE_HEATMAP) {
+    plot_write($fh,"set view map");
+    if(defined $p->{$name}->{palette}) {
+      plot_write($fh,"set palette ".$p->{$name}->{palette});
+      }
+    else {
+      plot_write($fh,"set palette rgbformulae 22,13,-31");
+      }
+    if ($p->{$name}->{showvalues} == 0) {
+      plot_write($fh,"splot '-' matrix with image",0,$name);
+      }
+    else {
+      plot_write($fh,"plot '-' matrix with image, '-' matrix using 1:2:(sprintf('%i', \$3)) with labels tc rgb \"#ffffff\" font ',10'",0,$name);
+#      plot_write($fh,"plot '-' matrix with image, '-' matrix using 1:2:(sprintf('%i', \$3)):3 with labels tc palette  font ',10'");
       }
-    plot_write($fh," ");
     }
   else {
     die "Plot type not supported";
@@ -128,54 +216,93 @@ sub PlotInit {
 
 sub PlotDraw {
   my($name) = @_;
+  if($p->{$name}->{buffer} && -e $p->{$name}->{file}."tmp.png") {  
+    rename $p->{$name}->{file}."tmp.png", $p->{$name}->{file}.".png";
+    }
   if($p->{$name}->{run}>=1) {
-    plot_write($p->{$name}->{fh},"set out \"|cat >".
-      $p->{$name}->{file}.".png_tmp && mv ".
-      $p->{$name}->{file}.".png_tmp ".
-      $p->{$name}->{file}.".png ".
-      "\"");
-# #       this code makes gnuplot write a temp file first, and after its creation, moves the temp file
-#     plot_write($p->{$name}->{fh},"set out \"|base64 >".
-#       $p->{$name}->{file}.".png.base64_tmp && mv ".
-#       $p->{$name}->{file}.".png.base64_tmp ".
-#       $p->{$name}->{file}.".png.base64 ".
-#       "\"");
-#     plot_write($p->{$name}->{fh},"set out \"".
-#       $p->{$name}->{file}.".png".
-#       "\"");
+    plot_write($p->{$name}->{fh},"set out \"".$p->{$name}->{file}.($p->{$name}->{buffer}?"tmp":"").".png\"");
     plot_write($p->{$name}->{fh},makeTimeString());
-  #### show a label when no data is coming ####
-  if ( $p->{$name}->{value}->[1]->[-1] > $p->{$name}->{value}->[2]->[-1] ) { # test if min>max (impossible for real data)
-    plot_write($p->{$name}->{fh},"set label 101 \"no data from FEE\" at screen 0.52,0.55 center tc rgb \"#770000\" font \"monospace,14\"\n");
-  }else{
-    plot_write($p->{$name}->{fh},"set label 101 \"\"\n");
-  }
-  #### /show a label when no data is coming ####
-    plot_write($p->{$name}->{fh},"replot");
-    }
-  for(my $j=0; $j<$p->{$name}->{curves}; $j++) {
-    for(my $i=0; $i< scalar @{$p->{$name}->{value}->[$j]}; $i++) {
-      plot_write($p->{$name}->{fh},(($i-$p->{$name}->{entries})/$p->{$name}->{xscale})." ".$p->{$name}->{value}->[$j]->[$i]) unless $p->{$name}->{countup};
-      plot_write($p->{$name}->{fh},($i/$p->{$name}->{xscale})." ".$p->{$name}->{value}->[$j]->[$i]) if $p->{$name}->{countup};
-#       print $j." ".$i." ".$p->{$name}->{entries}." ".$p->{$name}->{xscale}." ".$p->{$name}->{value}->[$j]->[$i]."\n";
+    plot_write($p->{$name}->{fh},$plotstring->{$name});
+    }
+    
+  if($p->{$name}->{type} == TYPE_HISTORY) {  
+    my $realentries = $p->{$name}{limitentries} || $p->{$name}->{entries};
+    for(my $j=0; $j<$p->{$name}->{curves}; $j++) {
+      for(my $i=$p->{$name}->{entries}-$realentries; $i< $p->{$name}->{entries}; $i++) {
+        if ($p->{$name}->{countup}) {
+          plot_write($p->{$name}->{fh},(($i-($p->{$name}->{entries}-$realentries))/$p->{$name}->{xscale})." ".$p->{$name}->{value}->[$j]->[$i]);
+          }
+        else {
+          plot_write($p->{$name}->{fh},(($i-$realentries)/($p->{$name}->{xscale}||1))." ".($p->{$name}->{value}->[$j]->[$i]||0));
+          }
+        }
+      plot_write($p->{$name}->{fh},"e");
+      }  
+    }
+    
+    
+  if($p->{$name}->{type} == TYPE_BARGRAPH) { 
+    my $realentries = $p->{$name}{limitentries} || $p->{$name}->{entries};
+    for(my $j=0; $j<$p->{$name}->{curves}; $j++) {
+      for(my $i=$p->{$name}->{entries}-$realentries; $i< $p->{$name}->{entries}; $i++) {
+        plot_write($p->{$name}->{fh},' '.$p->{$name}->{value}->[$j]->[$i]);
+        }
+      plot_write($p->{$name}->{fh},"e");
+      }
+    }
+      
+      
+  if($p->{$name}->{type} == TYPE_HEATMAP) {  
+    if($p->{$name}->{showvalues}) {  
+      for(my $j=0; $j<$p->{$name}->{curves}; $j++) {
+        for(my $i=0; $i< $p->{$name}->{entries}; $i++) {
+          plot_write($p->{$name}->{fh},($p->{$name}->{value}->[$j]->[$i]||0)." ",1);
+          }
+        plot_write($p->{$name}->{fh}," ",0);
+        }
+      plot_write($p->{$name}->{fh},"e");      
+      plot_write($p->{$name}->{fh},"e");     
+      }
+
+    for(my $j=0; $j<$p->{$name}->{curves}; $j++) {
+      for(my $i=0; $i< $p->{$name}->{entries}; $i++) {
+        plot_write($p->{$name}->{fh},($p->{$name}->{value}->[$j]->[$i]||0)." ",1);
+        }
+      plot_write($p->{$name}->{fh}," ",0);
       }
-    plot_write($p->{$name}->{fh},"e");
+    plot_write($p->{$name}->{fh},"e");      
+    plot_write($p->{$name}->{fh},"e");     
+
     }
     
+    
   $p->{$name}->{run}++;
+  
+  
+  if($p->{$name}->{storable}) {
+    lock_store($p->{$name}->{value},$storefile->{$name});
+    }
   }
 
 
 sub PlotAdd {
   my($name,$value,$curve) = @_;
   $curve = 0 unless $curve;
-
-  if($p->{$name}->{type} == TYPE_HISTORY) {
-    push(@{$p->{$name}->{value}->[$curve]},$value||0);
-    shift(@{$p->{$name}->{value}->[$curve]});
-    }
+  push(@{$p->{$name}->{value}->[$curve]},$value||0);
+  shift(@{$p->{$name}->{value}->[$curve]});
 
   }
 
-
-1;
\ No newline at end of file
+sub PlotFill {
+  my($name,$value,$slot,$curve) = @_;
+  $curve = 0 unless $curve;
+  $p->{$name}->{value}->[$curve]->[$slot] = $value||0;
+  }
+  
+sub PlotLimitEntries {
+  my($name,$entries) = @_;
+  $p->{$name}{limitentries} = $entries; 
+  }
+  
+  
+1;