Updated model

Mattk70 · Mar 18, 2022 · 0895e01 · 0895e01
1 parent 4ff8ffe
commit 0895e01
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 21 deletions.
diff --git a/24000_v5/group1-shard1of7.bin b/24000_v5/group1-shard1of7.bin
diff --git a/24000_v5/group1-shard2of7.bin b/24000_v5/group1-shard2of7.bin
diff --git a/24000_v5/group1-shard3of7.bin b/24000_v5/group1-shard3of7.bin
diff --git a/24000_v5/group1-shard4of7.bin b/24000_v5/group1-shard4of7.bin
diff --git a/24000_v5/group1-shard5of7.bin b/24000_v5/group1-shard5of7.bin
diff --git a/24000_v5/group1-shard6of7.bin b/24000_v5/group1-shard6of7.bin
diff --git a/24000_v5/group1-shard7of7.bin b/24000_v5/group1-shard7of7.bin
diff --git a/24000_v5/model.json b/24000_v5/model.json
diff --git a/256x384_model/group1-shard1of7.bin b/256x384_model/group1-shard1of7.bin
diff --git a/256x384_model/group1-shard2of7.bin b/256x384_model/group1-shard2of7.bin
diff --git a/256x384_model/group1-shard3of7.bin b/256x384_model/group1-shard3of7.bin
diff --git a/256x384_model/group1-shard4of7.bin b/256x384_model/group1-shard4of7.bin
diff --git a/256x384_model/group1-shard5of7.bin b/256x384_model/group1-shard5of7.bin
diff --git a/256x384_model/group1-shard6of7.bin b/256x384_model/group1-shard6of7.bin
diff --git a/256x384_model/group1-shard7of7.bin b/256x384_model/group1-shard7of7.bin
diff --git a/256x384_model/model.json b/256x384_model/model.json
diff --git a/Help/keyboard.html b/Help/keyboard.html
@@ -8,7 +8,7 @@
 
 <table class="table table-hover p-1">
     <tr>
-        <td colspan="2" class="text-center"><h5>File handling</h5></td>
+        <td colspan="2" class="text-center bg-dark text-white"><h5>File handling</h5></td>
     </tr>
     <tr>
         <td><b>Ctrl-O</b></td>
@@ -23,7 +23,7 @@
         <td>Abort an operation. Effective for file loading and analysis</td>
     </tr>
     <tr>
-        <td colspan="2" class="text-center"><h5>Transport Controls</h5></td>
+        <td colspan="2" class="text-center bg-dark text-white"><h5>Transport Controls</h5></td>
     </tr>
     <tr>
         <td><b>SpaceBar</b></td>
@@ -57,6 +57,14 @@
         <td><b>Right arrow (<)</b></td>
         <td>Move the playhead backward. Can also be used to shift the screen view if a call is cut off at the screen edges</td>
     </tr>
+    <tr>
+        <td><b>Ctrl+ / + </b></td>
+        <td>Zoom in on the spectrogram. When zooming, Chirpity automatically adjusts the STFT window size to optimize the spectral resolution</td>
+    </tr>
+    <tr>
+        <td><b>Right arrow (<)</b></td>
+        <td>Zoom out the spectrogram. When zooming, Chirpity automatically adjusts the STFT window size to optimize the spectral resolution</td>
+    </tr>
 </table>
 
 </body>

diff --git a/Help/options.html b/Help/options.html
@@ -8,7 +8,7 @@
 
 <table class="table table-hover p-1">
     <tr>
-        <td colspan="2" class="text-center"><h5>Model options</h5></td>
+        <td colspan="2" class="text-center bg-dark text-white"><h5>Model options</h5></td>
     </tr>
     <tr>
         <td><b>Use whitelist</b></td>
@@ -33,7 +33,7 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2" class="text-center"><h5>Spectrogram options</h5></td>
+        <td colspan="2" class="text-center bg-dark text-white"><h5>Spectrogram options</h5></td>
     </tr>
     <tr>
         <td><b>Enable</b></td>

