@sapui5/sap.ui.vk 1.136.2 → 1.136.3

package/src/sap/ui/vk/i18n/messagebundle.properties

@@ -656,55 +656,82 @@ SLIDER_TOOLTIP=Preview zoom level
 #XTOL: Mini-map toogle toolbar button tooltip
 MINIMAP_BUTTONTOOLTIP=Mini-Map
 
-#XTOL: Text for Show Layers button in LayersPanel
+#XTOL: Page gallery toogle toolbar button tooltip
+PAGE_GALLERY_BUTTONTOOLTIP=Page Gallery
+
+#XTOL: Layers panel toogle toolbar button tooltip
+LAYERS_BUTTONTOOLTIP=Layers
+
+#XTOL: Elements panel toogle toolbar button tooltip
+ELEMENTS_BUTTONTOOLTIP=Elements
+
+#XTOL: Show/hide all hotspots toogle toolbar button tooltip
+TOGGLE_HOTSPOTS_BUTTONTOOLTIP = Toggle Hotspots
+
+#XBUT: Button caption for showing layers
 LAYERS_PANEL_SHOW_BUTTON=Show
-#XTOL: Tooltip for for Show Layers button in LayersPanel
-LAYERS_PANEL_SHOW_BUTTON_TOOLTIP=Show Layer(s)
-#XTOL: Text for Hide Layers button in LayersPanel
+#XTOL: Button tooltip for showing layers
+LAYERS_PANEL_SHOW_BUTTON_TOOLTIP=Show elements of selected layers
+#XBUT: Button caption for hiding layers
 LAYERS_PANEL_HIDE_BUTTON=Hide
-#XTOL: Tooltip for for Hide Layers button in LayersPanel
-LAYERS_PANEL_HIDE_BUTTON_TOOLTIP=Hide Layer(s)
-#XTOL: Text for Name column in LayersPanel table
-LAYERS_PANEL__NAME_COLUMN=Name
-#XTOL: Text for Visible column in LayersPanel table
-LAYERS_PANEL_VISIBLE_COLUMN=Visible
-#XTOL: Tooltip for for Visible column icon in visible state
-LAYERS_PANEL_VISIBLE_COLUMN_VISIBLE_TOOLTIP=Visible layer
-#XTOL: Tooltip for for Visible column icon in partially visible state
-LAYERS_PANEL_VISIBLE_COLUMN_PARTIAL_TOOLTIP=Partially visible layer
-#XTOL: Tooltip for for Visible column icon in partially visible state
-LAYERS_PANEL_VISIBLE_COLUMN_HIDDEN_TOOLTIP=Hidden layer
-
-#XTOL: Text for Show Element button in ElementsPanel
+#XTOL: Button tooltip for hiding layers
+LAYERS_PANEL_HIDE_BUTTON_TOOLTIP=Hide elements of selected layers
+#XTIT: Column header for name of the layer
+LAYERS_PANEL_NAME_COLUMN=Name
+#XTIT: Column header for visibility of the layer
+LAYERS_PANEL_VISIBLE_COLUMN=Visibility
+#XTOL: Tooltip for layer in visible state
+LAYERS_PANEL_VISIBLE_COLUMN_VISIBLE_TOOLTIP=All elements are visible
+#XTOL: Tooltip for layer in partially visible state
+LAYERS_PANEL_VISIBLE_COLUMN_PARTIAL_TOOLTIP=Some elements are visible and some are hidden
+#XTOL: Tooltip for layer in hidden state
+LAYERS_PANEL_VISIBLE_COLUMN_HIDDEN_TOOLTIP=All elements are hidden
+
+#XBUT: Button caption for showing elements
 ELEMENTS_PANEL_SHOW_BUTTON=Show
