Build with new graph features

Author: linev

build/jsroot.js

@@ -12,7 +12,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '23/05/2025',
+version_date = '26/05/2025',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -394,29 +394,43 @@ gStyle = {
    fOptLogy: 0,
    /** @summary Default log z scale */
    fOptLogz: 0,
+   /** @summary Show date on canvas */
    fOptDate: 0,
+   /** @summary Show file name on canvas */
    fOptFile: 0,
+   /** @summary X position of date on canvas */
    fDateX: 0.01,
+   /** @summary Y position of date on canvas */
    fDateY: 0.01,
    /** @summary Draw histogram title */
    fOptTitle: 1,
    /** @summary Canvas fill color */
    fCanvasColor: 0,
    /** @summary Pad fill color */
    fPadColor: 0,
+   /** @summary Pad bottom margin */
    fPadBottomMargin: 0.1,
+   /** @summary Pad top margin */
    fPadTopMargin: 0.1,
+   /** @summary Pad left margin */
    fPadLeftMargin: 0.1,
+   /** @summary Pad right margin */
    fPadRightMargin: 0.1,
    /** @summary TPad.fGridx default value */
    fPadGridX: false,
    /** @summary TPad.fGridy default value */
    fPadGridY: false,
+   /** @summary TPad.fTickx default value */
    fPadTickX: 0,
+   /** @summary TPad.fTicky default value */
    fPadTickY: 0,
+   /** @summary Pad border size */
    fPadBorderSize: 2,
+   /** @summary Pad border mode */
    fPadBorderMode: 0,
+   /** @summary Canvas border size */
    fCanvasBorderSize: 2,
+   /** @summary Canvas border mode */
    fCanvasBorderMode: 0,
    /** @summary fill color for stat box */
    fStatColor: 0,
@@ -432,16 +446,27 @@ gStyle = {
    fStatBorderSize: 1,
    /** @summary Printing format for stats */
    fStatFormat: '6.4g',
+   /** @summary Stat box X position - top right corner */
    fStatX: 0.98,
+   /** @summary Stat box Y position - top right corner */
    fStatY: 0.935,
+   /** @summary Stat box width */
    fStatW: 0.2,
+   /** @summary Stat box height */
    fStatH: 0.16,
+   /** @summary Title text align */
    fTitleAlign: 23,
+   /** @summary Title fill color */
    fTitleColor: 0,
+   /** @summary Title text color */
    fTitleTextColor: 1,
+   /** @summary Title border size */
    fTitleBorderSize: 0,
+   /** @summary Title text font */
    fTitleFont: 42,
+   /** @summary Title font size */
    fTitleFontSize: 0.05,
+   /** @summary Title fill style */
    fTitleStyle: 0,
    /** @summary X position of top left corner of title box */
    fTitleX: 0.5,
@@ -453,18 +478,31 @@ gStyle = {
    fTitleH: 0,
    /** @summary Printing format for fit parameters */
    fFitFormat: '5.4g',
+   /** @summary Default optstat value */
    fOptStat: 1111,
+   /** @summary Default optfit value */
    fOptFit: 0,
+   /** @summary Default number of colors in contour */
    fNumberContours: 20,
+   /** @summary Grids color */
    fGridColor: 0,
+   /** @summary Grids line style */
    fGridStyle: 3,
+   /** @summary Grids line width */
    fGridWidth: 1,
+   /** @summary Frame fill color */
    fFrameFillColor: 0,
+   /** @summary Frame fill style */
    fFrameFillStyle: 1001,
+   /** @summary Frame line color */
    fFrameLineColor: 1,
+   /** @summary Frame line width */
    fFrameLineWidth: 1,
+   /** @summary Frame line style */
    fFrameLineStyle: 1,
+   /** @summary Frame border size */
    fFrameBorderSize: 1,
+   /** @summary Frame border mode */
    fFrameBorderMode: 0,
    /** @summary size in pixels of end error for E1 draw options */
    fEndErrorSize: 2,
@@ -474,20 +512,31 @@ gStyle = {
    fHistMinimumZero: false,
    /** @summary Margin between histogram's top and pad's top */
    fHistTopMargin: 0.05,
+   /** @summary Histogram fill color */
    fHistFillColor: 0,
+   /** @summary Histogram fill style */
    fHistFillStyle: 1001,
+   /** @summary Histogram line color */
    fHistLineColor: 602,
+   /** @summary Histogram line style */
    fHistLineStyle: 1,
+   /** @summary Histogram line width */
    fHistLineWidth: 1,
    /** @summary format for bin content */
    fPaintTextFormat: 'g',
    /** @summary default time offset, UTC time at 01/01/95   */
    fTimeOffset: 788918400,
+   /** @summary Legend border size */
    fLegendBorderSize: 1,
+   /** @summary Legend text font */
    fLegendFont: 42,
+   /** @summary Legend font size */
    fLegendTextSize: 0,
+   /** @summary Legend fill color */
    fLegendFillColor: 0,
+   /** @summary Legend fill style */
    fLegendFillStyle: 1001,
+   /** @summary Hatches line width in fill styles  */
    fHatchesLineWidth: 1,
    fHatchesSpacing: 1,
    fCandleWhiskerRange: 1.0,
@@ -503,7 +552,10 @@ gStyle = {
    fYAxisExpYOffset: 0,
    fAxisMaxDigits: 5,
    fStripDecimals: true,
-   fBarWidth: 1
+   /** @summary Width of bar for graphs */
+   fBarWidth: 1,
+   /** @summary Offset of bar for graphs */
+   fBarOffset: 0
 };
 
 /** @summary Method returns current document in use
@@ -12315,6 +12367,12 @@ function isPadPainter(p) {
    return isFunc(p?.getRootPad) && isFunc(p?.forEachPainterInPad);
 }
 
+/** @summary returns canvas painter from DOM element @private */
+function getDomCanvasPainter(dom) {
+   const elem = dom?.select('.root_canvas');
+   return !elem || elem.empty() ? null : elem.property('pad_painter');
+}
+
 /**
  * @summary Painter class for ROOT objects
  *
@@ -12377,18 +12435,11 @@ class ObjectPainter extends BasePainter {
 
    /** @summary returns canvas painter
      * @protected */
-   getCanvPainter(try_select) {
+   getCanvPainter() {
       let pp = this.getPadPainter();
-      if (!pp && try_select) {
-         const elem = this.getCanvSvg();
-         return elem.empty() ? null : elem.property('pad_painter');
-      }
-      while (pp && !pp.isCanvas()) {
-         const top = pp.getPadPainter();
-         if (!top) break;
-         pp = top;
-      }
-      return pp?.isCanvas() ? pp : null;
+      while (pp && !pp.isCanvas())
+         pp = pp.getPadPainter();
+      return pp;
    }
 
    /** @summary Indicates that drawing runs in batch mode
@@ -12530,7 +12581,7 @@ class ObjectPainter extends BasePainter {
       if (isFunc(this.#options.asString)) {
          let changed = false;
          const pp = this.getPadPainter();
-         if (!this.#options_store || pp?._interactively_changed)
+         if (!this.#options_store || pp?.options._interactively_changed)
             changed = true;
          else {
             for (const k in this.#options_store) {
@@ -12942,7 +12993,7 @@ class ObjectPainter extends BasePainter {
          pad_painter = this.#pad_painter_ref.deref();
       else {
          if (!pad_painter)
-            pad_painter = this.getCanvPainter(true); // try to detect in DOM
+            pad_painter = getDomCanvasPainter(this.selectDom()); // try to detect in DOM
          if (pad_painter)
             this.#pad_painter_ref = new WeakRef(pad_painter);
       }
@@ -13982,21 +14033,21 @@ function drawRawText(dom, txt /* , opt */) {
 }
 
 /** @summary Returns canvas painter (if any) for specified DOM element
-  * @param {string|object} dom - id or DOM element
+  * @param {string|object} dom - id or DOM element or pad painter
   * @private */
 function getElementCanvPainter(dom) {
-   return isPadPainter(dom) ? dom.getCanvPainter() : new ObjectPainter(dom).getCanvPainter(true);
+   return isPadPainter(dom) ? dom.getCanvPainter() : getDomCanvasPainter(new ObjectPainter(dom).selectDom());
 }
 
 /** @summary Returns pad painter (if any) for specified DOM element
-  * @param {string|object} dom - id or DOM element
+  * @param {string|object} dom - id or DOM element or pad painter
   * @private */
 function getElementPadPainter(dom) {
    return isPadPainter(dom) ? dom : new ObjectPainter(dom).getPadPainter();
 }
 
 /** @summary Returns main painter (if any) for specified HTML element - typically histogram painter
-  * @param {string|object} dom - id or DOM element
+  * @param {string|object} dom - id or DOM element or pad painter
   * @private */
 function getElementMainPainter(dom) {
    return isPadPainter(dom) ? dom.getMainPainter() : new ObjectPainter(dom).getMainPainter(true);
@@ -82818,7 +82869,7 @@ class TFramePainter extends FrameInteractive {
             pad = pp?.getRootPad(true);
       if (!pad) return;
 
-      pp._interactively_changed = true;
+      pp.options._interactively_changed = true;
 
       const name = `fLog${axis}`;
 
@@ -85581,7 +85632,6 @@ class TPadPainter extends ObjectPainter {
       this.#frame_painter_ref = undefined;
       this.#pad_x = this.#pad_y = this.#pad_width = this.#pad_height = undefined;
       this.#doing_draw = undefined;
-      delete this._interactively_changed;
       this.#snap_primitives = undefined;
       this.#last_grayscale = undefined;
       this.#custom_palette = this.#custom_colors = this.#custom_palette_indexes = this.#custom_palette_colors = undefined;
@@ -88930,7 +88980,7 @@ async function ensureTCanvas(painter, frame_kind) {
             canv.fY2 = ranges.maxy + dy * gStyle.fPadTopMargin;
             return canv;
          },
-         pad_painter = painter.getPadPainter() || painter.getCanvPainter(true),
+         pad_painter = painter.getPadPainter() || getDomCanvasPainter(painter.selectDom()),
          promise = pad_painter ? Promise.resolve(pad_painter) :
                      TCanvasPainter.draw(painter.getDom(), createCanv(), noframe);
 
@@ -90922,7 +90972,7 @@ class THistDrawOptions {
       }
 
       if (d.check('LINE_', 'color'))
-         this.histoLineColor = getColor(d.color);
+         this.histoLineColor = painter.getColor(d.color);
 
       if (d.check('WIDTH_', true))
          this.histoLineWidth = d.partAsInt();
@@ -101971,6 +102021,8 @@ const kNotEditable = BIT(18),   // bit set if graph is non editable
 let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
 
    #bins;          // extracted graph bins
+   #barwidth;      // width of each bar
+   #baroffset;     // offset of each bar
    #redraw_hist;   // indicate that histogram need to be redrawn
    #auto_exec;     // can be reused when sending option back to server
    #funcs_handler; // special instance for functions drawing
@@ -102113,6 +102165,17 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
          d = new DrawOptions(res.original);
       }
 
+      if (d.check('FILL_', 'color')) {
+         res.graphFillColor = d.color;
+         res.graphFillPattern = 1001;
+      }
+
+      if (d.check('LINE_', 'color'))
+         res.graphLineColor = this.getColor(d.color);
+
+      if (d.check('WIDTH_', true))
+         res.graphLineWidth = d.partAsInt();
+
       if (d.check('NOOPT')) res.NoOpt = 1;
 
       if (d.check('POS3D_', true)) res.pos3d = d.partAsInt() - 0.5;
@@ -102514,7 +102577,8 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
 
       if (main_block && lineatt.excl_side) {
          excl_width = lineatt.excl_width;
-         if ((lineatt.width > 0) && !options.Line && !options.Curve) options.Line = 1;
+         if ((lineatt.width > 0) && !options.Line && !options.Curve)
+            options.Line = 1;
       }
 
       if (options.EF) {
@@ -102672,14 +102736,10 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
             }
          }
 
-         if (drawbins.length === 1)
-            drawbins[0].width = w/4; // pathologic case of single bin
-         else {
-            for (let i = 0; i < drawbins.length; ++i)
-               drawbins[i].width = (xmax - xmin) / drawbins.length * gStyle.fBarWidth;
-         }
-
-         const yy0 = Math.round(funcs.gry(0));
+         const sz0 = drawbins.length < 2 ? w / 4 : (xmax - xmin) / drawbins.length,
+               bw = sz0 * gStyle.fBarWidth,
+               boff = sz0 * gStyle.fBarOffset,
+               yy0 = Math.round(funcs.gry(0));
          let usefill = fillatt;
 
          if (main_block) {
@@ -102693,13 +102753,16 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
          nodes.append('svg:path')
               .attr('d', d => {
                  d.bar = true; // element drawn as bar
-                 const dx = d.width > 1 ? Math.round(-d.width/2) : 0,
-                       dw = d.width > 1 ? Math.round(d.width) : 1,
+                 const dx = bw > 1 ? Math.round(boff-bw/2) : 0,
+                       dw = bw > 1 ? Math.round(bw) : 1,
                        dy = (options.Bar !== 1) ? 0 : ((d.gry1 > yy0) ? yy0-d.gry1 : 0),
                        dh = (options.Bar !== 1) ? (h > d.gry1 ? h - d.gry1 : 0) : Math.abs(yy0 - d.gry1);
                  return `M${dx},${dy}h${dw}v${dh}h${-dw}z`;
               })
             .call(usefill.func);
+
+         this.#barwidth = bw;
+         this.#baroffset = boff;
       }
 
       if (options.Rect) {
@@ -102886,8 +102949,8 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
       if (only_check_auto)
          this.deleteAttr();
       else {
-         this.createAttLine({ attr: graph, can_excl: true });
-         this.createAttFill({ attr: graph });
+         this.createAttLine({ attr: graph, can_excl: true, color0: o.graphLineColor, width: o.graphLineWidth });
+         this.createAttFill({ attr: graph, color: o.graphFillColor, pattern: o.graphFillPattern, });
       }
    }
 
@@ -102957,6 +103020,8 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
       const fp = this.get_fp(),
             o = this.getOptions(),
             height = fp.getFrameHeight(),
+            bw = this.#barwidth,
+            boff = this.#baroffset,
             esz = this.error_size,
             isbar1 = (o.Bar === 1),
             funcs = isbar1 ? fp.getGrFuncs(o.second_x, o.second_y) : null,
@@ -102978,7 +103043,7 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
                      y1: Math.min(-esz, d.gry2, -msize),
                      y2: Math.max(esz, d.gry0, msize) };
          } else if (d.bar) {
-             rect = { x1: -d.width/2, x2: d.width/2, y1: 0, y2: height - d.gry1 };
+             rect = { x1: boff - bw / 2, x2: boff + bw / 2, y1: 0, y2: height - d.gry1 };
 
              if (isbar1) {
                 const yy0 = funcs.gry(0);
@@ -167119,6 +167184,8 @@ function readStyleFromURL(url) {
       settings.ToolBarVert = true;
    get_float_style('datex', 'fDateX');
    get_float_style('datey', 'fDateY');
+   get_float_style('barwidth', 'fBarWidth');
+   get_float_style('baroffset', 'fBarOffset');
 
    get_int_style('opttitle', 'fOptTitle', 1);
    if (d.has('utc'))
@@ -181329,6 +181396,7 @@ exports.getActivePad = getActivePad;
 exports.getBoxDecorations = getBoxDecorations;
 exports.getColor = getColor;
 exports.getDocument = getDocument;
+exports.getDomCanvasPainter = getDomCanvasPainter;
 exports.getElementCanvPainter = getElementCanvPainter;
 exports.getElementMainPainter = getElementMainPainter;
 exports.getElementPadPainter = getElementPadPainter;