Skip to content

Commit c20bdf8

Browse files
linevlinev
committed
Sync with ROOT commit
git-svn-id: https://subversion.gsi.de/dabc/trunk/plugins/root/js@3152 bcbf6573-9a26-0410-9ebc-ce4ab7aade96
1 parent 0eec146 commit c20bdf8

File tree

3 files changed

+57
-18
lines changed

3 files changed

+57
-18
lines changed

‎demo/chep2015.htm‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,56 @@
11
<head>
2-
<title>CHEP 2015</title>
2+
<title>Materials for CHEP 2015</title>
33
</head>
44
<body>
5-
<h1>List of links for <a href="http://chep2015.kek.jp/">CHEP 2015</a></h1>
5+
<h1>Materials for <a href="http://chep2015.kek.jp/">CHEP 2015</a> posters</h1>
66

7-
<h2>THttpServer poster</h2>
7+
<h2>THttpServer <a href="chep/httpserver.pdf">poster</a></h2>
8+
<img src="chep/httpserver.png" height="300" width="220"/><br/>
9+
<br/>
810
<a href="https://indico.cern.ch/event/304944/contribution/286">Abstract on indico</a><br/>
911
<br/>
1012
<br/>
13+
<hr/>
1114

1215
<a href="https://root.cern.ch/js/3.4/httpserver.C/?layout=grid2x2&items=[Files/job1.root/hpx,Files/job1.root/hpxpy,Files/job1.root/hprof,StreamerInfo]&opts=[hist,hist,e1,any]">User interface</a><br/>
13-
<a href="bitly">bitly</a><br/>
16+
<img src="chep/http_ui.png" width="50%" height="50%"/><br/>
17+
<a href="http://bit.ly/1CsPhCm">http://bit.ly/1CsPhCm</a><br/>
18+
<img src="chep/http_ui_qr.jpg" width="150" height="150"/><br/>
1419
<br/>
20+
<hr/>
1521

1622
<a href="https://root.cern.ch/js/3.4/demo/hpx.json">JSON representation for the TH1</a><br/>
1723
<a href="http://bit.ly/1xinYu7">http://bit.ly/1xinYu7</a><br/>
1824
<img src="chep/hpx_json_qr.jpg" width="150" height="150"/><br/>
1925
<br/>
26+
<hr/>
27+
28+
<a href="https://root.cern.ch/js/3.4/httpserver.C/Files/job1.root/hpx/draw.htm?monitoring=1000">Draw page for individual object</a><br/>
29+
<a href="http://bit.ly/1yiepGM">http://bit.ly/1yiepGM</a><br/>
30+
<img src="chep/draw_qr.jpg" width="150" height="150"/><br/>
31+
<br/>
32+
<hr/>
2033

2134
<a href="https://root.cern.ch/js/3.4/demo/demo.htm">Demo for online monitoring with json files</a><br/>
2235
<a href="http://bit.ly/1EHnFXl">http://bit.ly/1EHnFXl</a><br/>
2336
<img src="chep/demo_qr.jpg" width="150" height="150"/><br/>
2437
<br/>
38+
<hr/>
2539

2640

2741
<a href="https://root.cern.ch/js/3.4/httpserver.C/?item=Files/job1.root/ntuple">TTree::Draw example</a><br/>
28-
<a href="bitly">bitly</a><br/>
42+
<img src="chep/tree_draw.png" width="50%" height="50%"/><br/>
43+
<a href="http://bit.ly/1xk7X6Z">http://bit.ly/1xk7X6Z</a><br/>
44+
<img src="chep/tree_draw_qr.jpg" width="150" height="150"/><br/>
2945
<br/>
46+
<hr/>
3047

3148
<a href="https://root.cern.ch/js/3.4/httpcontrol.C/?monitoring=0">Command interface example</a><br/>
32-
<a href="bitly">bitly</a><br/>
49+
<img src="chep/httpcontrol.png" width="50%" height="50%"/><br/>
50+
<a href="http://bit.ly/1BPNouv">http://bit.ly/1BPNouv</a><br/>
51+
<img src="chep/httpcontrol_qr.jpg" width="150" height="150"/><br/>
3352
<br/>
53+
<hr/>
3454

3555

