Introduce appendPath

Very often used call to add svg:path and assign 'd' attribute

Author: linev

modules/base/ObjectPainter.mjs

@@ -337,6 +337,10 @@ class ObjectPainter extends BasePainter {
      * @protected */
    setG(g) { this.draw_g = g; return g; }
 
+   /** @summary Append svg::path to G
+     * @protected */
+   appendPath(d) { return this.draw_g.append('svg:path').attr('d', d); }
+
    /** @summary (re)creates svg:g element for object drawings
      * @desc either one attach svg:g to pad primitives (default)
      * or svg:g element created in specified frame layer ('main_layer' will be used when true specified)

modules/draw/TLinePainter.mjs

@@ -109,8 +109,7 @@ class TLinePainter extends ObjectPainter {
    redraw() {
       this.prepareDraw();
 
-      const elem = this.getG().append('svg:path')
-                       .attr('d', this.createPath())
+      const elem = this.appendPath(this.createPath())
                        .call(this.lineatt.func);
 
       if (this.getObject()?.$do_not_draw)

modules/gui/utils.mjs

@@ -362,7 +362,7 @@ function addMoveHandler(painter, enabled = true, hover_handler = false) {
             return;
          evnt.sourceEvent.preventDefault();
          evnt.sourceEvent.stopPropagation();
-         const pos = d3_pointer(evnt, this.draw_g.node());
+         const pos = d3_pointer(evnt, this.getG().node());
          not_changed = true;
          if (this.moveStart)
             this.moveStart(pos[0], pos[1], evnt.sourceEvent);
@@ -383,7 +383,7 @@ function addMoveHandler(painter, enabled = true, hover_handler = false) {
          let arg = null;
          if (not_changed) {
             // if not changed - provide click position
-            const pos = d3_pointer(evnt, this.draw_g.node());
+            const pos = d3_pointer(evnt, this.getG().node());
             arg = { x: pos[0], y: pos[1], dbl: false };
          }
          this.getPadPainter()?.selectObjectPainter(this, arg);

modules/hist/RPavePainter.mjs

@@ -130,7 +130,7 @@ class RPavePainter extends RObjectPainter {
       this.v7AttrChange(changes, 'height', this.pave_height / rect.height);
       this.v7SendAttrChanges(changes, false); // do not invoke canvas update on the server
 
-      this.draw_g.selectChild('rect')
+      this.getG().selectChild('rect')
                  .attr('width', this.pave_width)
                  .attr('height', this.pave_height);
 
@@ -199,30 +199,23 @@ class RLegendPainter extends RPavePainter {
             }
 
             if (entry.fFill && objp?.fillatt) {
-               this.draw_g
-                  .append('svg:path')
-                  .attr('d', `M${Math.round(margin_x)},${Math.round(posy + stepy*0.1)}h${w4}v${Math.round(stepy*0.8)}h${-w4}z`)
-                  .call(objp.fillatt.func);
+               this.appendPath(`M${Math.round(margin_x)},${Math.round(posy + stepy*0.1)}h${w4}v${Math.round(stepy*0.8)}h${-w4}z`)
+                   .call(objp.fillatt.func);
             }
 
             if (entry.fLine && objp?.lineatt) {
-               this.draw_g
-                  .append('svg:path')
-                  .attr('d', `M${Math.round(margin_x)},${Math.round(posy + stepy/2)}h${w4}`)
-                  .call(objp.lineatt.func);
+               this.appendPath(`M${Math.round(margin_x)},${Math.round(posy + stepy/2)}h${w4}`)
+                   .call(objp.lineatt.func);
             }
 
             if (entry.fError && objp?.lineatt) {
-               this.draw_g
-                  .append('svg:path')
-                  .attr('d', `M${Math.round(margin_x + width/8)},${Math.round(posy + stepy*0.2)}v${Math.round(stepy*0.6)}`)
-                  .call(objp.lineatt.func);
+               this.appendPath(`M${Math.round(margin_x + width/8)},${Math.round(posy + stepy*0.2)}v${Math.round(stepy*0.6)}`)
+                   .call(objp.lineatt.func);
             }
 
             if (entry.fMarker && objp?.markeratt) {
-               this.draw_g.append('svg:path')
-                  .attr('d', objp.markeratt.create(margin_x + width/8, posy + stepy/2))
-                  .call(objp.markeratt.func);
+               this.appendPath(objp.markeratt.create(margin_x + width/8, posy + stepy/2))
+                   .call(objp.markeratt.func);
             }
 
             posy += stepy;

modules/hist/TF1Painter.mjs

@@ -305,9 +305,9 @@ class TF1Painter extends TH1Painter {
       if (this.#use_saved_points)
          return super.processTooltipEvent(pnt);
 
-      let ttrect = this.draw_g?.selectChild('.tooltip_bin');
+      let ttrect = this.getG()?.selectChild('.tooltip_bin');
 
-      if (!this.draw_g || !pnt) {
+      if (!this.getG() || !pnt) {
          ttrect?.remove();
          return null;
       }
@@ -322,11 +322,11 @@ class TF1Painter extends TH1Painter {
          ttrect.remove();
       else {
          if (ttrect.empty()) {
-            ttrect = this.draw_g.append('svg:circle')
-                             .attr('class', 'tooltip_bin')
-                             .style('pointer-events', 'none')
-                             .style('fill', 'none')
-                             .attr('r', (this.lineatt?.width ?? 1) + 4);
+            ttrect = this.getG().append('svg:circle')
+                         .attr('class', 'tooltip_bin')
+                         .style('pointer-events', 'none')
+                         .style('fill', 'none')
+                         .attr('r', (this.lineatt?.width ?? 1) + 4);
          }
 
          ttrect.attr('cx', pnt.x)

modules/hist/hist3d.mjs

@@ -529,7 +529,7 @@ function create3DScene(render3d, x3dscale, y3dscale, orthographic) {
 
       this.mode3d = false;
 
-      if (this.draw_g)
+      if (this.getG())
          this.createFrameG();
 
       return;