diff --git a/Help/usage.html b/Help/usage.html
@@ -5,7 +5,7 @@
     <title>Chirpity Nocmig usage guide</title>
 </head>
 <body>
-<h4 class="text-center">Suggested Workflow</h4>
+<h4 class="text-center bg-dark text-white p-3">Suggested Workflow</h4>
 <ol>
     <li>Open an audio file. Ideally, this will be the file that was recorded by your digital recorder with its original
         timestamp. By using this file, you will be able to take advantage of the <b>Options > Spectrogram >

diff --git a/README.md b/README.md
@@ -94,6 +94,6 @@ After that, we can export the app with:
 npm run export
 ```
 
-The resulting application will be saves in the "packages" folder.
+The resulting application will be saved in the "packages" folder.
 
 
diff --git a/index.html b/index.html
@@ -136,7 +136,7 @@
                     <a class="dropdown-item" id="usage" href="#">Usage</a>
                     <a class="dropdown-item" id="options" href="#">Options</a>
                     <a class="dropdown-item" id="keyboard" href="#">Keyboard Shortcuts</a>
-                    <a class="dropdown-item" id="about" href="#">About Chirpity Nocmig</a>
+                    <a class="dropdown-item disabled" id="about" href="#">About Chirpity Nocmig</a>
                 </div>
             </li>
         </ul>

diff --git a/js/model.js b/js/model.js
diff --git a/js/ui.js b/js/ui.js
@@ -1041,6 +1041,31 @@ const GLOBAL_ACTIONS = { // eslint-disable-line
     KeyP: function () {
         (typeof region !== 'undefined') ? region.play() : console.log('Region undefined')
     }
+    ,
+    Equal: function () {
+        if (wavesurfer) {
+            zoomSpecIn()
+        }
+    }
+    ,
+    NumpadAdd: function () {
+        if (wavesurfer) {
+            zoomSpecIn()
+        }
+    }
+        ,
+    Minus: function () {
+        if (wavesurfer) {
+            zoomSpecOut()
+        }
+    }
+    ,
+    NumpadSubtract: function () {
+        if (wavesurfer) {
+            zoomSpecOut()
+        }
+    }
+
 };
 
 
@@ -1450,24 +1475,24 @@ function iconizeScore(score) {
 
 // Help content handling
 
-$('#keyboard').on('click',function(){
+$('#keyboard').on('click', function () {
     $('#helpModalLabel').text('Keyboard shortcuts');
-    $('#helpModalBody').load('Help/keyboard.html', function(){
-        $('#helpModal').modal({show:true});
+    $('#helpModalBody').load('Help/keyboard.html', function () {
+        $('#helpModal').modal({show: true});
     });
 });
 
-$('#options').on('click',function(){
+$('#options').on('click', function () {
     $('#helpModalLabel').text('Options Help');
-    $('#helpModalBody').load('Help/options.html', function(){
-        $('#helpModal').modal({show:true});
+    $('#helpModalBody').load('Help/options.html', function () {
+        $('#helpModal').modal({show: true});
     });
 });
 
-$('#usage').on('click',function(){
+$('#usage').on('click', function () {
     $('#helpModalLabel').text('Usage Guide');
-    $('#helpModalBody').load('Help/usage.html', function(){
-        $('#helpModal').modal({show:true});
+    $('#helpModalBody').load('Help/usage.html', function () {
+        $('#helpModal').modal({show: true});
     });
 });
 

diff --git a/js/worker.js b/js/worker.js
@@ -2,7 +2,7 @@ const {ipcRenderer} = require('electron');
 const Model = require('./js/model.js');
 const AudioBufferSlice = require('./js/AudioBufferSlice.js');
 //let appPath = '../256x384_model/';
-let appPath = '../24000_v5/';
+let appPath = '../24000_v7/';
 const lamejs = require("lamejstmp");
 const ID3Writer = require('browser-id3-writer');
 const path = require("path");