@@ -11,7 +11,7 @@ let version_id = '7.3.0';
1111
1212/** @summary version date
1313 * @desc Release date in format day/month/year like '14/04/2022' */
14- let version_date = '14 /12/2022';
14+ let version_date = '15 /12/2022';
1515
1616/** @summary version id and date
1717 * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -73231,12 +73231,15 @@ class TGeoPainter extends ObjectPainter {
7323173231 if (!this._scene) {
7323273232 this._first_drawing = true;
7323373233
73234- this._on_pad = !!this.getPadPainter();
73234+ let pp = this.getPadPainter();
73235+
73236+ this._on_pad = !!pp;
7323573237
7323673238 if (this._on_pad) {
7323773239 let size, render3d, fp;
7323873240 promise = ensureTCanvas(this,'3d').then(() => {
73239-
73241+ if (pp.fillatt?.color)
73242+ this.ctrl.background = pp.fillatt.color;
7324073243 fp = this.getFramePainter();
7324173244
7324273245 render3d = getRender3DKind();
@@ -85333,7 +85336,6 @@ class HierarchyPainter extends BasePainter {
8533385336 let prereq = GetOption('prereq') || '',
8533485337 filesdir = d.get('path') || '', // path used in normal gui
8533585338 filesarr = GetOptionAsArray('#file;files'),
85336- localfile = GetOption('localfile'),
8533785339 jsonarr = GetOptionAsArray('#json;jsons'),
8533885340 expanditems = GetOptionAsArray('expand'),
8533985341 focusitem = GetOption('focus'),
@@ -85438,9 +85440,7 @@ class HierarchyPainter extends BasePainter {
8543885440 promise = this.openJsonFile(jsonarr.shift());
8543985441 else if (filesarr.length > 0)
8544085442 promise = this.openRootFile(filesarr.shift());
85441- else if ((localfile !== null) && isFunc(this.selectLocalFile)) {
85442- localfile = null; promise = this.selectLocalFile();
85443- } else if (expanditems.length > 0)
85443+ else if (expanditems.length > 0)
8544485444 promise = this.expandItem(expanditems.shift());
8544585445 else if (style.length > 0)
8544685446 promise = this.applyStyle(style.shift());
@@ -85634,8 +85634,6 @@ class HierarchyPainter extends BasePainter {
8563485634 });
8563585635 });
8563685636
85637- let localfile_read_callback = null;
85638-
8563985637 if (!this.is_online && !this.no_select) {
8564085638
8564185639 this.readSelectedFile = function() {
@@ -85661,28 +85659,14 @@ class HierarchyPainter extends BasePainter {
8566185659 });
8566285660
8566385661 main.select('.gui_localFile').on('change', evnt => {
85664- let files = evnt.target.files, promises = [] ;
85662+ let files = evnt.target.files;
8566585663
8566685664 for (let n = 0; n < files.length; ++n) {
8566785665 let f = files[n];
8566885666 main.select('.gui_urlToLoad').property('value', f.name);
85669- promises.push( this.openRootFile(f) );
85667+ this.openRootFile(f);
8567085668 }
85671-
85672- Promise.all(promises).then(() => {
85673- if (localfile_read_callback) {
85674- localfile_read_callback();
85675- localfile_read_callback = null;
85676- }
85677- });
8567885669 });
85679-
85680- this.selectLocalFile = async function() {
85681- return new Promise(resolveFunc => {
85682- localfile_read_callback = resolveFunc;
85683- main.select('.gui_localFile').node().click();
85684- });
85685- };
8568685670 }
8568785671
8568885672 let layout = main.select('.gui_layout');
0 commit comments