Changeset 35649

Timestamp:

2021-10-20T15:23:18+13:00 (3 years ago)

Author:

cstephen

Message:

Snap words back to shadow on collision edit.

File:

• main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/components/WordTimingSelector.vue (modified) (9 diffs)

main/trunk/model-interfaces-dev/atea/korero-maori-asr/src/components/WordTimingSelector.vue

@@ -303 +303 @@
         },
 
+        /**
+         * Handles the document.onmousemove event.
+         * @param {MouseEvent} event The mouse event.
+         */
         onDocumentMouseMove(event) {
-            if (this.canAdjustWordStartTime) {
-                this.onMinHandleMouseMove(event);
-            }
-            else if (this.canAdjustWordEndTime) {
-                this.onMaxHandleMouseMove(event);
-            }
-        },
-        /**
-         * @param {MouseEvent} event
-         */
-        onMinHandleMouseMove(event) {
             if (event.buttons < 1) {
                 return;
             }
 
-            this.adjustWordStartTime(event.movementX);
-
-            this.emitWordUpdates(this.mySurroundingWords);
-        },
-        onMaxHandleMouseMove(event) {
-            if (event.buttons < 1) {
-                return;
-            }
-
-            this.adjustWordEndTime(event.movementX);
+            if (this.canAdjustWordStartTime) {
+                this.adjustWordStartTime(event.movementX);
+            }
+            else if (this.canAdjustWordEndTime) {
+                this.adjustWordEndTime(event.movementX);
+            }
 
             this.emitWordUpdates(this.mySurroundingWords);
@@ -338 +327 @@
 
         adjustWordStartTime(amount) {
+            /** @type {Word} */
             const word = this.myWord;
+            /** @type {Word} */
+            const previousWord = this.wordIndex === 0
+                ? null
+                : this.mySurroundingWords[this.wordIndex - 1];
+
             word.left += amount;
             word.length -= amount;
 
             if (amount < 0) {
+                // Prevent the first word from being expanded to a time less than zero.
                 if (this.wordIndex === 0) {
                     if (word.left > 0) {
@@ -353 +349 @@
                 }
                 else {
-                    // Adjust previous word
-                    const previousWord = this.mySurroundingWords[this.wordIndex - 1];
-
+                    // Check if we've encroached on the previous word
                     if (word.left > previousWord.right()) {
                         return;
@@ -361 +355 @@
 
                     previousWord.length += amount;
+
+                    // Ensure the previous word is at least 0.1s in length
                     const leftBoundary = previousWord.left + this.scaleTime(0.1);
-
                     if (previousWord.right() > leftBoundary) {
                         return;
@@ -374 +369 @@
             }
             else {
+                // Prevent the word from being shrunk beyond 0.1s length
                 const rightBoundary = word.right() - this.scaleTime(0.1);
                 if (word.left > rightBoundary) {
@@ -380 +376 @@
                     word.length += diff;
                 }
+
+                // If we were touching the previous word, drag it up till it reaches it's original length
+                if (previousWord !== null && word.left - amount - 1 <= previousWord.right()) {
+                    previousWord.length += amount;
+
+                    const shadow = this.shadowWords[this.wordIndex - 1];
+                    if (previousWord.right() > shadow.right()) {
+                        const diff = previousWord.right() - shadow.right();
+                        previousWord.length -= diff;
+                    }
+                }
             }
         },
         adjustWordEndTime(amount) {
+            /** @type {Word} */
             const word = this.myWord;
+            /** @type {Word} */
+            const nextWord = this.wordIndex === this.mySurroundingWords.length - 1
+                ? null
+                : this.mySurroundingWords[this.wordIndex + 1];
+
             word.length += amount;
 
             if (amount > 0) {
+                // Prevent the last word from being expanded beyond the length of the audio.
                 if (this.wordIndex === this.mySurroundingWords.length - 1) {
                     const rightBoundary = this.scaleTime(this.audioSnippetLength);
@@ -398 +412 @@
                 }
                 else {
-                    const nextWord = this.mySurroundingWords[this.wordIndex + 1];
-
+                    // Check if we've encroached on the next word
                     if (word.right() < nextWord.left) {
                         return;
@@ -407 +420 @@
                     nextWord.length -= amount;
 
+                    // Ensure that the next word is at least 0.1s in length
                     const rightBoundary = nextWord.right() - this.scaleTime(0.1);
-
                     if (nextWord.left < rightBoundary) {
                         return;
@@ -420 +433 @@
             }
             else {
+                // Prevent the word from being shrunk beyond 0.1s length
                 const leftBoundary = word.left + this.scaleTime(0.1);
                 if (word.right() < leftBoundary) {
                     const diff = leftBoundary - word.right();
                     word.length += diff;
+                }
+
+                // If we were touching the next word, drag it back till it reaches it's original length
+                if (nextWord !== null && word.right() - amount + 1 >= nextWord.left) {
+                    nextWord.left += amount;
+                    nextWord.length -= amount;
+
+                    const shadow = this.shadowWords[this.wordIndex + 1];
+                    if (nextWord.left < shadow.left) {
+                        const diff = shadow.left - nextWord.left;
+                        nextWord.length -= diff;
+                        nextWord.left += diff;
+                    }
                 }
             }