Skip to content

Commit 710fe35

Browse files
committed
Start testing for 3.5 release
1 parent 55d4b9e commit 710fe35

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

docs/HttpServer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ To start the http server, at any time, create an instance of the [THttpServer](h
1414

1515
This will start a civetweb-based http server on the port 8080. Then one should be able to open the address "http://localhost:8080" in any modern browser (IE9, Firefox, Chrome, Opera) and browse objects created in application. By default, the server can access files, canvases, and histograms via the gROOT pointer. All those objects can be displayed with JSROOT graphics.
1616

17-
There is a [snapshot (frozen copy)](https://root.cern.ch/js/3.4/httpserver.C/) of such server, running in [tutorials/http/httpserver.C](https://root.cern.ch/gitweb?p=root.git;a=blob_plain;f=tutorials/http/httpserver.C;hb=HEAD) macro from ROOT tutorial.
17+
There is a [snapshot (frozen copy)](https://root.cern.ch/js/3.5/httpserver.C/) of such server, running in [tutorials/http/httpserver.C](https://root.cern.ch/gitweb?p=root.git;a=blob_plain;f=tutorials/http/httpserver.C;hb=HEAD) macro from ROOT tutorial.
1818

19-
<iframe width="800" height="500" src="https://root.cern.ch/js/3.4/httpserver.C/?layout=simple&item=Canvases/c1">
19+
<iframe width="800" height="500" src="https://root.cern.ch/js/3.5/httpserver.C/?layout=simple&item=Canvases/c1">
2020
</iframe>
2121

2222

docs/JSROOT.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The latest version of JSROOT can also be found online on <http://root.cern.ch/js
1414

1515
## Reading ROOT files in JSROOT
1616

17-
[The main page](https://root.cern.ch/js/3.4/) of the JSROOT project provides the possibility to interactively open ROOT files and draw objects like histogram or canvas.
17+
[The main page](https://root.cern.ch/js/3.5/) of the JSROOT project provides the possibility to interactively open ROOT files and draw objects like histogram or canvas.
1818

1919
The following parameters can be specified in the URL string:
2020

@@ -34,13 +34,13 @@ One could skip quotes when specifying elements names `item=[file1.root/hpx,file2
3434

3535
Examples:
3636

37-
- <https://root.cern.ch/js/3.4/index.htm?file=../files/hsimple.root&item=hpx;1>
38-
- <https://root.cern.ch/js/3.4/index.htm?file=../files/hsimple.root&nobrowser&item=hpxpy;1&opt=colz>
39-
- <https://root.cern.ch/js/3.4/index.htm?file=../files/hsimple.root&noselect&layout=grid2x2&item=hprof;1>
37+
- <https://root.cern.ch/js/3.5/index.htm?file=../files/hsimple.root&item=hpx;1>
38+
- <https://root.cern.ch/js/3.5/index.htm?file=../files/hsimple.root&nobrowser&item=hpxpy;1&opt=colz>
39+
- <https://root.cern.ch/js/3.5/index.htm?file=../files/hsimple.root&noselect&layout=grid2x2&item=hprof;1>
4040

4141
One can very easy integrate JSROOT graphic into other HTML pages using a __iframe__ tag:
4242

43-
<iframe width="600" height="500" src="https://root.cern.ch/js/3.4/index.htm?nobrowser&file=../files/hsimple.root&item=hpxpy;1&opt=colz">
43+
<iframe width="600" height="500" src="https://root.cern.ch/js/3.5/index.htm?nobrowser&file=../files/hsimple.root&item=hpxpy;1&opt=colz">
4444
</iframe>
4545

4646
In principle, one could open any ROOT file placed in the web, providing the full URL to it like:
@@ -67,7 +67,7 @@ In such case one could use the server with its default settings.
6767
A simple case is to copy only the top index.htm file on the server and specify the full path to JSRootCore.js script like:
6868

6969
...
70-
<script type="text/javascript" src="https://root.cern.ch/js/3.4/scripts/JSRootCore.js?gui"></script>
70+
<script type="text/javascript" src="https://root.cern.ch/js/3.5/scripts/JSRootCore.js?gui"></script>
7171
...
7272

7373
In such case one can also specify a custom files list:
@@ -86,13 +86,13 @@ JSROOT is used to implement the user interface in the web browsers.
8686

8787
The layout of the main page coming from THttpServer is similar to the file I/O one.
8888
One could browse existing items and display them. A snapshot of running
89-
server can be seen on the [demo page](https://root.cern.ch/js/3.4/httpserver.C/).
89+
server can be seen on the [demo page](https://root.cern.ch/js/3.5/httpserver.C/).
9090

9191
One could also specify similar URL parameters to configure the displayed items and drawing options.
9292

9393
It is also possible to display one single item from the THttpServer server like:
9494

95-
<https://root.cern.ch/js/3.4/httpserver.C/Files/job1.root/hpxpy/draw.htm?opt=colz>
95+
<https://root.cern.ch/js/3.5/httpserver.C/Files/job1.root/hpxpy/draw.htm?opt=colz>
9696

9797

9898
## Data monitoring with JSROOT
@@ -105,7 +105,7 @@ changes and request only the items currently displayed in the browser.
105105
To enable monitoring, one should activate the appropriate checkbox or
106106
provide __monitoring__ parameter in the URL string like:
107107

108-
<https://root.cern.ch/js/3.4/httpserver.C/Files/job1.root/hprof/draw.htm?monitoring=1000>
108+
<https://root.cern.ch/js/3.5/httpserver.C/Files/job1.root/hprof/draw.htm?monitoring=1000>
109109

110110
The parameter value is the update interval in milliseconds.
111111

@@ -119,16 +119,16 @@ create JSON files for selected objects and write such files in a directory,
119119
which can be accessed via web server. Then one can use JSROOT to read such files and display objects in a web browser.
120120
There is a demonstration page showing such functionality:
121121

122-
<https://root.cern.ch/js/3.4/demo/demo.htm>
122+
<https://root.cern.ch/js/3.5/demo/demo.htm>
123123

124-
<iframe width="500" height="300" src="https://root.cern.ch/js/3.4/demo/demo.htm">
124+
<iframe width="500" height="300" src="https://root.cern.ch/js/3.5/demo/demo.htm">
125125
</iframe>
126126

127127
This demo page reads in cycle 20 json files and displays them.
128128

129129
If one has a web server which already provides such JSON file, one could specify the URL to this file like:
130130

131-
<https://root.cern.ch/js/3.4/demo/demo.htm?addr=../httpserver.C/Canvases/c1/root.json.gz>
131+
<https://root.cern.ch/js/3.5/demo/demo.htm?addr=../httpserver.C/Canvases/c1/root.json.gz>
132132

133133
Here the same problem with [Cross-Origin Request](https://developer.mozilla.org/en/http_access_control) can appear.
134134
If the web server configuration cannot be changed, just copy JSROOT to the web server itself.
@@ -150,7 +150,7 @@ Let say that major classes like TH1 or TGraph or TCanvas will be supported, but
150150

151151
If somebody still wants to use monitoring of data from ROOT files, could try link like:
152152

153-
<https://root.cern.ch/js/3.4/index.htm?nobrowser&file=../files/hsimple.root+&item=hpx;1&monitoring=2000>
153+
<https://root.cern.ch/js/3.5/index.htm?nobrowser&file=../files/hsimple.root+&item=hpx;1&monitoring=2000>
154154

155155
In this particular case, the histogram is not changing.
156156

@@ -159,7 +159,7 @@ In this particular case, the histogram is not changing.
159159

160160
Even without any server-side application, JSROOT provides nice ROOT-like graphics,
161161
which could be used in arbitrary HTML pages.
162-
There is [example page](https://root.cern.ch/js/3.4/demo/example.htm),
162+
There is [example page](https://root.cern.ch/js/3.5/demo/example.htm),
163163
where a 2-D histogram is artificially generated and displayed.
164164
Details about the JSROOT API can be found in the next chapters.
165165

@@ -176,7 +176,7 @@ Before JSROOT can be used, all appropriate scripts should be loaded.
176176
Any HTML pages where JSROOT is used should include the JSRootCore.js script.
177177
The `<head>` section of the HTML page should have the following line:
178178

179-
<script type="text/javascript" src="https://root.cern.ch/js/3.4/scripts/JSRootCore.js?gui"></script>
179+
<script type="text/javascript" src="https://root.cern.ch/js/3.5/scripts/JSRootCore.js?gui"></script>
180180

181181
Here, the default location of JSROOT is specified. One could have a local copy on the file system or on a private web server. When JSROOT is used with THttpServer, the address looks like:
182182

@@ -253,4 +253,4 @@ For example, reading an object from a file and displaying it will look like:
253253

254254
## Links collection
255255

256-
Many different examples of JSROOT usage can be found on [links collection](https://root.cern.ch/js/3.4/demo/jslinks.htm) page
256+
Many different examples of JSROOT usage can be found on [links collection](https://root.cern.ch/js/3.5/demo/jslinks.htm) page

index.htm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
mathjax - use MathJax for Latex output (automatically loaded for TMathText objects)
2727
2828
Example:
29-
https://root.cern.ch/js/3.4/?file=../files/hsimple.root&layout=grid2x2&item=[hpx;1,hpxpy;1]&opts=[,colz]
29+
https://root.cern.ch/js/3.5/?file=../files/hsimple.root&layout=grid2x2&item=[hpx;1,hpxpy;1]&opts=[,colz]
3030
3131
Page can be used to open files from other web servers like:
32-
https://root.cern.ch/js/3.4/?file=https://web-docs.gsi.de/~linev/js/files/hsimple.root
32+
https://root.cern.ch/js/3.5/?file=https://web-docs.gsi.de/~linev/js/files/hsimple.root
3333
3434
But one should be aware about Cross-Origin Request blocking.
3535
Read https://developer.mozilla.org/en/http_access_control for more details.
3636
3737
To avoid problem at all, one can copy only index.htm on the web server where data files are located.
3838
And specify full path to the JSRootCore.js script like
39-
<script type="text/javascript" src="https://root.cern.ch/js/3.4/scripts/JSRootCore.min.js?gui"></script>
39+
<script type="text/javascript" src="https://root.cern.ch/js/3.5/scripts/JSRootCore.min.js?gui"></script>
4040
4141
If necessary, complete JSROOT can be installed on the web server.
4242
All sources can be found in $ROOTSYS/etc/http/ directory.

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 = "dev 28/04/2015";
17+
JSROOT.version = "3.5 28/04/2015";
1818

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

0 commit comments

Comments
 (0)