From bb63eb1c8903407eb20b2bac70228832693334da Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 18 Feb 2020 08:42:30 +0000 Subject: [PATCH 01/10] update locales from crowdin [ci skip] --- config/locales/crowdin/js-el.yml | 2 +- config/locales/crowdin/js-fr.yml | 2 +- config/locales/crowdin/ko.yml | 2 +- modules/bcf/config/locales/crowdin/es.yml | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/locales/crowdin/js-el.yml b/config/locales/crowdin/js-el.yml index e64c7e1067..87038c53f5 100644 --- a/config/locales/crowdin/js-el.yml +++ b/config/locales/crowdin/js-el.yml @@ -787,7 +787,7 @@ el: relation_columns: 'Χρειάζεστε να βλέπετε συσχετίσεις στη λίστα πακέτων εργασίας;' check_out_link: 'Δείτε την Έκδοση για Επιχειρήσεις.' relation_filters: - filter_work_packages_by_relation_type: 'Filter work packages by relation type' + filter_work_packages_by_relation_type: 'Φιλτράρετε τα πακέτα εργασίας κατά τύπο συσχέτισης' tabs: overview: Επισκόπηση activity: Δραστηριότητα diff --git a/config/locales/crowdin/js-fr.yml b/config/locales/crowdin/js-fr.yml index 0425112434..6e0ea47c07 100644 --- a/config/locales/crowdin/js-fr.yml +++ b/config/locales/crowdin/js-fr.yml @@ -788,7 +788,7 @@ fr: relation_columns: 'Besoin de voir les relations sur la liste des lots de travaux ?' check_out_link: 'Découvrez l’édition entreprise.' relation_filters: - filter_work_packages_by_relation_type: 'Filter work packages by relation type' + filter_work_packages_by_relation_type: 'Filtrer les lots de travaux par type de relation' tabs: overview: Vue globale activity: Activité diff --git a/config/locales/crowdin/ko.yml b/config/locales/crowdin/ko.yml index 7dbe4d79d0..9cf7112d4e 100644 --- a/config/locales/crowdin/ko.yml +++ b/config/locales/crowdin/ko.yml @@ -494,7 +494,7 @@ ko: confirmation: "%{attribute} 속성에 부합하지 않습니다." could_not_be_copied: "은(는) (완전히) 복제될 수 없습니다." does_not_exist: "존재하지 않음" - error_unauthorized: "may not be accessed." + error_unauthorized: "액세스하지 못할 수 있습니다." error_readonly: "- 쓰려고 했지만 쓸 수 없습니다." empty: "비워둘 수 없습니다." even: "에 짝수를 입력해 주세요" diff --git a/modules/bcf/config/locales/crowdin/es.yml b/modules/bcf/config/locales/crowdin/es.yml index 22dac88465..5dbc182ebc 100644 --- a/modules/bcf/config/locales/crowdin/es.yml +++ b/modules/bcf/config/locales/crowdin/es.yml @@ -70,15 +70,15 @@ es: errors: models: bcf/viewpoint: - bitmaps_not_writable: "los mapas de bits no permiten la escritura, ya que aún no se han implementado." - index_not_integer: "el índice no es un entero." - invalid_clipping_planes: "clipping_planes no es válido." - invalid_components: "componentes no es válido." - invalid_lines: "líneas no es válido." - invalid_orthogonal_camera: "orthogonal_camera no es válido." - invalid_perspective_camera: "perspective_camera no es válido." + bitmaps_not_writable: "«bitmaps» no permite la escritura, ya que aún no se ha implementado." + index_not_integer: "«index» no es un entero." + invalid_clipping_planes: "«clipping_planes» no es válido." + invalid_components: "«components» no es válido." + invalid_lines: "«lines» no es válido." + invalid_orthogonal_camera: "«orthogonal_camera» no es válido." + invalid_perspective_camera: "«perspective_camera» no es válido." mismatching_guid: "El GUID de json_viewpoint no coincide con el GUID del modelo." no_json: "La estructura del código JSON no es correcta." - snapshot_type_unsupported: "snapshot_type tiene que ser «png» o «jpg»." - snapshot_data_blank: "snapshot_data tiene que especificarse." + snapshot_type_unsupported: "«snapshot_type» tiene que ser «png» o «jpg»." + snapshot_data_blank: "«snapshot_data» tiene que especificarse." unsupported_key: "Se ha incluido una propiedad JSON no admitida." From 646c77f2645844d094c747e558558621016bb437 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Wed, 12 Feb 2020 16:11:17 +0100 Subject: [PATCH 02/10] Bump xeokit viewer and sdk and adopt to new changes --- frontend/npm-shrinkwrap.json | 14 +++++++------- frontend/package.json | 4 ++-- .../src/app/modules/ifc_models/xeokit-server.js | 15 ++++++++++++--- .../ifc_models/app/helpers/ifc_models_helper.rb | 11 +++++++++++ 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index 38494e426e..0bdf1b94b5 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -3883,16 +3883,16 @@ } }, "@xeokit/xeokit-sdk": { - "version": "0.7.9", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.7.9.tgz", - "integrity": "sha512-+MPFDs/z2r6i9ctD5+HFuwUym02bjXVkRzz4mpBDgGLKNI2ALxxi0Dt8gjnNjobZhAjvVn1t1x7jch72vlzUAA==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.1.tgz", + "integrity": "sha512-ayASDbyE92cNtsLeg2G9ZocZ3gLJp9oz2TFqGn4qUo8Ton6zjezhKOxYjewFIIjRd6hMft/Z6JAnQrkJLEywZg==" }, "@xeokit/xeokit-viewer": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.4.9.tgz", - "integrity": "sha512-igIieHItb2TDWUSyW7stKqxlEBhdTeInYT+tL7tYVGYgPMVNkfPFG70ISSTE8Pv39vTuY1ENM3zaqpxmf8h1Qg==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.5.4.tgz", + "integrity": "sha512-FhqEw+/LR7nGg7qsAPrS1mdBO0bTJ7M5Irn2PDU0l6OAOwY0BTwQ7UGcBfQ3riPWSYiv98E1ZtoOdjd7fTYitQ==", "requires": { - "@xeokit/xeokit-sdk": "^0.7.9" + "@xeokit/xeokit-sdk": "^0.8.1" } }, "@xtuc/ieee754": { diff --git a/frontend/package.json b/frontend/package.json index f1861dacac..a7346f4469 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -68,8 +68,8 @@ "@types/webpack-env": "^1.14.0", "@uirouter/angular": "^4.0.0", "@uirouter/core": "^5.0.23", - "@xeokit/xeokit-sdk": "^0.7.9", - "@xeokit/xeokit-viewer": "^1.4.9", + "@xeokit/xeokit-sdk": "^0.8.1", + "@xeokit/xeokit-viewer": "^1.5.4", "URIjs": "^1.14.1", "amdefine": "^1.0.0", "angular-dragula": "^1.2.8", diff --git a/frontend/src/app/modules/ifc_models/xeokit-server.js b/frontend/src/app/modules/ifc_models/xeokit-server.js index f285309553..d3dc6d531b 100644 --- a/frontend/src/app/modules/ifc_models/xeokit-server.js +++ b/frontend/src/app/modules/ifc_models/xeokit-server.js @@ -19,7 +19,7 @@ class XeokitServer { * @param error */ getProjects(done, _error) { - done(window.gon.ifc_models.projects); + done({ projects: window.gon.ifc_models.projects }); } /** @@ -28,8 +28,17 @@ class XeokitServer { * @param done * @param error */ - getProject(_projectId, done, _error) { - done({ models: window.gon.ifc_models.models }); + getProject(projectData, done, _error) { + var manifestData = { + id: projectData[0].id, + name: projectData[0].name, + models: window.gon.ifc_models.models, + viewerContent: { + modelsLoaded: window.gon.ifc_models.default_models + } + }; + + done(manifestData); } /** diff --git a/modules/ifc_models/app/helpers/ifc_models_helper.rb b/modules/ifc_models/app/helpers/ifc_models_helper.rb index a4952e13b6..06cf239a38 100644 --- a/modules/ifc_models/app/helpers/ifc_models_helper.rb +++ b/modules/ifc_models/app/helpers/ifc_models_helper.rb @@ -4,6 +4,7 @@ module IFCModelsHelper gon.ifc_models = { models: gon_ifc_model_models(all_converted_models, models_to_load), + default_models: gon_ifc_default_models(all_converted_models, models_to_load), projects: [{ id: @project.identifier, name: @project.name }], xkt_attachment_ids: gon_ifc_model_xkt_attachment_ids(all_converted_models), metadata_attachment_ids: gon_ifc_model_metadata_attachment_ids(all_converted_models) @@ -26,6 +27,16 @@ module IFCModelsHelper end end + def gon_ifc_default_models(all_models, models_to_load) + all_converted_models = converted_ifc_models(all_models) + default_models = [] + + all_converted_models.map do |ifc_model| + default_models << ifc_model.id if models_to_load.include?(ifc_model) + end + default_models + end + def gon_ifc_model_xkt_attachment_ids(models) Hash[models.map { |model| [model.id, model.xkt_attachment.id] }] end From ee0c22c259aee6545339205b82b59baa2faf4306 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Thu, 13 Feb 2020 12:55:10 +0100 Subject: [PATCH 03/10] Bump xeokit to 1.5.7 --- frontend/npm-shrinkwrap.json | 14 +++++++------- frontend/package.json | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index 0bdf1b94b5..bf316efd85 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -3883,16 +3883,16 @@ } }, "@xeokit/xeokit-sdk": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.1.tgz", - "integrity": "sha512-ayASDbyE92cNtsLeg2G9ZocZ3gLJp9oz2TFqGn4qUo8Ton6zjezhKOxYjewFIIjRd6hMft/Z6JAnQrkJLEywZg==" + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.3.tgz", + "integrity": "sha512-z5UKiLb2uJBr5K2nHSNuXtWCV8ZueSe+DQ0DLGRPm4FoIMxNCMxwj3sQCZjo0YdM9NnAHawC8hjn9K2o+Z9HNA==" }, "@xeokit/xeokit-viewer": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.5.4.tgz", - "integrity": "sha512-FhqEw+/LR7nGg7qsAPrS1mdBO0bTJ7M5Irn2PDU0l6OAOwY0BTwQ7UGcBfQ3riPWSYiv98E1ZtoOdjd7fTYitQ==", + "version": "1.5.7", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.5.7.tgz", + "integrity": "sha512-YrYO7PjYJ0k8wfxLBAPdSddpJWjOiCr9n7cia3fb+ZB4PBUjgeiKEpLovZzmxlTAI0UsvhepplTbgvl+8M4akA==", "requires": { - "@xeokit/xeokit-sdk": "^0.8.1" + "@xeokit/xeokit-sdk": "^0.8.3" } }, "@xtuc/ieee754": { diff --git a/frontend/package.json b/frontend/package.json index a7346f4469..377f9661e9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -68,8 +68,8 @@ "@types/webpack-env": "^1.14.0", "@uirouter/angular": "^4.0.0", "@uirouter/core": "^5.0.23", - "@xeokit/xeokit-sdk": "^0.8.1", - "@xeokit/xeokit-viewer": "^1.5.4", + "@xeokit/xeokit-sdk": "^0.8.3", + "@xeokit/xeokit-viewer": "^1.5.7", "URIjs": "^1.14.1", "amdefine": "^1.0.0", "angular-dragula": "^1.2.8", From 7e09fc0bc7759281e0719d73459392025ed1f321 Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Thu, 13 Feb 2020 15:25:32 +0100 Subject: [PATCH 04/10] bump xeokit-viewer and prepare enabling SAO for default models --- frontend/npm-shrinkwrap.json | 6 +++--- frontend/package.json | 2 +- frontend/src/app/modules/ifc_models/xeokit-server.js | 3 +++ modules/ifc_models/app/helpers/ifc_models_helper.rb | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index bf316efd85..120cc92138 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -3888,9 +3888,9 @@ "integrity": "sha512-z5UKiLb2uJBr5K2nHSNuXtWCV8ZueSe+DQ0DLGRPm4FoIMxNCMxwj3sQCZjo0YdM9NnAHawC8hjn9K2o+Z9HNA==" }, "@xeokit/xeokit-viewer": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.5.7.tgz", - "integrity": "sha512-YrYO7PjYJ0k8wfxLBAPdSddpJWjOiCr9n7cia3fb+ZB4PBUjgeiKEpLovZzmxlTAI0UsvhepplTbgvl+8M4akA==", + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.5.9.tgz", + "integrity": "sha512-E7AxIUb52m5pgN6iEQqwuebbZ4IsV1kagP6tHD8F7jhc9adFRmHtMlH7LzJeBun5hU9l4WJYs4TfPMHGssOtrQ==", "requires": { "@xeokit/xeokit-sdk": "^0.8.3" } diff --git a/frontend/package.json b/frontend/package.json index 377f9661e9..f329b9cce0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -69,7 +69,7 @@ "@uirouter/angular": "^4.0.0", "@uirouter/core": "^5.0.23", "@xeokit/xeokit-sdk": "^0.8.3", - "@xeokit/xeokit-viewer": "^1.5.7", + "@xeokit/xeokit-viewer": "^1.5.9", "URIjs": "^1.14.1", "amdefine": "^1.0.0", "angular-dragula": "^1.2.8", diff --git a/frontend/src/app/modules/ifc_models/xeokit-server.js b/frontend/src/app/modules/ifc_models/xeokit-server.js index d3dc6d531b..87afcdd559 100644 --- a/frontend/src/app/modules/ifc_models/xeokit-server.js +++ b/frontend/src/app/modules/ifc_models/xeokit-server.js @@ -35,6 +35,9 @@ class XeokitServer { models: window.gon.ifc_models.models, viewerContent: { modelsLoaded: window.gon.ifc_models.default_models + }, + viewerConfigs: { + saoEnabled: false } }; diff --git a/modules/ifc_models/app/helpers/ifc_models_helper.rb b/modules/ifc_models/app/helpers/ifc_models_helper.rb index 06cf239a38..442c3ed28a 100644 --- a/modules/ifc_models/app/helpers/ifc_models_helper.rb +++ b/modules/ifc_models/app/helpers/ifc_models_helper.rb @@ -22,7 +22,7 @@ module IFCModelsHelper { id: ifc_model.id, name: ifc_model.title, - default: models_to_load.include?(ifc_model) + saoEnabled: models_to_load.include?(ifc_model) } end end @@ -32,7 +32,7 @@ module IFCModelsHelper default_models = [] all_converted_models.map do |ifc_model| - default_models << ifc_model.id if models_to_load.include?(ifc_model) + default_models << ifc_model.id.to_s if models_to_load.include?(ifc_model) end default_models end From 31540946c3f00b3425e82076a5e563cff995a871 Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Mon, 17 Feb 2020 12:04:43 +0100 Subject: [PATCH 05/10] Bump Xeokit viewer to 1.6.1 and SDK to 0.8.5 --- frontend/npm-shrinkwrap.json | 14 +++++++------- frontend/package.json | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index 120cc92138..7a883b75cd 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -3883,16 +3883,16 @@ } }, "@xeokit/xeokit-sdk": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.3.tgz", - "integrity": "sha512-z5UKiLb2uJBr5K2nHSNuXtWCV8ZueSe+DQ0DLGRPm4FoIMxNCMxwj3sQCZjo0YdM9NnAHawC8hjn9K2o+Z9HNA==" + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.5.tgz", + "integrity": "sha512-sD8CyT+5avcIMKucygUPUuPMlKc6t6TchsOMis0QIkkMaM9HjdQR4C7QZxr3wBYzWV3GJtdFsehxazoH6FNkpQ==" }, "@xeokit/xeokit-viewer": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.5.9.tgz", - "integrity": "sha512-E7AxIUb52m5pgN6iEQqwuebbZ4IsV1kagP6tHD8F7jhc9adFRmHtMlH7LzJeBun5hU9l4WJYs4TfPMHGssOtrQ==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.6.1.tgz", + "integrity": "sha512-FMbDvWVkfZn25ybAkq6eplDRl21+RS49UPWzXtipJBoJR5CRYPSpMPpM68Yx/iBh9To0wDXhRmQqict2uI7Q4g==", "requires": { - "@xeokit/xeokit-sdk": "^0.8.3" + "@xeokit/xeokit-sdk": "^0.8.5" } }, "@xtuc/ieee754": { diff --git a/frontend/package.json b/frontend/package.json index f329b9cce0..1486af4dec 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -68,8 +68,8 @@ "@types/webpack-env": "^1.14.0", "@uirouter/angular": "^4.0.0", "@uirouter/core": "^5.0.23", - "@xeokit/xeokit-sdk": "^0.8.3", - "@xeokit/xeokit-viewer": "^1.5.9", + "@xeokit/xeokit-sdk": "^0.8.5", + "@xeokit/xeokit-viewer": "^1.6.1", "URIjs": "^1.14.1", "amdefine": "^1.0.0", "angular-dragula": "^1.2.8", From 922f3ace7cc9ec8bdb5605399d48b38138535a5b Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Mon, 17 Feb 2020 12:05:10 +0100 Subject: [PATCH 06/10] Remove section planes overview canvas --- frontend/src/app/modules/ifc_models/ifc-viewer.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/app/modules/ifc_models/ifc-viewer.component.ts b/frontend/src/app/modules/ifc_models/ifc-viewer.component.ts index 86265ee520..35d6316fc9 100644 --- a/frontend/src/app/modules/ifc_models/ifc-viewer.component.ts +++ b/frontend/src/app/modules/ifc_models/ifc-viewer.component.ts @@ -43,7 +43,6 @@ import {GonService} from "core-app/modules/common/gon/gon.service"; - ` }) export class IFCViewerComponent implements OnInit { From c5bcff4c21ee55f608c2edc393a63c70b6d988c7 Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Mon, 17 Feb 2020 12:56:55 +0100 Subject: [PATCH 07/10] Fix selective SAO enabling Apparently for selective SAO enabling per model the viewer needs to have SAO enabled by default. --- frontend/src/app/modules/ifc_models/xeokit-server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/modules/ifc_models/xeokit-server.js b/frontend/src/app/modules/ifc_models/xeokit-server.js index 87afcdd559..ba2601d24b 100644 --- a/frontend/src/app/modules/ifc_models/xeokit-server.js +++ b/frontend/src/app/modules/ifc_models/xeokit-server.js @@ -37,7 +37,7 @@ class XeokitServer { modelsLoaded: window.gon.ifc_models.default_models }, viewerConfigs: { - saoEnabled: false + saoEnabled: true // Needs to be enabled by default if we want to use it selectively on the available models. } }; From ea8b9525520cb1661122746ba3e4e988e1e69348 Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Tue, 18 Feb 2020 17:05:16 +0100 Subject: [PATCH 08/10] Update Xeokit viewer to 1.6.4 and SDK to 0.8.8 --- frontend/npm-shrinkwrap.json | 14 +++++++------- frontend/package.json | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/npm-shrinkwrap.json b/frontend/npm-shrinkwrap.json index 7a883b75cd..53a1708e85 100644 --- a/frontend/npm-shrinkwrap.json +++ b/frontend/npm-shrinkwrap.json @@ -3883,16 +3883,16 @@ } }, "@xeokit/xeokit-sdk": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.5.tgz", - "integrity": "sha512-sD8CyT+5avcIMKucygUPUuPMlKc6t6TchsOMis0QIkkMaM9HjdQR4C7QZxr3wBYzWV3GJtdFsehxazoH6FNkpQ==" + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-sdk/-/xeokit-sdk-0.8.8.tgz", + "integrity": "sha512-e+HTZajykFolCeWm5CIT7HSzOYoRhCxbecpjsXlmfEUYeFZ2Rpxc8CbI/vo62DjwobjFOB/dtyz3xJ2uWkogGg==" }, "@xeokit/xeokit-viewer": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.6.1.tgz", - "integrity": "sha512-FMbDvWVkfZn25ybAkq6eplDRl21+RS49UPWzXtipJBoJR5CRYPSpMPpM68Yx/iBh9To0wDXhRmQqict2uI7Q4g==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@xeokit/xeokit-viewer/-/xeokit-viewer-1.6.4.tgz", + "integrity": "sha512-HgY9ceC+Nb6pBxCKlpcQo7cQearilXyVjPI9u5r27ZtHxkm1JDaAVInrDUTsFcpOyL2JBE17Xyb5kfzv9/FujQ==", "requires": { - "@xeokit/xeokit-sdk": "^0.8.5" + "@xeokit/xeokit-sdk": "^0.8.8" } }, "@xtuc/ieee754": { diff --git a/frontend/package.json b/frontend/package.json index 1486af4dec..a78676cf95 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -68,8 +68,8 @@ "@types/webpack-env": "^1.14.0", "@uirouter/angular": "^4.0.0", "@uirouter/core": "^5.0.23", - "@xeokit/xeokit-sdk": "^0.8.5", - "@xeokit/xeokit-viewer": "^1.6.1", + "@xeokit/xeokit-sdk": "^0.8.8", + "@xeokit/xeokit-viewer": "^1.6.4", "URIjs": "^1.14.1", "amdefine": "^1.0.0", "angular-dragula": "^1.2.8", From 6c69aadb0845dac49f1f8089e0d39133b5d72fe1 Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Tue, 18 Feb 2020 17:55:30 +0100 Subject: [PATCH 09/10] Make use of "disabled" CSS class for IFC viewer context menu items --- .../assets/stylesheets/ifc_viewer/context_menu.sass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/ifc_models/app/assets/stylesheets/ifc_viewer/context_menu.sass b/modules/ifc_models/app/assets/stylesheets/ifc_viewer/context_menu.sass index 47b920fa61..c87b93954c 100644 --- a/modules/ifc_models/app/assets/stylesheets/ifc_viewer/context_menu.sass +++ b/modules/ifc_models/app/assets/stylesheets/ifc_viewer/context_menu.sass @@ -15,4 +15,12 @@ li @extend .menu-item - border-bottom-color: rgba(0, 0, 0, 0.2) !important \ No newline at end of file + border-bottom-color: rgba(0, 0, 0, 0.2) !important + + LI.disabled + color: #999999 + cursor: default !important + + &:hover + background-color: initial !important + color: #999999 !important \ No newline at end of file From 97eb0b184dc4d998564d7a7aed2788c96e1ec9a3 Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Tue, 18 Feb 2020 18:14:45 +0100 Subject: [PATCH 10/10] Fix cursor for tree menu item labels --- modules/ifc_models/app/assets/stylesheets/ifc_viewer/tabs.sass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/ifc_models/app/assets/stylesheets/ifc_viewer/tabs.sass b/modules/ifc_models/app/assets/stylesheets/ifc_viewer/tabs.sass index 9c346f1224..6bd80f2d3c 100644 --- a/modules/ifc_models/app/assets/stylesheets/ifc_viewer/tabs.sass +++ b/modules/ifc_models/app/assets/stylesheets/ifc_viewer/tabs.sass @@ -106,5 +106,8 @@ $pill-padding-left: 8px input margin-right: 5px + span + cursor: pointer + .xeokit-tree-panel > ul padding-left: 0