Fix Logging

src/Common/logging.ts

@@ -10,4 +10,10 @@ export class Logging {
     public static log(...args: any[]): void {
         console.log("[OSMD] ", args.join(" "));
     }
+    public static error(...args: any[]): void {
+        console.error("[OSMD] ", args.join(" "));
+    }
+    public static warn(...args: any[]): void {
+        console.warn("[OSMD] ", args.join(" "));
+    }
 }

src/MusicalScore/Graphical/EngravingRules.ts

@@ -1,6 +1,6 @@
 import {PagePlacementEnum} from "./GraphicalMusicPage";
 //import {MusicSymbol} from "./MusicSymbol";
-import {Logging} from "../../Common/logging";
+import {Logging} from "../../Common/Logging";
 
 export class EngravingRules {
     private static rules: EngravingRules;

src/MusicalScore/Graphical/GraphicalMusicSheet.ts

@@ -18,7 +18,7 @@ import {Instrument} from "../Instrument";
 import {BoundingBox} from "./BoundingBox";
 import {Note} from "../VoiceData/Note";
 import {MusicSheetCalculator} from "./MusicSheetCalculator";
-import {Logging} from "../../Common/logging";
+import {Logging} from "../../Common/Logging";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
 import {CollectionUtil} from "../../Util/collectionUtil";
 import {SelectionStartSymbol} from "./SelectionStartSymbol";

src/MusicalScore/Graphical/MusicSheetCalculator.ts

@@ -49,7 +49,7 @@ import {AccidentalCalculator} from "./AccidentalCalculator";
 import {MidiInstrument} from "../VoiceData/Instructions/ClefInstruction";
 import {Staff} from "../VoiceData/Staff";
 import {OctaveShift} from "../VoiceData/Expressions/ContinuousExpressions/octaveShift";
-import {Logging} from "../../Common/logging";
+import {Logging} from "../../Common/Logging";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
 import {CollectionUtil} from "../../Util/collectionUtil";
 
@@ -266,12 +266,12 @@ export abstract class MusicSheetCalculator {
     }
 
     protected clearRecreatedObjects(): void {
-        Logging.log("clearRecreatedObjects not implemented");
+        Logging.debug("clearRecreatedObjects not implemented");
     }
 
     protected handleStaffEntryLink(graphicalStaffEntry: GraphicalStaffEntry,
                                    staffEntryLinks: StaffEntryLink[]): void {
-        Logging.log("handleStaffEntryLink not implemented");
+        Logging.debug("handleStaffEntryLink not implemented");
     }
 
     protected calculateMusicSystems(): void {
@@ -396,19 +396,19 @@ export abstract class MusicSheetCalculator {
     }
 
     protected updateSkyBottomLine(staffLine: StaffLine): void {
-        Logging.log("updateSkyBottomLine not implemented");
+        Logging.debug("updateSkyBottomLine not implemented");
     }
 
     protected calculateSkyBottomLine(staffLine: StaffLine): void {
-        Logging.log("calculateSkyBottomLine not implemented");
+        Logging.debug("calculateSkyBottomLine not implemented");
     }
 
     protected calculateMarkedAreas(): void {
-        Logging.log("calculateMarkedAreas not implemented");
+        Logging.debug("calculateMarkedAreas not implemented");
     }
 
     protected calculateComments(): void {
-        Logging.log("calculateComments not implemented");
+        Logging.debug("calculateComments not implemented");
     }
 
     protected optimizeStaffLineDynamicExpressionsPositions(): void {

src/MusicalScore/Graphical/VexFlow/VexFlowMeasure.ts

@@ -14,7 +14,7 @@ import {GraphicalNote} from "../GraphicalNote";
 import {GraphicalStaffEntry} from "../GraphicalStaffEntry";
 import StaveConnector = Vex.Flow.StaveConnector;
 import StaveNote = Vex.Flow.StaveNote;
-import {Logging} from "../../../Common/logging";
+import {Logging} from "../../../Common/Logging";
 
 export class VexFlowMeasure extends StaffMeasure {
     constructor(staff: Staff, staffLine: StaffLine = undefined, sourceMeasure: SourceMeasure = undefined) {

src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator.ts

@@ -26,6 +26,7 @@ import {VexFlowMeasure} from "./VexFlowMeasure";
 import {VexFlowTextMeasurer} from "./VexFlowTextMeasurer";
 
 import Vex = require("vexflow");
+import {Logging} from "../../../Common/Logging";
 
 export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
     constructor() {
@@ -77,7 +78,7 @@ export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
                 }
             }
             if (voices.length === 0) {
-                console.warn("Found a measure with no voices... Continuing anyway.", mvoices);
+                Logging.warn("Found a measure with no voices... Continuing anyway.", mvoices);
                 continue;
             }
             formatter.joinVoices(voices);

src/MusicalScore/MusicParts/MusicPartManagerIterator.ts

@@ -14,7 +14,7 @@ import {ContinuousDynamicExpression} from "../VoiceData/Expressions/ContinuousEx
 import {InstantaniousDynamicExpression} from "../VoiceData/Expressions/instantaniousDynamicExpression";
 import {MultiTempoExpression} from "../VoiceData/Expressions/multiTempoExpression";
 import {AbstractExpression} from "../VoiceData/Expressions/abstractExpression";
-import {Logging} from "../../Common/logging";
+import {Logging} from "../../Common/Logging";
 
 export class MusicPartManagerIterator {
     constructor(manager: MusicPartManager, startTimestamp?: Fraction, endTimestamp?: Fraction) {

src/MusicalScore/MusicSheet.ts

@@ -16,6 +16,7 @@ import {EngravingRules} from "./Graphical/EngravingRules";
 import {NoteState} from "./Graphical/DrawingEnums";
 import {Note} from "./VoiceData/Note";
 import {VoiceEntry} from "./VoiceData/VoiceEntry";
+import {Logging} from "../Common/Logging";
 
 // FIXME
 //type MusicSheetParameters = any;
@@ -387,7 +388,7 @@ export class MusicSheet /*implements ISettableMusicSheet, IComparable<MusicSheet
         try {
             return this.getFirstSourceMeasure().MeasureNumber;
         } catch (ex) {
-            console.log(/* FIXME LogLevel.NORMAL, */ "MusicSheet.FirstMeasureNumber: ", ex);
+            Logging.log("MusicSheet.FirstMeasureNumber: ", ex);
             return 0;
         }
 
@@ -396,7 +397,7 @@ export class MusicSheet /*implements ISettableMusicSheet, IComparable<MusicSheet
         try {
             return this.getLastSourceMeasure().MeasureNumber;
         } catch (ex) {
-            console.log(/* FIXME LogLevel.NORMAL, */ "MusicSheet.LastMeasureNumber: ", ex);
+            Logging.log("MusicSheet.LastMeasureNumber: ", ex);
             return 0;
         }
 

src/MusicalScore/MusicSource/Repetition.ts

@@ -4,6 +4,7 @@ import {Fraction} from "../../Common/DataObjects/fraction";
 import {MusicSheet} from "../MusicSheet";
 import {RepetitionInstruction} from "../VoiceData/Instructions/RepetitionInstruction";
 import {PartListEntry} from "./PartListEntry";
+import {Logging} from "../../Common/Logging";
 
 export class Repetition extends PartListEntry /*implements IRepetition*/ {
     constructor(musicSheet: MusicSheet, virtualOverallRepetition: boolean) {
@@ -83,7 +84,7 @@ export class Repetition extends PartListEntry /*implements IRepetition*/ {
                     this.numberOfEndings = endingNumber;
                 }
             } catch (err) {
-                console.log("Repetition: Exception."); // FIXME
+                Logging.error("Repetition: Exception.", err);
             }
 
         }

src/MusicalScore/ScoreIO/InstrumentReader.ts

@@ -17,7 +17,7 @@ import {RhythmSymbolEnum} from "../VoiceData/Instructions/RhythmInstruction";
 import {KeyEnum} from "../VoiceData/Instructions/KeyInstruction";
 import {IXmlAttribute} from "../../Common/FileIO/Xml";
 import {ChordSymbolContainer} from "../VoiceData/ChordSymbolContainer";
-import {Logging} from "../../Common/logging";
+import {Logging} from "../../Common/Logging";
 import {MidiInstrument} from "../VoiceData/Instructions/ClefInstruction";
 //import Dictionary from "typescript-collections/dist/lib/Dictionary";
 

src/MusicalScore/ScoreIO/MusicSheetReader.ts

@@ -6,7 +6,7 @@ import {IXmlElement} from "../../Common/FileIO/Xml";
 import {Instrument} from "../Instrument";
 import {ITextTranslation} from "../Interfaces/ITextTranslation";
 import {MusicSheetReadingException} from "../Exceptions";
-import {Logging} from "../../Common/logging";
+import {Logging} from "../../Common/Logging";
 import {IXmlAttribute} from "../../Common/FileIO/Xml";
 import {RhythmInstruction} from "../VoiceData/Instructions/RhythmInstruction";
 import {RhythmSymbolEnum} from "../VoiceData/Instructions/RhythmInstruction";
@@ -118,11 +118,8 @@ export class MusicSheetReader /*implements IMusicSheetReader*/ {
         }
 
         let partInst: IXmlElement[] = root.elements("part");
-        console.log(partInst.length + " parts");
         let partList: IXmlElement[] = partlistNode.elements();
-        //Logging.debug("Starting initializeReading");
         this.initializeReading(partList, partInst, instrumentReaders);
-        //Logging.debug("Done initializeReading");
         let couldReadMeasure: boolean = true;
         this.currentFraction = new Fraction(0, 1);
         let guitarPro: boolean = false;

src/MusicalScore/ScoreIO/VoiceGenerator.ts

@@ -22,7 +22,7 @@ import {NoteEnum} from "../../Common/DataObjects/pitch";
 import {Staff} from "../VoiceData/Staff";
 import {StaffEntryLink} from "../VoiceData/StaffEntryLink";
 import {VerticalSourceStaffEntryContainer} from "../VoiceData/VerticalSourceStaffEntryContainer";
-import {Logging} from "../../Common/logging";
+import {Logging} from "../../Common/Logging";
 import {Pitch} from "../../Common/DataObjects/pitch";
 import {IXmlAttribute} from "../../Common/FileIO/Xml";
 import {CollectionUtil} from "../../Util/collectionUtil";

src/MusicalScore/SubInstrument.ts

@@ -1,5 +1,6 @@
 import {Instrument} from "./Instrument";
 import {MidiInstrument} from "./VoiceData/Instructions/ClefInstruction";
+import {Logging} from "../Common/Logging";
 
 export class SubInstrument {
     constructor(parentInstrument: Instrument) {
@@ -107,7 +108,7 @@ export class SubInstrument {
                 }
             }
         } catch (e) {
-            console.log("Error parsing MIDI Instrument. Default to Grand Piano."); // FIXME
+            Logging.error("Error parsing MIDI Instrument. Default to Grand Piano.");
         }
         return "unnamed";
     }

src/MusicalScore/VoiceData/Expressions/instantaniousDynamicExpression.ts

@@ -3,7 +3,7 @@ import {MultiExpression} from "./multiExpression";
 import {DynamicExpressionSymbolEnum} from "./dynamicExpressionSymbolEnum";
 //import {ArgumentOutOfRangeException} from "../../Exceptions";
 import {InvalidEnumArgumentException} from "../../Exceptions";
-import {Logging} from "../../../Common/logging";
+import {Logging} from "../../../Common/Logging";
 
 export class InstantaniousDynamicExpression extends AbstractExpression {
     constructor(dynamicExpression: string, soundDynamics: number, placement: PlacementEnum, staffNumber: number) {

test/Common/DataObjects/fraction_Test.ts

@@ -3,6 +3,7 @@
  */
 import { Fraction } from "../../../src/Common/DataObjects/fraction";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
+import {Logging} from "../../../src/Common/Logging";
 
 describe("Fraction Unit Tests:", () => {
     describe("Construct Fraction, check properties", () => {
@@ -57,7 +58,7 @@ describe("Fraction Unit Tests:", () => {
                 let value: Fraction = values[i];
 
                 //console.log(values[i].toString() + "== " + dict.getValue(key));
-                console.log(values[i].toString() + "== " + dict.getValue(new Fraction(key.Numerator, key.Denominator)));
+                Logging.debug(values[i].toString() + "== " + dict.getValue(new Fraction(key.Numerator, key.Denominator)));
                 // chai.expect(dict.getValue(key)).to.equal(value);
                 chai.expect(dict.getValue(new Fraction(key.Numerator, key.Denominator))).to.equal(value);
             }

test/MusicalScore/ScoreIO/MusicSheetReader.ts

@@ -44,7 +44,6 @@ describe("Music Sheet Reader Tests", () => {
 
     it("Measures", (done: MochaDone) => {
         chai.expect(sheet.SourceMeasures.length).to.equal(38);
-        console.log("First Measure: ", sheet.SourceMeasures[0]);
         done();
     });