Skip to content

Commit 64a0d4e

Browse files
committed
Create geo css entries also when expand object in hierarchy #240
1 parent a6a92e9 commit 64a0d4e

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

modules/geom/TGeoPainter.mjs

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ function createList(parent, lst, name, title) {
154154
/** @summary Expand geo object
155155
* @private */
156156
function expandGeoObject(parent, obj) {
157+
injectGeoStyle();
158+
157159
if (!parent || !obj) return false;
158160

159161
let isnode = (obj._typename.indexOf('TGeoNode') === 0),
@@ -4690,21 +4692,22 @@ class TGeoPainter extends ObjectPainter {
46904692

46914693
let add_settings = false;
46924694

4693-
/** @summary Create geo painter
4695+
/** @summary Create geo-related css entries
46944696
* @private */
4695-
function createGeoPainter(dom, obj, opt) {
4697+
function injectGeoStyle() {
46964698

4697-
if (!add_settings && (typeof internals.addDrawFunc == 'function')) {
4698-
// indication that draw and hierarchy is loaded, create css
4699+
if (!add_settings && typeof internals.addDrawFunc == 'function') {
46994700
add_settings = true;
4701+
// indication that draw and hierarchy is loaded, create css
47004702
internals.addDrawFunc({ name: "TEvePointSet", icon_get: getBrowserIcon, icon_click: browserIconClick });
47014703
internals.addDrawFunc({ name: "TEveTrack", icon_get: getBrowserIcon, icon_click: browserIconClick });
4704+
}
47024705

4703-
function img(name,code) {
4704-
return `.jsroot .img_${name} { display: inline-block; height: 16px; width: 16px; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQ${code}"); }`;
4705-
}
4706+
function img(name,code) {
4707+
return `.jsroot .img_${name} { display: inline-block; height: 16px; width: 16px; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQ${code}"); }`;
4708+
}
47064709

4707-
injectStyle(`
4710+
injectStyle(`
47084711
${img("geoarb8","CAAAAAA6mKC9AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAJ0Uk5TAAB2k804AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAAB1SURBVBjTdY6rEYAwEETTy6lzK8/Fo+Jj18dTAjUgaQGfGiggtRDE8RtY93Zu514If2nzk2ux9c5TZkwXbiWTUavzws69oBfpYBrMT4r0Jhsw+QfRgQSw+CaKRsKsnV+SaF8MN49RBSgPUxO85PMl5n4tfGUH2gghs2uPAeQAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMTItMDJUMTQ6MjY6MjkrMDE6MDDARtd2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTExLTEyVDA4OjM5OjE5KzAxOjAwO3ydwwAAAABJRU5ErkJggg==")}
47094712
${img("geocombi","CAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAJiS0dEAP+Hj8y/AAAACXBIWXMAAABIAAAASABGyWs+AAAAlUlEQVQoz5VQMQ4CMQyzEUNnBqT7Bo+4nZUH8gj+welWJsQDkHoCEYakTXMHSFiq2jqu4xRAEl2A7w4myWzpzCSZRZ658ldKu1hPnFsequBIc/hcLli3l52MAIANtpWrDsv8waGTW6BPuFtsdZArXyFuj33TQpazGEQF38phipnLgItxRcAoOeNpzv4PTXnC42fb//AGI5YqfQAU8dkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMTItMDJUMTQ6MjY6MjkrMDE6MDDARtd2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTExLTEyVDA4OjM5OjE5KzAxOjAwO3ydwwAAAABJRU5ErkJggg==")}
47104713
${img("geocone","CAAAAAA6mKC9AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAJ0Uk5TAAB2k804AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAACRSURBVBjTdY+xDcNACEVvEm/ggo6Olva37IB0C3iEzJABvAHFTXBDeJRwthMnUvylk44vPjxK+afeokX0flQhJO7L4pafSOMxzaxIKc/Tc7SIjNLyieyZSjBzc4DqMZI0HTMonWPBNlogOLeuewbg9c0hOiIqH7DKmTCuFykjHe4XOzQ58XVMGxzt575tKzd6AX9yMkcWyPlsAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTEyLTAyVDE0OjI2OjI5KzAxOjAwwEbXdgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNC0xMS0xMlQwODozOToxOSswMTowMDt8ncMAAAAASUVORK5CYII=")}
@@ -4739,7 +4742,14 @@ ${img("evetrack", "CAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hST
47394742
.jsroot .geovis_this { background-color: lightgreen; }
47404743
.jsroot .geovis_daughters { background-color: lightblue; }
47414744
.jsroot .geovis_all { background-color: yellow; }`);
4742-
}
4745+
}
4746+
4747+
4748+
/** @summary Create geo painter
4749+
* @private */
4750+
function createGeoPainter(dom, obj, opt) {
4751+
4752+
injectGeoStyle();
47434753

47444754
geoCfg("GradPerSegm", settings.GeoGradPerSegm);
47454755
geoCfg("CompressComp", settings.GeoCompressComp);

0 commit comments

Comments
 (0)