speaker-calibration 2.2.3 → 2.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speaker-calibration",
-  "version": "2.2.3",
+  "version": "2.2.6",
   "description": "Speaker calibration library for auditory testing",
   "main": "dist/main.js",
   "directories": {

package/src/peer-connection/speaker.js

@@ -9,6 +9,7 @@ import {
 
 import database from '../config/firebase';
 import {ref, set, get, child} from 'firebase/database';
+import {phrases} from '../../dist/example/i18n';
 
 /**
  * @class Handles the speaker's side of the connection. Responsible for initiating the connection,
@@ -31,6 +32,9 @@ class Speaker extends AudioPeer {
     this.result = null;
     this.debug = params?.debug ?? false;
     this.isSmartPhone = params?.isSmartPhone ?? false;
+    this.instructionDisplayId = params?.instructionDisplayId ?? '';
+    this.titleDisplayId = params?.titleDisplayId ?? '';
+    this.timeToCalibrate = params?.timeToCalibrate ?? 10;
 
     /* Set up callbacks that handle any events related to our peer object. */
     this.peer.on('open', this.#onPeerOpen);
@@ -215,6 +219,40 @@ class Speaker extends AudioPeer {
     spinner.role = 'status';
     spinner.ariaHidden = 'true';
     document.getElementById(this.targetElement).appendChild(spinner);
+
+    // clear instructionDisplay
+    const instructionDisplay = document.getElementById(this.instructionDisplayId);
+    const background = document.getElementById('background'); // todo: get background id from params
+    if (instructionDisplay) {
+      instructionDisplay.innerHTML = '';
+      instructionDisplay.style.whiteSpace = 'nowrap';
+      instructionDisplay.style.fontWeight = 'bold';
+      instructionDisplay.style.width = 'fit-content';
+      instructionDisplay.innerHTML = phrases.RC_soundRecording['en-US'];
+      let fontSize = 100;
+      instructionDisplay.style.fontSize = fontSize + 'px';
+      while (instructionDisplay.scrollWidth > background.scrollWidth * 0.9 && fontSize > 10) {
+        fontSize--;
+        instructionDisplay.style.fontSize = fontSize + 'px';
+      }
+      const p = document.createElement('p');
+      // font size
+      p.style.fontSize = '1.1rem';
+      p.style.fontWeight = 'normal';
+      p.style.paddingTop = '20px';
+      const timeToCalibrateText = phrases.RC_howLongToCalibrate['en-US'];
+      p.innerHTML = timeToCalibrateText.replace('111', this.timeToCalibrate);
+      instructionDisplay.appendChild(p);
+    }
+
+    // Update title - titleDisplayId
+    const titleDisplay = document.getElementById(this.titleDisplayId);
+    if (titleDisplay) {
+      // replace 2 with 3
+      titleDisplay.innerHTML = titleDisplay.innerHTML.replace('2', '3');
+      // replace 1 with 3
+      titleDisplay.innerHTML = titleDisplay.innerHTML.replace('1', '3');
+    }
   };
 
   #removeUIElems = () => {

package/src/tasks/combination/combination.js

@@ -342,7 +342,9 @@ class Combination extends AudioCalibrator {
     this.stepNum += 1;
     console.log('await desired length ' + this.stepNum);
     this.status =
-      `All Hz Calibration: sampling the calibration signal...`.toString() + this.generateTemplate();
+      `All Hz Calibration: sampling the calibration signal...`.toString() +
+      `\n iteration Count: ${this.stepNum}` +
+      this.generateTemplate();
     this.emit('update', {
       message: this.status,
     });
@@ -356,7 +358,10 @@ class Combination extends AudioCalibrator {
     this.stepNum += 1;
     console.log('await desired length ' + this.stepNum);
     this.status =
-      `All Hz Calibration: sampling the calibration signal...`.toString() + this.generateTemplate();
+      `All Hz Calibration: sampling the calibration signal...`.toString() +
+      `\n iteration Count: ${this.stepNum}`;
+    +this.generateTemplate();
+
     this.emit('update', {
       message: this.status,
     });