Changeset 1102 for trunk/src/org/apollo/meldex/Transcriber.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/apollo/meldex/Transcriber.java (modified) (7 diffs)

trunk/src/org/apollo/meldex/Transcriber.java

@@ -4 +4 @@
 import java.util.ArrayList;
 
-@SuppressWarnings("unchecked") // code in java 1.4
 public class Transcriber
 {
@@ -255 +254 @@
     {
         // Pitch track the note
-        ArrayList pitchData = pitchTracker.process(data, length, sampleRate);
+        ArrayList<PitchValue> pitchData = pitchTracker.process(data, length, sampleRate);
 
         // Average the pitch data
@@ -265 +264 @@
 
 
-    private int averagePitchData(ArrayList pitchData)
+    private int averagePitchData(ArrayList<PitchValue> pitchData)
     {
         // Loop through the pitch values...
         int i = 0, k = 0;
         while (i < (pitchData.size() - 1)) {
-            int startPos = ((PitchValue) pitchData.get(i)).position;
-            double period = ((PitchValue) pitchData.get(i)).period;
+            int startPos = pitchData.get(i).position;
+            double period = pitchData.get(i).period;
             double averagePeriod = period;
-            double runningPeriod = ((PitchValue) pitchData.get(i+1)).position - startPos;
+            double runningPeriod = pitchData.get(i+1).position - startPos;
             double numPeriods = runningPeriod / period;
 
@@ -280 +279 @@
             while ((i+j) < (pitchData.size() - 1)) {
                 // Get the next pitch estimate
-                period = ((PitchValue) pitchData.get(i+j)).period;
-                int position = ((PitchValue) pitchData.get(i+j)).position;
+                period = pitchData.get(i+j).period;
+                int position = pitchData.get(i+j).position;
 
                 // Make sure that this period is covered by the average so far
@@ -289 +288 @@
 
                 // Stop if we have covered more than 20 msec
-                int nextPos = ((PitchValue) pitchData.get(i+j+1)).position;
+                int nextPos = pitchData.get(i+j+1).position;
                 // if ((nextPos - startPos) >= 445) {  // !! PURE-ROG !!
                 if ((nextPos - startPos) >= (sampleRate * 0.02)) {
@@ -315 +314 @@
 
 
-    private int calculateHistogram(ArrayList data, int length)
+    private int calculateHistogram(ArrayList<PitchValue> data, int length)
     {
         // This probably shouldn't be a constant
@@ -328 +327 @@
         // Calculate the histogram data
         for (int i = 0; i < (length - 1); i++) {
-            double period = ((PitchValue) data.get(i)).period;
-            double position = ((PitchValue) data.get(i)).position;
-            double periodLength = ((PitchValue) data.get(i+1)).position - position;
+            double period = data.get(i).period;
+            double position = data.get(i).position;
+            double periodLength = data.get(i+1).position - position;
 
             // We only need to do this if the pitch does not equal zero