merge: Fix - support time display in TMultiGraph

Author: linev

changes.md

@@ -3,6 +3,7 @@
 ## Changes in 5.4.x
 1. Fix - take into account extra quotes in multipart http reply (#157)
 2. Fix - display of labels on X axis with TProfile
+3. Fix - support time display in TMultiGraph
 
 
 ## Changes in 5.4.1

scripts/JSRootPainter.more.js

@@ -3073,9 +3073,10 @@
    TMultiGraphPainter.prototype.ScanGraphsRange = function(graphs, histo, pad) {
       var mgraph = this.GetObject(),
           maximum, minimum, dx, dy, uxmin = 0, uxmax = 0, logx = false, logy = false,
+          time_display = false, time_format = "",
           rw = {  xmin: 0, xmax: 0, ymin: 0, ymax: 0, first: true };
 
-      if (pad!=null) {
+      if (pad) {
          logx = pad.fLogx;
          logy = pad.fLogy;
          rw.xmin = pad.fUxmin;
@@ -3084,10 +3085,10 @@
          rw.ymax = pad.fUymax;
          rw.first = false;
       }
-      if (histo!=null) {
+      if (histo) {
          minimum = histo.fYaxis.fXmin;
          maximum = histo.fYaxis.fXmax;
-         if (pad!=null) {
+         if (pad) {
             uxmin = this.padtoX(pad, rw.xmin);
             uxmax = this.padtoX(pad, rw.xmax);
          }
@@ -3097,6 +3098,11 @@
          for (var i = 0; i < graphs.arr.length; ++i)
             this.ComputeGraphRange(rw, graphs.arr[i]);
 
+         if (graphs.arr[0] && graphs.arr[0].fHistogram && graphs.arr[0].fHistogram.fXaxis.fTimeDisplay) {
+            time_display = true;
+            time_format = graphs.arr[0].fHistogram.fXaxis.fTimeFormat;
+         }
+
          if (rw.xmin == rw.xmax) rw.xmax += 1.;
          if (rw.ymin == rw.ymax) rw.ymax += 1.;
          dx = 0.05 * (rw.xmax - rw.xmin);
@@ -3140,7 +3146,9 @@
          histo.fTitle = mgraph.fTitle;
          histo.fXaxis.fXmin = uxmin;
          histo.fXaxis.fXmax = uxmax;
-      }
+         histo.fXaxis.fTimeDisplay = time_display;
+         if (time_display) histo.fXaxis.fTimeFormat = time_format;
+     }
 
       histo.fYaxis.fXmin = minimum;
       histo.fYaxis.fXmax = maximum;