@panoramax/web-viewer 5.1.1-develop-f7f14900 → 5.1.1-develop-942a7005

package/build/esm/components/core/Basic.js

@@ -9,7 +9,7 @@ import BasicStyles from "./Basic.css" with { type: "css" };
 document.adoptedStyleSheets.push(AtkinsonStyles);
 document.adoptedStyleSheets.push(BasicStyles);
 
-const __COMMIT_HASH__ = "f7f1490";
+const __COMMIT_HASH__ = "942a700";
 const __PACKAGE_VERSION__ = "5.1.1";
 const __PACKAGE_ISSUES_URL__ = "https://gitlab.com/panoramax/clients/web-viewer/-/work_items";
 

package/build/esm/components/menus/PlayerOptions.js

@@ -1,6 +1,7 @@
 import { LitElement, css, html } from "lit";
 import { faSvg } from "../styles.js";
 import { faLightbulb, faPersonBiking, faRocket } from "@fortawesome/free-solid-svg-icons";
+import { faLightbulb as farLightbulb } from "@fortawesome/free-regular-svg-icons";
 import { PIC_MAX_STAY_DURATION } from "../ui/Photo.js";
 import { fa, onceParentAvailable } from "../../utils/widgets.js";
 
@@ -35,6 +36,17 @@ export default class PlayerOptions extends LitElement {
 		}
 	` ];
 
+	/** @private */
+	static properties = {
+		contrast: {state: true},
+	};
+
+	/** @private */
+	constructor() {
+		super();
+		this.contrast = 0;
+	}
+
 	/** @private */
 	connectedCallback() {
 		super.connectedCallback();
@@ -51,15 +63,9 @@ export default class PlayerOptions extends LitElement {
 
 	/** @private */
 	_onContrastClick() {
-		const btn = this.renderRoot.querySelector("#pnx-player-contrast");
-		if(btn.getAttribute("active") == "true") {
-			btn.removeAttribute("active");
-			this._parent?.psv?.setHigherContrast(false);
-		}
-		else {
-			btn.setAttribute("active", "true");
-			this._parent?.psv?.setHigherContrast(true);
-		}
+		this.contrast++;
+		if(this.contrast > 1) { this.contrast = -1; }
+		this._parent?.psv?.setContrast(this.contrast);
 	}
 
 	/** @private */
@@ -80,11 +86,12 @@ export default class PlayerOptions extends LitElement {
 			</div>
 			<pnx-button
 				id="pnx-player-contrast"
-				title="${this._parent?._t.pnx.contrast}"
+				title=${this._parent?._t.pnx[this.contrast === 0 ? "contrast" : (this.contrast === 1 ? "low_contrast" : "reset_contrast")]}
 				kind="outline"
+				.active=${this.contrast !== 0 ? "true" : null}
 				@click=${this._onContrastClick}
 			>
-				${fa(faLightbulb)}
+				${this.contrast === -1 ? fa(farLightbulb) : fa(faLightbulb)}
 			</pnx-button>
 		`;
 	}

package/build/esm/components/ui/Photo.js

@@ -822,13 +822,34 @@ export default class Photo extends PSViewer {
 	}
 
 	/**
-	 * Enable or disable higher contrast on picture
+	 * Enable or disable higher contrast on picture.
+	 * Equivalent to setContrast(1) (or 0 to disable).
 	 * @param {boolean} enable True to enable higher contrast
 	 * @memberof Panoramax.components.ui.Photo#
 	 */
 	setHigherContrast(enable) {
-		this.renderer.renderer.toneMapping = enable ? 3 : 0;
-		this.renderer.renderer.toneMappingExposure = enable ? 2 : 1;
+		this.setContrast(enable ? 1 : 0);
+	}
+
+	/**
+	 * Change picture contrast
+	 * @param {number} value Set to 0 to have original, -1 to lower, +1 to higher
+	 * @memberof Panoramax.components.ui.Photo#
+	 */
+	setContrast(value) {
+		switch(value) {
+			case -1:
+				this.renderer.renderer.toneMapping = 3;
+				this.renderer.renderer.toneMappingExposure = 0.3;
+				break;
+			case 1:
+				this.renderer.renderer.toneMapping = 3;
+				this.renderer.renderer.toneMappingExposure = 1.7;
+				break;
+			default:
+				this.renderer.renderer.toneMapping = 0;
+				this.renderer.renderer.toneMappingExposure = 1;
+		}
 		this.needsUpdate();
 	}
 

package/build/esm/translations/en.json

@@ -158,6 +158,8 @@
         "map_theme_score": "Quality score",
         "map_theme_gps": "Location precision",
         "contrast": "Enable higher image contrast",
+        "low_contrast": "Lower image contrast",
+        "reset_contrast": "Reset image contrast",
         "metadata": "Picture metadata",
         "metadata_summary": "Summary",
         "metadata_general_copy_id": "Copy ID",

package/build/esm/translations/fr.json

@@ -158,6 +158,8 @@
         "map_theme_score": "Score de qualité",
         "map_theme_gps": "Précision du positionnement",
         "contrast": "Augmenter le contraste de l'image",
+        "low_contrast": "Diminuer le contraste de l'image",
+        "reset_contrast": "Rétablir le contraste de l'image",
         "metadata": "Métadonnées de la photo",
         "metadata_summary": "Résumé",
         "metadata_general_copy_id": "Copier l'ID",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "5.1.1-develop-f7f14900",
+  "version": "5.1.1-develop-942a7005",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "./build/cjs/index.js",
   "module": "./build/esm/index.js",