-#XTOL: Tooltip for for Show Elements button in ElementsPanel
-ELEMENTS_PANEL_SHOW_BUTTON_TOOLTIP=Show Element(s)
-#XTOL: Text for Hide Elements button in ElementsPanel
+#XTOL: Button tooltip for showing elements
+ELEMENTS_PANEL_SHOW_BUTTON_TOOLTIP=Show elements in the viewport
+#XBUT: Button caption for hiding elements
 ELEMENTS_PANEL_HIDE_BUTTON=Hide
-#XTOL: Tooltip for for Hide Elements button in ElementsPanel
-ELEMENTS_PANEL_HIDE_BUTTON_TOOLTIP=Hide Element(s)
-#XTOL: Tooltip for for Settings button in ElementsPanel
+#XTOL: Button tooltip for hiding elements
+ELEMENTS_PANEL_HIDE_BUTTON_TOOLTIP=Hide elements in the viewport
+#XTOL: Button tooltip for settings of elements table
 ELEMENTS_PANEL_SETTINGS_BUTTON_TOOLTIP=Elements panel settings
-#XTOL: Text for Name column in ElementsPanel table
-ELEMENTS_PANEL_NAME_COLUMN=Reference Designator
-#XTOL: Text for Name column in ElementsPanel table
+#XTIT: Column header for installation point or identifier of an element
+ELEMENTS_PANEL_NAME_COLUMN=Installation Point
+#XTIT: Column header for type of an element
 ELEMENTS_PANEL_TYPE_COLUMN=Type
-#XTOL: Text for Name column in ElementsPanel table
-ELEMENTS_PANEL_DEVICE_REFERENCE_COLUMN=Device reference
-#XTOL: Text for Visible column in ElementsPanel table
-ELEMENTS_PANEL_VISIBLE_COLUMN=Visible
-#XTOL: Tooltip for for Visible column icon in visible state
+#XTIT: Column header for device reference or external identifier of an element
+ELEMENTS_PANEL_DEVICE_REFERENCE_COLUMN=Device Reference
+#XTIT: Column header for visibility of an elements
+ELEMENTS_PANEL_VISIBLE_COLUMN=Visibility
+#XTOL: Tooltip for element in visible state
 ELEMENTS_PANEL_VISIBLE_COLUMN_VISIBLE_TOOLTIP=Visible element
-#XTOL: Tooltip for for Visible column icon in partially visible state
+#XTOL: Tooltip for element in partially visible state
 ELEMENTS_PANEL_VISIBLE_COLUMN_PARTIAL_TOOLTIP=Partially visible element
-#XTOL: Tooltip for for Visible column icon in partially visible state
+#XTOL: Tooltip for element in hidden state
 ELEMENTS_PANEL_VISIBLE_COLUMN_HIDDEN_TOOLTIP=Hidden element
-#XTOL: Text for Component type in ElementsPanel
+
+#XSEL: Text for element type: component (like capacitor, resistor, diod etc.. on PCB board)
 ELEMENTS_PANEL_TYPE_COMPONENT=Component
-#XTOL: Text for Net type in ElementsPanel
+#XSEL: Text for element type: net (or copper route on PCB board)
 ELEMENTS_PANEL_TYPE_NET=Net
-#XTOL: Text for Unknown type in ElementsPanel
+#XTOL: Text for unknown element type
 ELEMENTS_PANEL_TYPE_UNKNOWN=Unknown
+#XFLD: Caption for element type filter in filter bar
+TYPE_FILTER_LABEL=Type
+#XFLD: Caption for component device reference (or external identifier) filter in filter bar
+DEVICE_REF_FILTER_LABEL=Device Reference
+#XFLD: Caption for installation point (or identifier) filter in filter bar
+REFDES_FILTER_LABEL=Installation Point
+
+#XTOL: Button tooltip for clockwise rotate of PCB board
+ROTATE_BOARD_CW=Rotate board clockwise
+#XTOL: Button tooltip for counterclockwise rotate of PCB board
+ROTATE_BOARD_CCW=Rotate board counter clockwise
+#XTOL: Button tooltip for flip PCB board horizontally, to see other board side
+FLIP_BOARD=Flip board horizontally
+
 
 #XTOL: Button tooltip for entering fullscreen
 ENTER_FULLSCREEN=Enter Full Screen

