Merge branch 'dev'

Author: linev

changes.md

@@ -1,46 +1,32 @@
 # JSROOT changelog
 
-## Changes in 5.3.5
-1. Fix - correctly show histogram with negative bins and fill attributes (#143)
-2. Fix - correct animation for status line (when visible)
-3. Fix - correctly set lin/log settings back top TPad object
-4. Fix - correctly use preloaded d3.js in notebooks/require.js environment
-5. Cached Latex regex to improve drawing speed (#145)
-
-
-## Changes in 5.3.4
-1. Fix - several problem in TLatex preprocessing for MathJax.js
-2. Fix - use "E" draw options for THStack only when no any other specified
-
-
-## Changes in 5.3.3
-1. Use latest jsdom and mathjax-node packages (Node.js only) 
-
-
-## Changes in 5.3.2
-1. Fix - use FontSize when draw TLegend entries
-2. Fix - correctly show TH2 overflow stats
-3. Fix - tooltips handling for TH1 hbar drawings
-4. Implement JSROOT.toJSON() function to produce ROOT JSON string
-
-
-## Changes in 5.3.1
-1. Fix - show TH2 projections also when tooltip is disabled
-2. Fix - use z_handle to format Z-axis labels
-3. Fix - support labels on TH3 Z axis
-4. Fix - TH1 zooming in 3D mode
-5. Fix - suppress empty {} in TLatex
-6. Add several math symbols for TLatex
-7. Fix - font kind 1 is italic times roman
-8. Fix - do not let expand parent item in hierarchy
-9. Fix - use correct painter to check range
-10. Fix - change proper axis attributes in context menu
-11. Fix - correctly show axis labels on 3D plot
-12. Fix - correctly handle circle (#24) as marker kind
-13. Fix - correct circle drawing with coordinates rounding
-14. Fix - TLatex #frac and #splitline, adjust vertical position
-15. Fix - workaround for y range when fMinimum==fMaximum!=-1111
-16. Fix - correct tooltips for graph with marker drawing
+## Changes in dev
+1. Tooltips and zooming in TGraphPolar drawings
+2. Support border draws for TWbox
+3. Support TPavesText with multiple underlying paves 
+4. Correctly draw filled TArrow endings
+5. Implement drawing of TDiamond, TArc, TCurlyLine, TCurlyArc, TCrown
+6. Implement most existing fill styles
+7. Support line option for TGraph2D
+8. Let enable/disable highlight of extra objects in geometry viewer 
+9. Draw all objects from TList/TObjArray as they appear in list of primitives
+10. Draw axis labels on both sides when pad.fTick[x/y] > 1
+11. Disable automatic frame adjustment, can be enabled with "&adjframe" parameter in URL 
+12. Fix - use same number of points to draw lines and markers on the TGraph
+13. Let disable TGraph drawing optimization with "noopt" draw option
+14. When drawing TH2/TH3 scatter plots, always generate same "random" pattern
+15. When use "CPN" draw option for TCanvas, create color palette from N last colors 
+16. Fix - let combine "L" or "C" graph draw option with others
+17. Implement "RX", "RY" options for TGraph
+18. Make drawing of TCanvas with many primitives smoother 
+19. Correct positioning of custom axis labels
+20. Correctly show histogram with negative bins and fill attributes (#143)
+21. Fix - correctly toggle lin/log axes in lego plot
+22. Fix - let correctly change marker attributes interactively 
+23. Fix - correctly use preloaded d3.js in notebooks/require.js environment  
+24. Use barwidth/baroffset parameters in lego plots
+25. Add fOptTitle, fOptLogx/y/z fields in JSROOT.gStyle
+26. Support LZ4 compression - future default compression algorithm starting from ROOT 6.14 
 
 
 ## Changes in 5.3.0
@@ -124,7 +110,7 @@
 3. Implement projection of geometry on given plane.
    One could reuse drawing of geometry in other div (should be drawn with main option).
    In control GUI one could change position of the projection plane
-4. On of the TGeo drawing can be assigned as main. When same object drawn next time,
+4. One of the TGeo drawing can be assigned as main. When same object drawn next time,
    its drawing will be derived from the main. Useful for geometry projections.
    Also all tracks and hits will be imported from main drawing.
 5. Let change background color of geo drawing.

demo/examples.js

@@ -2,8 +2,9 @@ examples_main = {
    TH1 : [
      { opt: "", file: "hsimple.root", item: "hpx;1" },
      { opt: "P" },
-     { opt: "PO" },
-     { name: "star", opt:"*H", title: "draw stars on histogram bins" },
+     { opt: "P0" },
+     { name: "star", opt:"*", title: "draw stars on histogram bins" },
+     { name: "*H", opt:"*H", title: "draw stars and histogram itself" },
      { opt: "L", title: "draw histogram as line" },
      { name: "LF2", opt:"LF2,fill_blue", title: "draw histogram as line with filled area" },
      { name: "B", opt:"B,fill_red", title: "draw histogram as bar chart" },
@@ -136,13 +137,16 @@ examples_main = {
    TGraph : [
      { opt: "", file: "graph.root", item: "Graph;1" },
      { opt: "L" },
-     { opt: "AX+Y+L" },
      { opt: "P" },
      { name: "star", opt:"*" },
      { opt: "LP" },
      { opt: "B" },
      { opt: "B1" },
-     { name: "docu", file: "graph.root", layout: "vert333", items: ['c1','c47','c4','c48','c41','c42','c43','c44','c45'], title:"several canvas from TGraph documentation page" },
+     { opt: "AX+Y+L", title: "move X/Y labels on other side" },
+     { opt: "IA", title: "hide (Invisible) axes drawing " },
+     { name: "RX", opt: "ARXL", title: "reverse X axis" },
+     { name: "RY", opt: "ARYL", title: "reverse Y axis" },
+     { name: "docu", file: "graph.root", layout: "vert333", items: ['c1','c47','c4','c48','c41','c42','c43','c44','c45'], title: "several canvas from TGraph documentation page" },
      { name: "excl", file: "tutorials_graphs.root", item: "exclusiongraph2", title: "Exclusion draw exampl, output of tutorials/graphs/exclusiongraph2.C" },
      { name: "plc", file: "tutorials_graphs.root", item: "graphpalettecolor", title: "Automatic set of graph colors, output of tutorials/graphs/graphpalettecolor.C" },
      { name: "shade", file: "tutorials_graphs.root", item: "graphShade", title: "output of tutorials/graphs/graphShade.C" }
@@ -188,7 +192,8 @@ examples_main = {
    TGraph2D : [
       { opt: "", file: "graph2d.root", item: "Graph2D", title: "example of TGraph2D" },
       { name: "pcol", item: "pcol", title: "example of TGraph2D, color options" },
-      { opt: "err",  item: "cerr", title: "example of TGraph2DErrors, errors drawing" }
+      { opt: "err",  item: "cerr", title: "example of TGraph2DErrors, errors drawing" },
+      { opt: "line",  item: "line", title: "line drawing with TGraph2D" }
    ],
    TLatex : [
      { name: "latex", file: "latex.root", layout: "grid2x2", items: ['lva','ex1','ex2','ex3'], title: "Internal TLatex processor" },
@@ -202,9 +207,12 @@ examples_main = {
      { name: "sinfo", url: "?nobrowser&file=$$$hsimple.root&item=StreamerInfo", title: "List of streamer infos" },
      { name: "3dmark", url: "?nobrowser&file=$$$mix2d3d.root&item=Canvas;1/pad4&opt=white", title: "TPloyMarker3D class" },
      { name: "profile2d", file: "profile2d.root", item: "c1;1", title: "TProfile2D class" },
-     { name: "spline", file: "tutorials_graphs.root", item: 'splines_test',  title: "TSpline3 and TSpline5 classes, Macro outputs from tutorials/graphs/splines_test.C" },
+     { name: "spline", file: "tutorials_graphs.root", item: 'splines_test',  title: "TSpline3 and TSpline5 classes, tutorials/graphs/splines_test.C" },
      { name: "polyline", file: "polyline.root", item: "can;1", title: "TPolyLine class (produced with graphics/triangles.C)" },
-     { name: "class", json: "draw_class.json.gz", title: "Canvas, produced with DrawClass() call" }
-
+     { name: "class", json: "draw_class.json.gz", title: "Canvas, produced with DrawClass() call" },
+     { name: "archi", file: "tutorials_graphics.root", item: 'archi',  title: "Usage of TPavesText, tutorials/graphics/archi.C" },
+     { name: "feynman", file: "tutorials_graphics.root", item: 'feynman',  title: "Usage of TCulyLine/Arc, tutorials/graphics/feynman.C" },
+     { name: "pie", file: "tutorials_graphics.root", item: 'piechart',  title: "TPie, tutorials/graphics/piechart.C" },
+     { name: "fill", file: "fillpatterns.root", item: 'patterns',  title: "Different fill patterns" }
    ]
  };

demo/examples_more.js

@@ -15,18 +15,23 @@
    <script type='text/javascript'>
 
       var h1painter = null, 
-          filename = "https://root.cern.ch/js/files/hsimple.root";
+          filename = "https://root.cern/js/files/hsimple.root";
 
       JSROOT.OpenFile(filename, function(file) {
          file.ReadObject("hpx;1", function(obj) {
-            JSROOT.draw("drawth1", obj, "hist", function(painter) { h1painter = painter; });
+            JSROOT.draw("drawth1", obj, "hist", function(painter) { 
+               h1painter = painter; 
+            });
          });
          file.ReadObject("hpxpy;1", function(obj) {
             JSROOT.draw("drawth2", obj, "col", function(painter) {
-               painter.OldZoom = painter.Zoom;
+               // zooming handled in frame painter now
+               var fp = painter.frame_painter();
+               // keep old function to be able invoke it again
+               fp.OldZoom = fp.Zoom;
                // redefine zoom function of TH2 painter to make synchronous zooming of TH1 object
-               painter.Zoom = function(xmin,xmax,ymin,ymax,zmin,zmax) {
-                  if (h1painter) h1painter.Zoom(xmin, xmax);
+               fp.Zoom = function(xmin,xmax,ymin,ymax,zmin,zmax) {
+                  if (h1painter) h1painter.frame_painter().Zoom(xmin, xmax);
                   this.OldZoom(xmin,xmax,ymin,ymax,zmin,zmax);
                }
             });

demo/zoom_handler.htm

@@ -22,18 +22,21 @@ One could specify several options when creating http server. They could be add a
 
 Following parameters are supported:
 
-   - thrds=N   - number of threads used by the civetweb (default is 5)
+   - thrds=N   - number of threads used by the civetweb (default is 10)
    - top=name  - configure top name, visible in the web browser
    - auth_file=filename  - authentication file name, created with htdigets utility
    - auth_domain=domain   - authentication domain
    - loopback  - bind specified port to loopback 127.0.0.1 address
    - debug  - enable debug mode, server always returns html page with request info
+   - websocket_timeout=tm  - set web sockets timeout in seconds (default 300)
+   - websocket_disable - disable web sockets handling (default enabled)
+   - cors=domain  - define value for CORS header "Access-Control-Allow-Origin" in server response
 
 If necessary, one could bind http server to specific IP address like:
 
     new THttpServer("http:192.168.1.17:8080")
 
-One also can provide extra arguments for THttpServer itself 
+One also can provide extra arguments for THttpServer itself:
 
    - readonly, ro   - use server in read-only mode (default)
    - readwrite, rw  - use server in read-write mode
@@ -430,3 +433,68 @@ To use `multi.json` request from the JavaScript, one should create special 'POST
 
 Here argument "multi" identifies, that server response should be parsed with `JSROOT.parse_multi()` function, which correctly interprets JSON code, produced by `multi.json` request. When sending such request to the server, one should provide list of objects names and not forget "?number=N" parameter in the request URL string.
 
+
+## Websockets supports
+
+Websockets support available starting from ROOT v6.12. 
+Minimal example provided in `$ROOTSYS/tutorials/http/ws.C` macro.
+
+To work with websockets, subclass of THttpWSHandler should be created and registered to THttpServer:
+
+    #include "THttpWSHandler.h"
+
+    class TUserHandler : public THttpWSHandler {
+    public:
+       TUserHandler(const char *name, const char *title) : THttpWSHandler(name, title) {}
+
+       // provide custom HTML page when open correpondent address
+       TString GetDefaultPageContent() { return ""; }
+
+       virtual Bool_t ProcessWS(THttpCallArg *arg);
+    };
+  
+Central method is `TUserHandler::ProcessWS(THttpCallArg *arg)`, where four kinds of websockets events should be handled:
+  
+   * WS_CONNECT - clients attempts to create websockets, return false when refusing connection
+   * WS_READY   - connection is ready to use, **wsid** can be obtained with `arg->GetWSId()` calls   
+   * WS_DATA    - new portion of data received by webcosket 
+   * WS_CLOSE   - connection closed by the client, **wsid** is no longer valid  
+
+These kinds are coded as method name of THttpCallArg class and can be used like:
+
+    Bool_t TUserHandler::ProcessWS(THttpCallArg *arg)
+    {
+       if (arg->IsMethod("WS_CONNECT")) {
+          return kTRUE; // accept all connections
+       }
+
+       if (arg->IsMethod("WS_READY")) {
+          SendCharStartWS(arg->GetWSId(), "Init"); // immediately send message to the web socket
+          return kTRUE;
+       }
+
+       if (arg->IsMethod("WS_CLOSE")) {
+          return kTRUE; // just confirm connection
+       }
+
+       if (arg->IsMethod("WS_DATA")) {
+          TString str = arg->GetPostDataAsString();
+          printf("Client msg: %s\n", str.Data());
+          SendCharStarWS(arg->GetWSId(), "Confirm");
+          return kTRUE;
+       }
+
+       return kFALSE; // ignore all other kind of requests
+    }
+ 
+Instance of **TUserHandler** should be registered to the THttpServer like:
+
+    THttpServer *serv = new THttpServer("http:8080");
+    TUserHandler *handler = new TUserHandler("name1","title");
+    serv->Register(handler);
+    
+After that web socket connection can be established with the address `ws://host_name:8080/name1/root.websocket`
+Example client code can be found in `$ROOTSYS/tutorials/http/ws.htm` file. Actually, custom HTML page for
+websocket handler can be specified with `TUserHandler::GetDefaultPageContent()` method returning `"file:ws.htm"`.
+ 
+