3656
<a href="https://root.cern.ch/js/3.4/Go4ExampleSimple/?layout=grid2x2&items=[Conditions/cHis2,Status/DebugOutput,Conditions/cHis1,Status/EventsRate]&opts=[editor]">Go4 analysis example</a><br/>
@@ -45,93 +65,112 @@ <h2>THttpServer poster</h2>
4565
<a href="https://root.cern.ch/js/3.4/Go4ExampleSimple/?item=Status/DebugOutput">debug output</a>,
4666
<a href="https://root.cern.ch/js/3.4/Go4ExampleSimple/?item=Status/Analysis">configuration</a><br/>
4767
<br/>
68+
<hr/>
4869

4970
<a href="http://go4.gsi.de">Go4 GUI</a> as interface for THttpServer<br/>
5071
<img src="chep/go4gui.png" width="50%" height="50%"/><br/>
5172
<br/>
73+
<hr/>
5274

5375

5476
<h2>JavaScript ROOT poster</h2>
5577

78+
<h2>JSROOT <a href="chep/JSROOT.pdf">poster</a></h2>
79+
<img src="chep/JSROOT.png" height="300" width="220"/><br/>
80+
<br/>
5681
<a href="https://indico.cern.ch/event/304944/contribution/288">Abstract on indico</a><br/>
5782
<br/>
5883
<br/>
84+
<hr/>
5985

6086
<a href="https://root.cern.ch/js/3.4/index.htm?file=../files/hsimple.root&layout=grid2x2&items=[hpx,hpxpy,hprof,StreamerInfo]&opts=[hist,colz,e1,any]">User interface</a><br/>
6187
<img src="chep/jsroot_ui.png" width="50%" height="50%"/><br/>
6288
<a href="http://bit.ly/1DOliql">http://bit.ly/1DOliql</a><br/>
6389
<img src="chep/jsroot_ui_qr.jpg" width="150" height="150"/><br/>
6490
<br/>
91+
<hr/>
6592

6693
<a href="https://root.cern.ch/js/3.4/demo/example_file.htm">Example with binary root file</a><br/>
6794
<a href="http://bit.ly/1CRt4yk">http://bit.ly/1CRt4yk</a><br/>
6895
<img src="chep/example_file_qr.jpg" width="150" height="150"/><br/>
6996
<br/>
97+
<hr/>
7098

7199
<a href="https://root.cern.ch/js/3.4/demo/example_json.htm">Example with JSON file</a><br/>
72100
<a href="http://bit.ly/1EXJl44">http://bit.ly/1EXJl44</a><br/>
73101
<img src="chep/example_json_qr.jpg" width="150" height="150"/><br/>
74102
<br/>
103+
<hr/>
75104

76105
<a href="https://root.cern.ch/js/3.4/index.htm?nobrowser&file=../files/hsimple.root&item=hpx;1&opt=e">TH1 class</a><br/>
77106
<img src="chep/th1e.png" width="50%" height="50%"/><br/>
78107
<a href="http://bit.ly/1BnyJqv">http://bit.ly/1BnyJqv</a><br/>
79108
<img src="chep/th1e_qr.jpg" width="150" height="150"/><br/>
80109
<br/>
110+
<hr/>
81111

82112
<a href="https://root.cern.ch/js/3.4/index.htm?nobrowser&file=../files/hsimple.root&item=hpxpy;1&opt=lego">TH2 class</a><br/>
83113
<img src="chep/th2lego.png" width="50%" height="50%"/><br/>
84114
<a href="http://bit.ly/1xV9NGo">http://bit.ly/1xV9NGo</a><br/>
85115
<img src="chep/th2lego_qr.jpg" width="150" height="150"/><br/>
86116
<br/>
117+
<hr/>
87118

88119
<a href="https://root.cern.ch/js/3.4/index.htm?nobrowser&file=../files/glbox.root&item=h31;1&opt=">TH3 class</a><br/>
89120
<img src="chep/th3.png" width="50%" height="50%"/><br/>
90121
<a href="http://bit.ly/19ffqsA">http://bit.ly/19ffqsA</a><br/>
91122
<img src="chep/th3_qr.jpg" width="150" height="150"/><br/>
92123
<br/>
124+
<hr/>
93125

94126
<a href="https://root.cern.ch/js/3.4/index.htm?nobrowser&file=../files/legends.root&item=legends;1&mathjax=1">TLegend class</a><br/>
95127
<img src="chep/legend.png" width="50%" height="50%"/><br/>
96128
<a href="http://bit.ly/19fff0h">http://bit.ly/19fff0h</a><br/>
97129
<img src="chep/legend_qr.jpg" width="150" height="150"/><br/>
98130
<br/>
131+
<hr/>
99132

