Skip to content

Commit 73f8451

Browse files
authored
Introduce openui5 tarball in the source code (root-project#2774)
* Include openui5 sub-package, Unpack it in etc/http/openui5dist subfolder * Move openui5 tarball to net/http/openui5 directory Not to making etc/ rules too complex * jsroot: dev 9/10/2018 with build-in openui5 support * update openui5 tarball - some new files appeared in 1.56.11 version
1 parent 9bf0a63 commit 73f8451

13 files changed

+534
-226
lines changed

cmake/modules/SearchInstalledSoftware.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,6 +1612,17 @@ if (testing)
16121612

16131613
endif()
16141614

1615+
1616+
#------------------------------------------------------------------------------------
1617+
ExternalProject_Add(
1618+
OPENUI5
1619+
URL ${CMAKE_SOURCE_DIR}/net/http/openui5/openui5.tar.gz
1620+
URL_HASH SHA256=32e50e3e8808295c67ecb7561ea9cd9beb76dd934263170fbbd05ff59b6d501d
1621+
CONFIGURE_COMMAND ""
1622+
BUILD_COMMAND ""
1623+
INSTALL_COMMAND ""
1624+
SOURCE_DIR ${CMAKE_BINARY_DIR}/etc/http/openui5dist)
1625+
16151626
#---Report removed options---------------------------------------------------
16161627
foreach(opt afs glite sapdb srp chirp ios)
16171628
if(${opt})

etc/http/scripts/JSRoot3DPainter.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343

4444
JSROOT.Painter.TestWebGL = function() {
4545

46-
// WebGL is not yet working in batch mode
47-
if (JSROOT.gStyle.NoWebGL /* || JSROOT.BatchMode */) return false;
46+
if (JSROOT.gStyle.NoWebGL || JSROOT.nodejs) return false;
4847

4948
if ('_Detect_WebGL' in this) return this._Detect_WebGL;
5049

etc/http/scripts/JSRootCore.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,16 @@
9696

9797
"use strict";
9898

99-
JSROOT.version = "dev 7/09/2018";
99+
JSROOT.version = "dev 9/10/2018";
100100

101101
JSROOT.source_dir = "";
102102
JSROOT.source_min = false;
103103
JSROOT.source_fullpath = ""; // full name of source script
104104
JSROOT.bower_dir = null; // when specified, use standard libs from bower location
105105
JSROOT.nocache = false;
106106
JSROOT.sources = ['core']; // indicates which major sources were loaded
107+
108+
JSROOT.openui5src = 'jsroot'; // to use ROOT installation of openui
107109

108110
JSROOT.id_counter = 0;
109111
if (JSROOT.BatchMode === undefined)
@@ -176,6 +178,7 @@
176178
GeoCompressComp : true, // if one should compress faces after creation of composite shape,
177179
IgnoreUrlOptions : false, // if true, ignore all kind of URL options in the browser URL
178180
HierarchyLimit : 250, // how many items shown on one level of hierarchy
181+
SmallPad : { width : 150, height : 100 }, // size of pad, where many features will be deactivated like text draw or zooming
179182

180183
// XValuesFormat : "6.4g", // custom format for all X values
181184
// YValuesFormat : "6.4g", // custom format for all Y values
@@ -2202,6 +2205,8 @@
22022205
JSROOT.ConnectWebWindow = function(arg) {
22032206
if (typeof arg == 'function') arg = { callback: arg };
22042207

2208+
if (arg.openui5src) JSROOT.openui5src = arg.openui5src;
2209+
if (arg.openui5libs) JSROOT.openui5libs = arg.openui5libs;
22052210
JSROOT.AssertPrerequisites("2d;" + (arg && arg.prereq ? arg.prereq : ""), function() {
22062211
if (arg && arg.prereq) delete arg.prereq;
22072212
JSROOT.ConnectWebWindow(arg);

etc/http/scripts/JSRootGeoPainter.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@
302302
if (d.check("ZOOM", true)) res.zoom = d.partAsInt(0, 100) / 100;
303303

304304
if (d.check('BLACK')) res.background = "#000000";
305+
if (d.check('WHITE')) res.background = "#FFFFFF";
305306

306307
if (d.check('BKGR_', true)) {
307308
var bckgr = null;
@@ -759,6 +760,11 @@
759760

760761
TGeoPainter.prototype.FilterIntersects = function(intersects) {
761762

763+
// check redirections
764+
for (var n=0;n<intersects.length;++n)
765+
if (intersects[n].object.geo_highlight)
766+
intersects[n].object = intersects[n].object.geo_highlight;
767+
762768
// remove all elements without stack - indicator that this is geometry object
763769
for (var n=intersects.length-1; n>=0; --n) {
764770

@@ -835,7 +841,7 @@
835841
if (extras && extras.children)
836842
for (var k=0;k<extras.children.length;++k)
837843
if (extras.children[k].geo_object === geo_object) {
838-
active_mesh.push(extras.children[k]);
844+
active_mesh.push(extras.children[k].geo_highlight || extras.children[k]);
839845
}
840846
} else if (geo_stack && this._toplevel) {
841847
active_mesh = [];
@@ -1461,6 +1467,7 @@
14611467
this._renderer.setSize(w, h, !this._fit_main_area);
14621468
this._renderer.localClippingEnabled = true;
14631469

1470+
this._renderer.setClearColor(this.options.background, 1);
14641471

14651472
/* if (usesvg) {
14661473
// this._renderer = new THREE.SVGRenderer( { precision: 0, astext: true } );
@@ -1481,7 +1488,6 @@
14811488
new THREE.CanvasRenderer({ antialias: true });
14821489
this._renderer.setPixelRatio(window.devicePixelRatio);
14831490
}
1484-
this._renderer.setClearColor(this.options.background, 1);
14851491
this._renderer.setSize(w, h, !this._fit_main_area);
14861492
this._renderer.localClippingEnabled = true;
14871493

0 commit comments

Comments
 (0)