|
9604 | 9604 |
|
9605 | 9605 | function display_callback(respainter) { |
9606 | 9606 |
|
9607 | | - JSROOT.progress(); |
| 9607 | + if (!updating) JSROOT.progress(); |
9608 | 9608 |
|
9609 | 9609 | if (respainter && (typeof respainter === 'object') && (typeof respainter.SetItemName === 'function')) { |
9610 | 9610 | respainter.SetItemName(itemname, updating ? null : drawopt); // mark painter as created from hierarchy |
|
9639 | 9639 | drawopt = drawopt.slice(0, pos); |
9640 | 9640 | } |
9641 | 9641 |
|
9642 | | - JSROOT.progress("Loading " + itemname); |
| 9642 | + if (!updating) JSROOT.progress("Loading " + itemname); |
9643 | 9643 |
|
9644 | 9644 | h.get(itemname, function(item, obj) { |
9645 | 9645 |
|
9646 | | - JSROOT.progress(); |
| 9646 | + if (!updating) JSROOT.progress(); |
9647 | 9647 |
|
9648 | 9648 | if (updating && item) delete item._doing_update; |
9649 | 9649 | if (obj==null) return display_callback(); |
9650 | 9650 |
|
9651 | | - JSROOT.progress("Drawing " + itemname); |
| 9651 | + if (!updating) JSROOT.progress("Drawing " + itemname); |
9652 | 9652 |
|
9653 | 9653 | if (divid.length > 0) |
9654 | 9654 | return (updating ? JSROOT.redraw : JSROOT.draw)(divid, obj, drawopt, display_callback); |
|
9766 | 9766 |
|
9767 | 9767 | // first collect items |
9768 | 9768 | this.disp.ForEachPainter(function(p) { |
9769 | | - var itemname = p.GetItemName(); |
9770 | | - var drawopt = p.GetItemDrawOpt(); |
| 9769 | + var itemname = p.GetItemName(), |
| 9770 | + drawopt = p.GetItemDrawOpt(); |
9771 | 9771 | if ((itemname==null) || (allitems.indexOf(itemname)>=0)) return; |
9772 | 9772 |
|
9773 | | - var item = hpainter.Find(itemname); |
9774 | | - if ((item==null) || ('_not_monitor' in item) || ('_player' in item)) return; |
9775 | | - var forced = false; |
| 9773 | + var item = hpainter.Find(itemname), forced = false; |
| 9774 | + if (!item || ('_not_monitor' in item) || ('_player' in item)) return; |
9776 | 9775 |
|
9777 | 9776 | if ('_always_monitor' in item) { |
9778 | 9777 | forced = true; |
|
0 commit comments