SNPSonificator.sc: Updating 12 channel speaker setup. Renaming snpGUI to gui. Renaming gui text setters to new names.

1 files changed, 8 insertions, 6 deletions

diff --git a/SNPSonificator.sc b/SNPSonificator.sc
index 6fe6961..a86a750 100644
--- a/SNPSonificator.sc
+++ b/SNPSonificator.sc
@@ -23,7 +23,7 @@ SNPSonificator {
   var <>recPath;//String representing directory to use for recording
   var <recordingBuffer;//the recording buffer to use, wehen recording
   var <baseTone = #[110.00, 65.4, 98.00, 73.42];//the fundamentals from which 8 octaves will be calculated: A (A2), C (C2), G (G2), T (D2)
-  var <snpView;
+  var <gui; //TODO: set in constructor
 
   *new{
     arg snpDict, numChannels = 2, playTime, includeUnknown = false, ignoreSNPs, setRecord = false, recordPath;
@@ -104,7 +104,7 @@ SNPSonificator {
       4,{speakerSetup = [[3,7,11,15,19,23],[4,8,12,16,20,24],[2,6,10,14,18,22],[1,5,9,13,17,21]];},
       6,{speakerSetup = [[5,11,17,23],[6,12,18,24],[4,10,16,22],[2,8,14,20],[1,7,13,19],[3,9,15,21]];},
       8,{speakerSetup = [[7,15,23],[8,16,24],[6,14,22],[4,12,20],[2,10,18],[1,9,17],[3,11,19],[5,13,21]];},
-      12,{speakerSetup = [[12,24],[10,22],[8,20],[6,18],[4,16],[2,14],[1,13],[3,15],[5,17],[7,19],[9,21],[11,23]];},
+      12,{speakerSetup = [[11,23],[12,24],[10,22],[8,20],[6,18],[4,16],[2,14],[1,13],[3,15],[5,17],[7,19],[9,21]];},
       {"Invalid number of speakers set! Fix this by calling setupSpeakers(nSpeakers) on this object or this will break. Seriously!".postln;}
     );
     if(printOuts,{//print the speaker setup
@@ -361,9 +361,9 @@ SNPSonificator {
         });
       });
     });
-    //update the currently playing base of the chromosome in snpView, if it has been spawned
-    if(snpView.notNil,{
-      snpView.setSNPText(snp.vecChromosome, snp.base);
+    //update the currently playing base of the chromosome in gui, if it has been spawned
+    if(gui.notNil,{
+      gui.setIntermediateText(snp.vecChromosome, snp.base);
     });
     baseKey.free;
   }
@@ -391,7 +391,9 @@ SNPSonificator {
     ("Positions: "++currentStep.asString++" - "++lastStep.asString++".").postln;
     ("Play time: "++(currentStep*lengthOfSNP*1000).asString++"s - "++(lastStep*lengthOfSNP*1000).asString++"s.").postln;
   }
+
+  // create a new SNPGUI instance
   spawnView{
-    snpView = SNPGUI.new(speakerSetup);
+    gui = SNPGUI.new(speakerSetup);
   }
 }