Merge pull request #1482 from rvilarl/fix/clefCodeAndTempoNotes

Fix/clef code and tempo notes

Author: rvilarl

src/clef.ts

@@ -78,7 +78,7 @@ export class Clef extends StaveModifier {
         point: 0,
       },
       percussion: {
-        code: 'restMaxima',
+        code: 'unpitchedPercussionClef1',
         line: 2,
         point: 0,
       },

src/stavetempo.ts

@@ -100,7 +100,7 @@ export class StaveTempo extends StaveModifier {
 
       x += 3 * scale;
       Glyph.renderGlyph(ctx, x, y, options.glyph_font_scale, glyphProps.code_head);
-      x += glyphProps.getWidth ? glyphProps.getWidth() : 0 * scale;
+      x += Glyph.getWidth(glyphProps.code_head, options.glyph_font_scale);
 
       // Draw stem and flags
       if (glyphProps.stem) {

tools/visual_regression.sh

@@ -22,9 +22,8 @@
 #  The optional argument allows you to compare a subset of the images
 #  (only those with names starting with the specified prefix).
 #
-#  Check build/images/diff/results.txt for results. This file is sorted
-#  by PHASH difference (most different files on top.) The composite diff
-#  images for failed tests (i.e., PHASH > 1.0) are stored in build/images/diff.
+#  Check build/images/diff/results.txt for results. The composite diff
+#  images for failed tests are stored in build/images/diff.
 #
 
 # PNG viewer on OSX. Switch this to whatever your system uses.
@@ -36,10 +35,6 @@ LC_NUMERIC="en_US.UTF-8"
 # Check ImageMagick installation
 command -v convert >/dev/null 2>&1 || { echo >&2 "Error: ImageMagick not found."; exit 1; }
 
-# Show images over this PHASH threshold. This is probably too low, but
-# a good first pass.
-THRESHOLD=0.01
-
 # Directories. You might want to change BASE, if you're running from a
 # different working directory.
 BASE=.
@@ -110,7 +105,7 @@ if [ -n "$NPROC" ]; then
   nproc=$NPROC
 fi
 
-echo "Running $totalImagesA tests with threshold $THRESHOLD (nproc=$nproc)..."
+echo "Running $totalImagesA tests (nproc=$nproc)..."
 
 function ProgressBar {
     let _progress=(${1}*100/${2}*100)/100
@@ -142,37 +137,24 @@ function diff_image() {
   fi
 
   # If the two files are byte-for-byte identical, skip the image comparison below.
-  cmp -s $fileA $fileB && echo $name "0" >$diff.pass && return
+  cmp -s $fileA $fileB && return
 
   cp $fileA $diff-a.png
   cp $fileB $diff-b.png
 
-  # Calculate the difference metric and store the composite diff image.
-  local hash=`compare -metric PHASH -highlight-color '#ff000050' $diff-b.png $diff-a.png $diff-diff.png 2>&1`
-
-  # Remove scientific notation
-  local hash6=`printf "%.6f" $hash`
-  local THRESHOLD6=`printf "%.6f" $THRESHOLD`
-
-  local isGT=`echo "$hash6 > $THRESHOLD6" | bc -l`
-  if [ "$isGT" == "1" ]
-  then
-    # Add the result to results.text
-    echo $name $hash >$diff.fail
-    # Threshold exceeded, save the diff and the original, current
-    cp $diff-diff.png $DIFF/$name.png
-    cp $diff-a.png $DIFF/$name'_'$ANAME.png
-    cp $diff-b.png $DIFF/$name'_'$BNAME.png
-    echo
-    echo "Test: $name"
-    echo "  PHASH value exceeds threshold: $hash > $THRESHOLD"
-    echo "  Image diff stored in $DIFF/$name.png"
-    # $VIEWER "$diff-diff.png" "$diff-a.png" "$diff-b.png"
-    # echo 'Hit return to process next image...'
-    # read
-  else
-    echo $name $hash >$diff.pass
-  fi
+  # Store the composite diff image.
+  # Add the result to results.text
+  echo $name >$diff.fail
+  # Threshold exceeded, save the diff and the original, current
+  cp $diff-diff.png $DIFF/$name.png
+  cp $diff-a.png $DIFF/$name'_'$ANAME.png
+  cp $diff-b.png $DIFF/$name'_'$BNAME.png
+  echo
+  echo "Test: $name"
+  echo "  Image diff stored in $DIFF/$name.png"
+  # $VIEWER "$diff-diff.png" "$diff-a.png" "$diff-b.png"
+  # echo 'Hit return to process next image...'
+  # read
   rm -f $diff-a.png $diff-b.png $diff-diff.png
 }
 
@@ -219,18 +201,15 @@ cat $BDIR/*.fail 1>$RESULTS.fail 2>/dev/null
 num_fails=`cat $RESULTS.fail | wc -l`
 rm -f  $BDIR/*.fail
 
-# Sort results by PHASH
-sort -r -n -k 2 $RESULTS.fail >$RESULTS
-sort -r -n -k 2 $BDIR/*.pass 1>>$RESULTS 2>/dev/null
+# Sort results
+sort $RESULTS.fail >$RESULTS
 
 # The previous cleanup approach (rm -f) triggered the error: Argument list too long.
-find $BDIR -name '*-temp.pass' -type f -delete
 rm -f $RESULTS.fail
 
 echo
 echo Results stored in $DIFF/results.txt
-echo All images with a difference over threshold, $THRESHOLD, are
-echo available in $DIFF, sorted by perceptual hash.
+echo All images with a difference, are available in $DIFF.
 echo
 
 if [ "$num_warnings" -gt 0 ]
@@ -245,5 +224,5 @@ then
   echo "You have $num_fails fail(s):"
   head -n $num_fails $RESULTS
 else
-  echo "Success - All diffs under threshold!"
+  echo "Success - No differences!"
 fi