package/src/sap/ui/vk/library.js

@@ -14,6 +14,9 @@
 sap.ui.define([
 	"sap/ui/core/Lib",
 	"sap/ui/core/library",
+	"sap/ui/comp/library",
+	"sap/f/library",
+	"sap/m/library",
 	"./BillboardBorderLineStyle",
 	"./BillboardCoordinateSpace",
 	"./BillboardHorizontalAlignment",
@@ -61,7 +64,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.vk
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @public
 	 */
 
@@ -69,7 +72,10 @@ sap.ui.define([
 		apiVersion: 2,
 		name: "sap.ui.vk",
 		dependencies: [
-			"sap.ui.core"
+			"sap.ui.core",
+			"sap.ui.comp",
+			"sap.f",
+			"sap.m"
 		],
 		interfaces: [
 			"sap.ui.vk.AuthorizationHandler",
@@ -115,7 +121,8 @@ sap.ui.define([
 			"sap.ui.vk.tools.ScaleToolGizmo",
 			"sap.ui.vk.tools.SceneOrientationToolGizmo",
 			"sap.ui.vk.tools.TooltipToolGizmo",
-			"sap.ui.vk.ecad.LayersPanel"
+			"sap.ui.vk.ecad.LayersPanel",
+			"sap.ui.vk.ecad.ElementsPanel"
 		],
 		elements: [
 			"sap.ui.vk.ContentConnector",
@@ -147,7 +154,7 @@ sap.ui.define([
 			"sap.ui.vk.tools.PoiManipulationTool"
 		],
 		noLibraryCSS: false,
-		version: "1.136.2",
+		version: "1.136.3",
 		designtime: "sap/ui/vk/designtime/library.designtime"
 	});
 

package/src/sap/ui/vk/measurements/Angle.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @param {object} [settings] A JSON-like object.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @alias sap.ui.vk.measurement.Angle
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Area.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @param {object} [settings] A JSON-like object.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @alias sap.ui.vk.measurement.Area
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Distance.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [settings] A JSON-like object.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @alias sap.ui.vk.measurement.Distance
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Edge.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {float[]} [settings.edge] World coordinates of the edge ends in form <code>[x1, y1, z1, x2, y2, z2]</code>.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @alias sap.ui.vk.measurement.Edge
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Face.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 *     where <code>e</code> is the number of edges in the list.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @alias sap.ui.vk.measurement.Face
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Feature.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @alias sap.ui.vk.measurement.Feature
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/measurements/Vertex.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {float[]} [settings.vertex] World coordinates of the vertex in form <code>[x, y, z]</code>.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @alias sap.ui.vk.measurement.Vertex
 	 * @since 1.101.0
 	 */

package/src/sap/ui/vk/pdf/ContentManager.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ContentManager object.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.pdf.ContentManager
 	 * @since 1.123.0

package/src/sap/ui/vk/pdf/Viewport.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.vk.ViewportBase
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.vk.pdf.Viewport
@@ -915,13 +915,10 @@ sap.ui.define([
 
 		event.preventDefault();
 
-		const delta = -event.originalEvent.deltaY;
-
-		if (delta > 0) {
-			this.zoom(SCALE_DELTA, event.clientX, event.clientY);
-		} else if (delta < 0) {
-			this.zoom(1 / SCALE_DELTA, event.clientX, event.clientY);
-		}
+		// cropping by min and max values (20px) to avoid too fast zooming with mouse wheel
+		// 100 pixels using touchpad or 5 steps (100px/20px) using mouse wheel to zoom in/out 2x
+		const delta = Math.min(Math.max(-event.originalEvent.deltaY, -20), 20);
+		this.zoom(Math.pow(2, delta / 100), event.clientX, event.clientY);
 	};
 
 	Viewport.prototype._onScroll = function(event) {

package/src/sap/ui/vk/svg/BaseNodeProxy.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.BaseNodeProxy
 	 * @implements sap.ui.base.Poolable
 	 * @alias sap.ui.vk.svg.BaseNodeProxy

package/src/sap/ui/vk/svg/ContentDeliveryService.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class Provides a class to communicate with content delivery service.
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.vk.svg.ContentDeliveryService
 	 */

package/src/sap/ui/vk/svg/ContentManager.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ContentManager object.
 	 * @protected
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.ContentManager
 	 * @alias sap.ui.vk.svg.ContentManager
 	 * @since 1.80.0
@@ -382,6 +382,7 @@ sap.ui.define([
 				const sourceType = contentResource.getEffectiveSourceType()?.toLowerCase();
 
 				switch (sourceType) {
+					case "ecad":
 					case "stream2d": {
 						// Since SVG coordinate system origin is top left and ours is bottom left we apply vertical flip
 						element.matrix = new Float32Array([1, 0, 0, -1, 0, 0]);

package/src/sap/ui/vk/svg/NodeHierarchy.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.NodeHierarchy
 	 * @alias sap.ui.vk.svg.NodeHierarchy
 	 */

package/src/sap/ui/vk/svg/NodeProxy.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.NodeProxy
 	 * @alias sap.ui.vk.svg.NodeProxy
 	 */

package/src/sap/ui/vk/svg/OrthographicCamera.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.OrthographicCamera
 	 * @alias sap.ui.vk.svg.OrthographicCamera
 	 * @since 1.80.0

package/src/sap/ui/vk/svg/Scene.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.Scene
 	 * @alias sap.ui.vk.svg.Scene
 	 */

package/src/sap/ui/vk/svg/SceneBuilder.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 */
 	var SceneBuilder = function(rootNode, contentResource, resolve, reject) {
 		this._rootNode = rootNode;
@@ -188,6 +188,9 @@ sap.ui.define([
 
 		if (vkScene) {
 			this._vkScene = vkScene;
+			if (this._sceneMetadata) {
+				this._vkScene.setSceneMetadata(this._sceneMetadata);
+			}
 		}
 		return this;
 	};
@@ -923,7 +926,6 @@ sap.ui.define([
 			fillStyle: geometry.isPolyline ? null : { colour: material.color },
 			subelement: true
 		});
-		path.uid += "-g";
 		node.add(path);
 
 		TotaraUtils.pushElementIntoMapArray(this._materialNodesMap, materialId, path);
@@ -1009,7 +1011,6 @@ sap.ui.define([
 
 		this._resetCurrentScene(sceneId);
 		var node = this._nodes.get(nodeId);
-		node.uid += "-p";
 
 		var shapes = parametricContent.shapes;
 		if (shapes) {
@@ -1105,7 +1106,6 @@ sap.ui.define([
 
 		if (shape) {
 			shape.userData.po = parametricContent;
-			shape.uid += "-s";
 			if (parametricContent.materialID) {
 				TotaraUtils.pushElementIntoMapArray(this._materialNodesMap, parametricContent.materialID, shape);
 			}
@@ -1423,5 +1423,13 @@ sap.ui.define([
 		return undefined;
 	};
 
+	SceneBuilder.prototype.setSceneMetadata = function(metadata) {
+		if (this._vkScene) {
+			this._vkScene.setSceneMetadata(metadata);
+		} else {
+			this._sceneMetadata = metadata;
+		}
+	};
+
 	return SceneBuilder;
 });

package/src/sap/ui/vk/svg/ViewStateManager.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new ViewStateManager object.
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.2
+	 * @version 1.136.3
 	 * @extends sap.ui.vk.ViewStateManagerBase
 	 * @alias sap.ui.vk.svg.ViewStateManager
 	 * @since 1.80.0
@@ -354,7 +354,7 @@ sap.ui.define([
 						// Force visibility by traversing ancestor nodes and make them visible
 						var node = nodeRef.parent;
 						while (node) {
-							node.visible = true;
+							node.setVisible(mask, true);
 							node = node.parent;
 						}
 					}