Skip to content

Commit 819056c

Browse files
committed
Exclude JSROOT.progress when do objects monitoring
1 parent 0d02dfc commit 819056c

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

scripts/JSRootPainter.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9604,7 +9604,7 @@
96049604

96059605
function display_callback(respainter) {
96069606

9607-
JSROOT.progress();
9607+
if (!updating) JSROOT.progress();
96089608

96099609
if (respainter && (typeof respainter === 'object') && (typeof respainter.SetItemName === 'function')) {
96109610
respainter.SetItemName(itemname, updating ? null : drawopt); // mark painter as created from hierarchy
@@ -9639,16 +9639,16 @@
96399639
drawopt = drawopt.slice(0, pos);
96409640
}
96419641

9642-
JSROOT.progress("Loading " + itemname);
9642+
if (!updating) JSROOT.progress("Loading " + itemname);
96439643

96449644
h.get(itemname, function(item, obj) {
96459645

9646-
JSROOT.progress();
9646+
if (!updating) JSROOT.progress();
96479647

96489648
if (updating && item) delete item._doing_update;
96499649
if (obj==null) return display_callback();
96509650

9651-
JSROOT.progress("Drawing " + itemname);
9651+
if (!updating) JSROOT.progress("Drawing " + itemname);
96529652

96539653
if (divid.length > 0)
96549654
return (updating ? JSROOT.redraw : JSROOT.draw)(divid, obj, drawopt, display_callback);
@@ -9766,13 +9766,12 @@
97669766

97679767
// first collect items
97689768
this.disp.ForEachPainter(function(p) {
9769-
var itemname = p.GetItemName();
9770-
var drawopt = p.GetItemDrawOpt();
9769+
var itemname = p.GetItemName(),
9770+
drawopt = p.GetItemDrawOpt();
97719771
if ((itemname==null) || (allitems.indexOf(itemname)>=0)) return;
97729772

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;
97769775

97779776
if ('_always_monitor' in item) {
97789777
forced = true;

0 commit comments

Comments
 (0)