Skip to content

Commit c9124bf

Browse files
linevlinev
committed
Merge branch 'dev'
Resolve many conflicts Prepare for 4.6.0 release
2 parents ea6d31b + e233c86 commit c9124bf

22 files changed

+32065
-21285
lines changed

‎changes.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
# JSROOT changelog
22

3+
## Changes in 4.6.0
4+
1. Improvements in TGeo drawings
5+
- support of large (~10M volumes) models, only most significant volumes are shown
6+
- one could activate several clip planes (only with WebGL)
7+
- interaction with object browser to change visibility flags or focus on selected volume
8+
- support of floating browser for TGeo objects
9+
- intensive use of HTML Worker to offload computation tasks and keep interactivity
10+
- enable more details when changing camera position/zoom
11+
- better and faster build of composite shapes
12+
2. Improvements in histograms 3D drawing
13+
- all lego options: lego1..lego4, combined with 'fb', 'bb', '0' or 'z'
14+
- support axis lebels on lego plots
15+
- support lego plots for TH1
16+
3. Improvements in all 3D graphics
17+
- upgrafe three.js to r79
18+
- use of THREE.BufferGeometry for all components
19+
- significant (up to factor 10) performance improvement
20+
4. Implement box and hbox draw options for TH1 class
21+
5. Implement drawing of axes ticks on opposite side (when fTickx/y specified)
22+
6. Preliminary support of candle plot (many options to be implemented)
23+
7. Update draw attributes (fill/line/position) when monitor objects
24+
25+
326
## Changes in 4.5.3
427
1. Fix - position of TFrame in canvas/pad
528
2. Fix - use histogram fMinimum/fMaximum when creating color palette

‎files/draw.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
21
<!-- this file used by THttpServer to display single element -->
2+
<!DOCTYPE html>
33
<html lang="en">
44
<head>
55
<meta charset="UTF-8" http-equiv="X-UA-Compatible" content="IE=Edge">

‎files/online.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<title>Online server</title>

‎img/RootIcon.ico‎

30.2 KB
Binary file not shown.

‎index.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" http-equiv="X-UA-Compatible" content="IE=Edge">
55
<title>Read a ROOT file</title>
66
<link rel="shortcut icon" href="img/RootIcon.ico">
7-
<!-- To make use of RequireJS, un-comment the following line and comment the second line below -->
8-
<!--script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.19/require.min.js" data-main="scripts/JSRootCore.js"></script-->
7+
<!-- To make use of RequireJS, replace following line with commented one -->
98
<script type="text/javascript" src="scripts/JSRootCore.js?gui"></script>
9+
<!--script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.2.0/require.min.js" data-main="scripts/JSRootCore.js"></script-->
1010
</head>
1111
<body>
1212
<div id="simpleGUI" path="../files/" files="ct.root;exclusion.root;fillrandom.root;glbox.root;graph.root;hsimple.root;legends.root;rf107.root;stacks.root;zdemo.root">

0 commit comments

Comments
 (0)