adjust plot

app.py

@@ -54,7 +54,7 @@ with bl:
 
     #temp_sentences = ['Litlaus græn hugmynd?','Var það ekki nóg?', 'Ef svo er hvað heita þau þá?','Eru maríuhænur á Íslandi?']
     
-    voices = ['Alfur_v2', 'Dilja_v2', 'Alfur','Dilja', 'Bjartur', 'Rosa', 'Karl', 'Dora']
+    voices = ['Dilja_v2', 'Alfur_v2', 'Dilja', 'Alfur', 'Bjartur', 'Rosa', 'Karl', 'Dora']
 
     
     #with gr.Row():
@@ -66,7 +66,7 @@ with bl:
 
     with gr.Row():
         spanselect = gr.Textbox(value='1-3',label="Select words",info='Enter the index of the word(s) to analyse, according to the key above. It can be a single word: 4 or a span of words separated by a dash: 2-3')
-        voiceselect = gr.Radio(voices, label="TTS voice",value='Alfur')
+        voiceselect = gr.Radio(voices, label="TTS voice",value='Alfur_v2')
 
         #with gr.Column(scale=1):
         temp_button = gr.Button(value="Run with selected options")

scripts/clusterprosody.py

@@ -361,7 +361,16 @@ def plot_one_cluster(words,feature,speech_data,seg_aligns,cluster_id,tts_data=No
         # datapoint interval is 0.005 seconds
         feat_xvals = [x*0.005 for x in range(len(feats))]
         feat_xvals = retime_speaker_xvals(retimes, word_times, feat_xvals)
-        pfunc(feat_xvals, feats, color=colors[cc], label=f"Speaker {spk}")
+        
+        
+        #pfunc(feat_xvals, feats, color=colors[cc], label=f"Speaker {spk}")
+        for w, st in reversed(retimes):
+            w_xvals = [x for x in feat_xvals if x>= st]
+            w_feats = feats[-(len(w_xvals)):]
+            pfunc(w_xvals, w_feats, color=colors[cc])
+            feat_xvals = feat_xvals[:-(len(w_xvals))]
+            feats = feats[:-(len(w_xvals))]
+
         
         cc += 1
         if cc >= len(colors):
@@ -372,8 +381,13 @@ def plot_one_cluster(words,feature,speech_data,seg_aligns,cluster_id,tts_data=No
         t_xvals = [x*0.005 for x in range(len(tfeats))]
         t_xvals = retime_speaker_xvals(retimes, tts_align, t_xvals)
     
-        pfunc(t_xvals, tfeats, color="black", label=f"TTS {voice}")
-
+        #pfunc(t_xvals, tfeats, color="black", label=f"TTS {voice}")
+        for w, st in reversed(retimes):
+            tw_xvals = [x for x in t_xvals if x>= st]
+            tw_feats = tfeats[-(len(tw_xvals)):]
+            pfunc(tw_xvals, tw_feats, color=colors[cc])
+            t_xvals = t_xvals[:-(len(tw_xvals))]
+            tfeats = tfeats[:-(len(tw_xvals))]
 
     #plt.legend()
     #plt.show()

scripts/runSQ.py

@@ -113,7 +113,6 @@ def get_samromur_queries(sentence, corpusdb, speech_dir, align_dir, align_model_
         return []
     else:
         print(f'{len(meta)} recordings of sentence <{sentence}>')
-        #return meta
         
     
     word_aligner = None
@@ -174,7 +173,7 @@ def get_tts(sentence,voices,ttsdir,align_model_path,reaper_path = "REAPER/build/
         sample_paths.append(wpath)
         
         
-        # TEMP
+        # TODO TEMP
         # return for single last voice
         temp_sample_path = wpath