Skip to content

webgui: implement sync and async methods with optional callbacks #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bellenot merged 14 commits into from
Jul 27, 2017
Merged

webgui: implement sync and async methods with optional callbacks #818

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a1225ab
webgui: introduce modified counter in ROOT7 TCanvas
linev Jul 26, 2017
7f2c904
webgui: introduce sync and async mode for TCanvas::Update()
linev Jul 26, 2017
ccfbdd1
webgui: let specify place where canvas should be shown
linev Jul 26, 2017
2e4a712
webgui: let specify $url as parameter in can->Show() method
linev Jul 26, 2017
b06b3b6
webgui: modify canvas when new item add to the canvas
linev Jul 27, 2017
6471187
webgui: let submit several commands in the queue
linev Jul 27, 2017
7a6c766
webgui: implement sync and async mode for Canvas::SaveAs() method
linev Jul 27, 2017
c820d27
webgui: provide callback argument for Canvas::SaveAs method
linev Jul 27, 2017
9dbcdbb
webgui: let specify callback in Canvas::Update() call
linev Jul 27, 2017
3a63467
webgui: improve CEF messaging close
linev Jul 27, 2017
be77577
webgui: try to cancel all updates and commands when connection closing
linev Jul 27, 2017
ae128e4
webgui: clang-format
linev Jul 27, 2017
4024dfc
webgui: unblock polling loop around command execution
linev Jul 27, 2017
b45412c
jsroot: support new command protocol with web canvas
linev Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
jsroot: support new command protocol with web canvas 
Improve closing of CEF messaging queue
  • Loading branch information
@linev
linev committed Jul 27, 2017
commit b45412c0c9527f86707318f0caddc4517f134b7f
3 changes: 3 additions & 0 deletions etc/http/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
4. Refactor JSROOT scripts structure - extract histograms and hierarchy painters into separate scripts
5. Use latest three.js r86 with improved Projector and CanvasRenderer
Still use own SVGRenderer which supported direct text dump
6. Provide text info when geometry drawing takes too long
7. Preliminary support of TEfficiency
8. Automatic title positioning of vertical axis when fTitleOffset==0


## Changes in 5.2.0
Expand Down
2 changes: 1 addition & 1 deletion etc/http/scripts/JSRootCore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
}
} (function(JSROOT) {

JSROOT.version = "dev 26/07/2017";
JSROOT.version = "dev 27/07/2017";

JSROOT.source_dir = "";
JSROOT.source_min = false;
Expand Down
2 changes: 2 additions & 0 deletions etc/http/scripts/JSRootPainter.hierarchy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,6 +2173,8 @@
if (painter.batch_mode) JSROOT.BatchMode = true;
else JSROOT.RegisterForResize(painter);

if (window) window.onbeforeunload = painter.WindowBeforeUnloadHanlder.bind(painter);

return;
}

Expand Down
21 changes: 16 additions & 5 deletions etc/http/scripts/JSRootPainter.hist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@

shift_y = Math.round(center ? h/2 : (reverse ? h : 0));

this.DrawText((center ? "middle" : (myxor ? "begin" : "end" ))+ ";middle",
this.DrawText((center ? "middle" : (myxor ? "begin" : "end" )) + ";middle",
0, 0, 0, (rotate<0 ? -90 : -270),
axis.fTitle, title_color, 1, title_g);
} else {
Expand All @@ -1328,11 +1328,22 @@
axis.fTitle, title_color, 1, title_g);
}

this.FinishTextDrawing(title_g);
var axis_rect = null;
if (vertical && (axis.fTitleOffset == 0) && ('getBoundingClientRect' in axis_g.node()))
axis_rect = axis_g.node().getBoundingClientRect();

this.FinishTextDrawing(title_g, function() {
if (axis_rect) {
var title_rect = title_g.node().getBoundingClientRect();
shift_x = (side>0) ? Math.round(axis_rect.left - title_rect.right - title_fontsize*0.3) :
Math.round(axis_rect.right - title_rect.left + title_fontsize*0.3);
}

title_g.attr('transform', 'translate(' + shift_x + ',' + shift_y + ')')
.property('shift_x', shift_x)
.property('shift_y', shift_y);
});

title_g.attr('transform', 'translate(' + shift_x + ',' + shift_y + ')')
.property('shift_x',shift_x)
.property('shift_y',shift_y);

this.AddTitleDrag(title_g, vertical, title_offest_k, reverse, vertical ? h : w);
}
Expand Down
Loading