100133
<a href="https://root.cern.ch/js/3.4/index.htm?nobrowser&file=../files/exclusion.root&item=exclusion;1&opt=">TGraph exclusion</a><br/>
101134
<img src="chep/exclusion.png" width="50%" height="50%"/><br/>
102135
<a href="http://bit.ly/1xrThD2">http://bit.ly/1xrThD2</a><br/>
103136
<img src="chep/exclusion_qr.jpg" width="150" height="150"/><br/>
104137
<br/>
138+
<hr/>
105139

106140
<a href="https://root.cern.ch/js/3.4/index.htm?nobrowser&file=https://web-docs.gsi.de/~linev/js/files/latex.root&item=ex3;1&mathjax=1">TPaveText with MathJax</a><br/>
107141
<img src="chep/pavetext.png" width="50%" height="50%"/><br/>
108142
<a href="http://bit.ly/19ff1Xc">http://bit.ly/19ff1Xc</a><br/>
109143
<img src="chep/pavetext_qr.jpg" width="150" height="150"/><br/>
110144
<br/>
145+
<hr/>
111146

112147
<a href="https://root.cern.ch/js/3.4/index.htm?file=../files/fillrandom.root&item=h1f;1+sqroot;1&nobrowser">Superimpose TH1 and TF1</a><br/>
113148
<img src="chep/th1_tf1.png" width="50%" height="50%"/><br/>
114149
<a href="http://bit.ly/19feLHB">http://bit.ly/19feLHB</a><br/>
115150
<img src="chep/th1_tf1_qr.jpg" width="150" height="150"/><br/>
116151
<br/>
152+
<hr/>
117153

118154
<a href="https://root.cern.ch/js/3.4/index.htm?nobrowser&file=../files/rf107.root&item=rf107_plotstyles;1&opt=">RooFit canvas</a><br/>
119155
<img src="chep/roofit.png" width="50%" height="50%"/><br/>
120156
<a href="http://bit.ly/1C4wcoG">http://bit.ly/1C4wcoG</a><br/>
121157
<img src="chep/roofit_qr.jpg" width="150" height="150"/><br/>
122158
<br/>
159+
<hr/>
123160

124161
<a href="https://root.cern.ch/js/3.4/index.htm?layout=grid1x3&path=../files/&files=[temp44.root,temp35.root,temp28.root]&items=[temp44.root/Histograms/TDC_C100/Ch3/TDC_C100_Ch3_RisingRef;1,temp35.root/_same_,temp28.root/_same_]&opts=[autozoom,autozoom,autozoom]">Draw same histogram from three files</a><br/>
125162
<img src="chep/three.png" width="50%" height="50%"/><br/>
126163
<a href="http://bit.ly/1FRfYSr">http://bit.ly/1FRfYSr</a><br/>
127164
<img src="chep/three_qr.jpg" width="150" height="150"/><br/>
128165
<br/>
166+
<hr/>
129167

130168
<a href="https://root.cern.ch/js/3.4/index.htm?nobrowser&path=../files/&files=[temp44.root,temp35.root,temp28.root]&item=temp44.root/Histograms/TDC_C100/Ch1/TDC_C100_Ch1_RisingCalibr;1+temp35.root/_same_+temp28.root/_same_&opt=autocol,nostat">Superimpose same histogram from three files</a><br/>
131169
<img src="chep/superimpose.png" width="50%" height="50%"/><br/>
132170
<a href="http://bit.ly/1B8VijD">http://bit.ly/1B8VijD</a><br/>
133171
<img src="chep/superimpose_qr.jpg" width="150" height="150"/><br/>
134172
<br/>
173+
<hr/>
135174

136175

137176
</body>

‎scripts/JSRootCore.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
JSROOT = {};
1616

17-
JSROOT.version = "3.4 dev 26/03/2015";
17+
JSROOT.version = "3.4 dev 30/03/2015";
1818

1919
JSROOT.source_dir = "";
2020
JSROOT.source_min = false;

‎scripts/JSRootPainter.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
pos = sof.indexOf(" "); dt.setDate(sof.substr(0,pos)); sof = sof.substr(pos+1);
534534
pos = sof.indexOf(":"); dt.setHours(sof.substr(0,pos)); sof = sof.substr(pos+1);
535535
pos = sof.indexOf(":"); dt.setMinutes(sof.substr(0,pos)); sof = sof.substr(pos+1);
536-
pos = sof.indexOf("s"); dt.setSeconds(sof.substr(0,pos));
536+
pos = sof.indexOf("s"); dt.setSeconds(sof.substr(0,pos));
537537
if (pos>0) { sof = sof.substr(pos+1); dt.setMilliseconds(sof); }
538538
return dt.getTime();
539539
}
@@ -1380,12 +1380,12 @@
13801380

13811381
var x = Number(drag_rect.attr("x")), y = Number(drag_rect.attr("y"));
13821382
var dx = d3.event.dx, dy = d3.event.dy;
1383-
1383+
13841384
if ((acc_x<0) && (dx>0)) { acc_x+=dx; dx=0; if (acc_x>0) { dx=acc_x; acc_x=0; }}
13851385
if ((acc_x>0) && (dx<0)) { acc_x+=dx; dx=0; if (acc_x<0) { dx=acc_x; acc_x=0; }}
13861386
if ((acc_y<0) && (dy>0)) { acc_y+=dy; dy=0; if (acc_y>0) { dy=acc_y; acc_y=0; }}
13871387
if ((acc_y>0) && (dy<0)) { acc_y+=dy; dy=0; if (acc_y<0) { dy=acc_y; acc_y=0; }}
1388-
1388+
13891389
if (x+dx<0) { acc_x+=(x+dx); x=0; } else
13901390
if (x+dx>pad_w) { acc_x+=(x+dx-pad_w); x=pad_w; } else x+=dx;
13911391

@@ -1451,9 +1451,9 @@
14511451
if ((acc_x>0) && (dx<0)) { acc_x+=dx; dx=0; if (acc_x<0) { dx=acc_x; acc_x=0; }}
14521452
if ((acc_y<0) && (dy>0)) { acc_y+=dy; dy=0; if (acc_y>0) { dy=acc_y; acc_y=0; }}
14531453
if ((acc_y>0) && (dy<0)) { acc_y+=dy; dy=0; if (acc_y<0) { dy=acc_y; acc_y=0; }}
1454-
if (w+dx>pad_w) { acc_x += (w+dx-pad_w); w=pad_w;} else
1454+
if (w+dx>pad_w) { acc_x += (w+dx-pad_w); w=pad_w;} else
14551455
if (w+dx<0) { acc_x += (w+dx); w=0;} else w+=dx;
1456-
if (h+dy>pad_h) { acc_y += (h+dy-pad_h); h=pad_h; } else
1456+
if (h+dy>pad_h) { acc_y += (h+dy-pad_h); h=pad_h; } else
14571457
if (h+dy<0) { acc_y += (h+dy); h=0; } else h+=dy;
14581458
drag_rect.attr("width", w).attr("height", h);
14591459

@@ -1696,7 +1696,7 @@
16961696

16971697
var box = txt.node().getBBox(); // .getBoundingClientRect();
16981698
var real_w = parseInt(box.width), real_h = parseInt(box.height);
1699-
1699+
17001700
if (scale) txt.classed('hidden_text',true).attr('opacity','0'); // hide rescale elements
17011701

17021702
if (real_w > draw_g.property('max_text_width')) draw_g.property('max_text_width', real_w);
@@ -2492,7 +2492,7 @@
24922492

24932493
return res;
24942494
}
2495-
2495+
24962496
var line = d3.svg.line()
24972497
.x(function(d) { return pmain.grx(d.x).toFixed(1); })
24982498
.y(function(d) { return pmain.gry(d.y).toFixed(1); });
@@ -4053,7 +4053,7 @@
40534053
// only for 1D histogram use min.max for range selection
40544054
this['scale_ymin'] = this.histo.fMinimum;
40554055
this['scale_ymax'] = this.histo.fMaximum;
4056-
}
4056+
}
40574057

40584058
if (this.zoom_ymin != this.zoom_ymax) {
40594059
this['scale_ymin'] = this.zoom_ymin;
@@ -7798,8 +7798,8 @@
77987798
function AdoptHierarchy(result) {
77997799
painter.h = result;
78007800
if (painter.h == null) return;
7801-
7802-
if (('_title' in painter.h) && (painter.h._title!='')) document.title = painter.h._title;
7801+
7802+
if (('_title' in painter.h) && (painter.h._title!='')) document.title = painter.h._title;
78037803

78047804
result._isopen = true;
78057805

@@ -8007,7 +8007,7 @@
80078007
h.CreateDisplay(callback);
80088008
});
80098009
}
8010-
8010+
80118011
JSROOT.HierarchyPainter.prototype.updateOnOtherFrames = function(painter, obj) {
80128012
// function should update object drawings for other painters
80138013
var mdi = this['disp'];

0 commit comments

Comments
 (0)