Anchor-annotator 0.0.11__tar.gz → 0.2.0__tar.gz

{Anchor_annotator-0.0.11 → Anchor_annotator-0.2.0}/.gitignore

@@ -139,3 +139,5 @@ dmypy.json
 *.user
 
 anchor/_version.py
+
+*.pclprof

{Anchor_annotator-0.0.11 → Anchor_annotator-0.2.0/Anchor_annotator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Anchor_annotator
-Version: 0.0.11
+Version: 0.2.0
 Summary: Anchor annotator is a program for inspecting corpora for the Montreal Forced Aligner and correcting transcriptions and pronunciations.
 Home-page: https://github.com/MontrealCorpusTools/Anchor-annotator
 Author: Montreal Corpus Tools

{Anchor_annotator-0.0.11/Anchor_annotator.egg-info → Anchor_annotator-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: Anchor-annotator
-Version: 0.0.11
+Name: Anchor_annotator
+Version: 0.2.0
 Summary: Anchor annotator is a program for inspecting corpora for the Montreal Forced Aligner and correcting transcriptions and pronunciations.
 Home-page: https://github.com/MontrealCorpusTools/Anchor-annotator
 Author: Montreal Corpus Tools

{Anchor_annotator-0.0.11 → Anchor_annotator-0.2.0}/anchor/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.11'
-__version_tuple__ = version_tuple = (0, 0, 11)
+__version__ = version = '0.2.0'
+__version_tuple__ = version_tuple = (0, 2, 0)

{Anchor_annotator-0.0.11 → Anchor_annotator-0.2.0}/anchor/main.py

@@ -33,6 +33,8 @@ from anchor.models import (
     CorpusSelectionModel,
     DiarizationModel,
     DictionaryTableModel,
+    FileSelectionModel,
+    FileUtterancesModel,
     OovModel,
     SpeakerModel,
 )
@@ -489,9 +491,12 @@ class MainWindow(QtWidgets.QMainWindow):
         self.dictionary_model = DictionaryTableModel(self)
         self.oov_model = OovModel(self)
         self.corpus_model = CorpusModel(self)
+        self.file_utterances_model = FileUtterancesModel(self)
         self.speaker_model = SpeakerModel(self)
         self.diarization_model = DiarizationModel(self)
 
+        self.file_utterances_model.set_corpus_model(self.corpus_model)
+
         self.corpus_model.databaseSynced.connect(self.handle_changes_synced)
         self.corpus_model.runFunction.connect(self.execute_runnable)
         self.diarization_model.runFunction.connect(self.execute_runnable)
@@ -510,11 +515,15 @@ class MainWindow(QtWidgets.QMainWindow):
         self.diarization_model.set_corpus_model(self.corpus_model)
         self.oov_model.set_corpus_model(self.corpus_model)
         self.selection_model = CorpusSelectionModel(self.corpus_model)
+        self.file_selection_model = FileSelectionModel(self.file_utterances_model)
         self.ui.utteranceListWidget.set_models(
             self.corpus_model, self.selection_model, self.speaker_model
         )
         self.ui.utteranceDetailWidget.set_models(
-            self.corpus_model, self.selection_model, self.dictionary_model
+            self.corpus_model,
+            self.file_utterances_model,
+            self.file_selection_model,
+            self.dictionary_model,
         )
         self.ui.speakerWidget.set_models(
             self.corpus_model, self.selection_model, self.speaker_model
@@ -526,17 +535,25 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.dictionaryWidget.set_models(self.dictionary_model)
         self.ui.diarizationWidget.set_models(self.diarization_model, self.selection_model)
         self.ui.oovWidget.set_models(self.oov_model)
-        self.selection_model.currentUtteranceChanged.connect(self.change_utterance)
-        self.selection_model.fileChanged.connect(self.change_file)
+        self.file_selection_model.currentUtteranceChanged.connect(self.change_utterance)
+        self.selection_model.fileViewRequested.connect(self.file_selection_model.set_current_file)
+        self.file_selection_model.fileChanged.connect(self.change_file)
         self.selection_model.fileAboutToChange.connect(self.check_media_stop)
-        self.media_player.set_corpus_models(self.corpus_model, self.selection_model)
+        self.media_player.set_models(self.file_selection_model)
         self.corpus_model.addCommand.connect(self.update_corpus_stack)
+        self.file_utterances_model.addCommand.connect(self.update_corpus_stack)
+        self.file_selection_model.selectionChanged.connect(self.sync_selected_utterances)
 
         self.g2p_model = None
         self.acoustic_model = None
         self.language_model = None
         self.ivector_extractor = None
 
+    def sync_selected_utterances(self):
+        self.selection_model.update_selected_utterances(
+            self.file_selection_model.selected_utterances()
+        )
+
     def check_media_stop(self):
         if self.ui.playAct.isChecked():
             self.ui.playAct.setChecked(False)
@@ -562,16 +579,18 @@ class MainWindow(QtWidgets.QMainWindow):
         self.dictionary_undo_stack.push(command)
 
     def delete_utterances(self):
-        utts = self.selection_model.selectedUtterances()
-        self.corpus_model.delete_utterances(utts)
+        utts = self.file_selection_model.selected_utterances()
+        self.file_utterances_model.delete_utterances(utts)
 
     def split_utterances(self):
-        utts = self.selection_model.selectedUtterances()
-        self.corpus_model.split_utterances(utts)
+        utts = self.file_selection_model.selected_utterances()
+        if len(utts) != 1:
+            return
+        self.file_utterances_model.split_utterances(utts[0])
 
     def merge_utterances(self):
-        utts = self.selection_model.selectedUtterances()
-        self.corpus_model.merge_utterances(utts)
+        utts = self.file_selection_model.selected_utterances()
+        self.file_utterances_model.merge_utterances(utts)
 
     def check_actions(self):
         self.ui.lockEditAct.setEnabled(True)
@@ -635,7 +654,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def change_file(self):
         self.ui.playAct.setChecked(False)
-        if self.selection_model.current_file is None:
+        if self.file_utterances_model.file is None:
             self.ui.playAct.setEnabled(False)
             self.ui.panLeftAct.setEnabled(False)
             self.ui.panRightAct.setEnabled(False)
@@ -655,14 +674,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.channel_select.addItem("Channel 0", userData=0)
                 self.channel_select.setEnabled(False)
                 if (
-                    self.selection_model.current_file is not None
-                    and self.selection_model.current_file.num_channels > 1
+                    self.file_utterances_model.file is not None
+                    and self.file_utterances_model.file.num_channels > 1
                 ):
                     self.channel_select.addItem("Channel 1", userData=1)
                     self.channel_select.setEnabled(True)
 
     def change_utterance(self):
-        selection = self.selection_model.selectedUtterances()
+        selection = self.file_selection_model.selected_utterances()
         self.ui.deleteUtterancesAct.setEnabled(False)
         self.ui.splitUtterancesAct.setEnabled(False)
         self.ui.alignUtteranceAct.setEnabled(False)
@@ -670,8 +689,8 @@ class MainWindow(QtWidgets.QMainWindow):
         if not selection and self.selection_model.current_utterance_id is None:
             return
 
-        self.ui.splitUtterancesAct.setEnabled(True)
         if len(selection) == 1 or self.selection_model.current_utterance_id is not None:
+            self.ui.splitUtterancesAct.setEnabled(True)
             if self.corpus_model.acoustic_model is not None and self.corpus_model.has_dictionary:
                 self.ui.alignUtteranceAct.setEnabled(True)
                 self.ui.segmentUtteranceAct.setEnabled(True)
@@ -684,7 +703,8 @@ class MainWindow(QtWidgets.QMainWindow):
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         for worker in self.workers:
             worker.stopped.set()
-        self.ui.utteranceDetailWidget.plot_widget.clean_up_for_close()
+        self.file_selection_model.clean_up_for_close()
+        self.file_utterances_model.clean_up_for_close()
         self.settings.setValue(
             AnchorSettings.UTTERANCES_VISIBLE, self.ui.utteranceDockWidget.isVisible()
         )
@@ -739,11 +759,14 @@ class MainWindow(QtWidgets.QMainWindow):
         w.setSizePolicy(
             QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding
         )
-        self.ui.toolBar.insertWidget(self.ui.toolBar.actions()[0], w)
-        self.ui.toolBar.setSizePolicy(
+        w2 = QtWidgets.QWidget(self)
+        w2.setSizePolicy(
             QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding
         )
-        self.ui.toolBar.addWidget(w)
+        self.ui.toolBar.insertWidget(self.ui.toolBar.actions()[0], w)
+        # self.ui.toolBar.setSizePolicy(
+        #    QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding
+        # )
         self.ui.toolBar.setAttribute(QtCore.Qt.WidgetAttribute.WA_AlwaysShowToolTips, True)
         self.ui.lockEditAct.setEnabled(True)
         self.ui.lockEditAct.setChecked(bool(self.settings.value(AnchorSettings.LOCKED, False)))
@@ -770,9 +793,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.cluster_utterances_action.triggered.connect(self.begin_cluster_utterances)
         self.ui.classify_speakers_action.triggered.connect(self.begin_classify_speakers)
         self.selection_model.selectionAudioChanged.connect(self.enable_zoom)
-        self.ui.zoomInAct.triggered.connect(self.selection_model.zoom_in)
-        self.ui.zoomToSelectionAct.triggered.connect(self.selection_model.zoom_to_selection)
-        self.ui.zoomOutAct.triggered.connect(self.selection_model.zoom_out)
+        self.ui.zoomInAct.triggered.connect(self.file_selection_model.zoom_in)
+        self.ui.zoomToSelectionAct.triggered.connect(self.file_selection_model.zoom_to_selection)
+        self.ui.zoomOutAct.triggered.connect(self.file_selection_model.zoom_out)
         self.ui.panLeftAct.triggered.connect(self.ui.utteranceDetailWidget.pan_left)
         self.ui.panRightAct.triggered.connect(self.ui.utteranceDetailWidget.pan_right)
         self.ui.mergeUtterancesAct.triggered.connect(self.merge_utterances)
@@ -803,7 +826,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.channel_select.addItem("Channel 0")
         self.ui.toolBar.addWidget(self.volume_slider)
         self.ui.toolBar.addWidget(self.channel_select)
-        self.channel_select.currentIndexChanged.connect(self.selection_model.set_current_channel)
+        self.ui.toolBar.addWidget(w2)
+        self.channel_select.currentIndexChanged.connect(
+            self.file_selection_model.set_current_channel
+        )
         self.ui.changeVolumeAct.triggered.connect(self.media_player.set_volume)
         self.ui.addSpeakerAct.triggered.connect(self.add_new_speaker)
         self.ui.speakerWidget.tool_bar.addAction(self.ui.addSpeakerAct)
@@ -926,7 +952,7 @@ class MainWindow(QtWidgets.QMainWindow):
         if not self.corpus_model.corpus.has_any_ivectors():
             return
         kwargs = {
-            "threshold": 0.28,
+            "threshold": 0.25,
         }
         if False and self.corpus_model.plda is not None:
             kwargs["metric"] = "plda"
@@ -1205,6 +1231,7 @@ class MainWindow(QtWidgets.QMainWindow):
     def close_corpus(self):
         self.set_application_state("unloaded")
         self.selection_model.clearSelection()
+        self.file_selection_model.clearSelection()
         if self.corpus_model.corpus is not None:
             self.corpus_model.session.close()
         self.corpus_model.setCorpus(None)
@@ -1513,8 +1540,8 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def finalize_segmentation(self, data):
         original_utterance_id, split_data = data
-        self.corpus_model.split_vad_utterance(original_utterance_id, split_data)
-        self.corpus_model.update_data()
+        self.file_utterances_model.split_vad_utterance(original_utterance_id, split_data)
+        self.ensure_utterance_panel_visible()
 
     def finalize_saving(self):
         self.check_actions()
@@ -1694,6 +1721,20 @@ class MainWindow(QtWidgets.QMainWindow):
             if search_term is not None:
                 self.ui.utteranceListWidget.search_box.setQuery(search_term)
 
+    def ensure_utterance_panel_visible(self):
+        dock_tab_bars = self.findChildren(QtWidgets.QTabBar, "")
+
+        for j in range(len(dock_tab_bars)):
+            dock_tab_bar = dock_tab_bars[j]
+            if not dock_tab_bar.count():
+                continue
+            for i in range(dock_tab_bar.count()):
+                if dock_tab_bar.tabText(i) == "Utterances":
+                    dock_tab_bar.setCurrentIndex(i)
+                    break
+            else:
+                self.ui.utteranceDockWidget.toggleViewAction().trigger()
+
     def open_search_speaker(self, search_term=None, show=False):
         if search_term is not None:
             self.ui.utteranceListWidget.speaker_dropdown.line_edit.setText(search_term)
@@ -1705,18 +1746,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 )
             self.ui.utteranceListWidget.search()
             if show:
-                dock_tab_bars = self.findChildren(QtWidgets.QTabBar, "")
-
-                for j in range(len(dock_tab_bars)):
-                    dock_tab_bar = dock_tab_bars[j]
-                    if not dock_tab_bar.count():
-                        continue
-                    for i in range(dock_tab_bar.count()):
-                        if dock_tab_bar.tabText(i) == "Utterances":
-                            dock_tab_bar.setCurrentIndex(i)
-                            break
-                    else:
-                        self.ui.utteranceDockWidget.toggleViewAction().trigger()
+                self.ensure_utterance_panel_visible()
 
     def open_search_file(self, search_term=None, utterance_id=None, show=False):
         if search_term is not None:
@@ -1729,18 +1759,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.ui.utteranceListWidget.requested_utterance_id = utterance_id
             self.ui.utteranceListWidget.search()
             if show:
-                dock_tab_bars = self.findChildren(QtWidgets.QTabBar, "")
-
-                for j in range(len(dock_tab_bars)):
-                    dock_tab_bar = dock_tab_bars[j]
-                    if not dock_tab_bar.count():
-                        continue
-                    for i in range(dock_tab_bar.count()):
-                        if dock_tab_bar.tabText(i) == "Utterances":
-                            dock_tab_bar.setCurrentIndex(i)
-                            break
-                    else:
-                        self.ui.utteranceDockWidget.toggleViewAction().trigger()
+                self.ensure_utterance_panel_visible()
 
     def refresh_shortcuts(self):
         self.ui.playAct.setShortcut(self.settings.value(AnchorSettings.PLAY_KEYBIND))
@@ -2283,6 +2302,11 @@ class OptionsDialog(QtWidgets.QDialog):
             self.settings.value(self.settings.AUTOLOAD)
         )
         self.ui.resultsPerPageEdit.setValue(self.settings.value(self.settings.RESULTS_PER_PAGE))
+        self.ui.timeDirectionComboBox.setCurrentIndex(
+            self.ui.timeDirectionComboBox.findText(
+                self.settings.value(self.settings.TIME_DIRECTION)
+            )
+        )
 
         self.ui.dynamicRangeEdit.setValue(self.settings.value(self.settings.SPEC_DYNAMIC_RANGE))
         self.ui.fftSizeEdit.setValue(self.settings.value(self.settings.SPEC_N_FFT))
@@ -2421,6 +2445,9 @@ class OptionsDialog(QtWidgets.QDialog):
         self.settings.setValue(self.settings.AUTOSAVE, self.ui.autosaveOnExitCheckBox.isChecked())
         self.settings.setValue(self.settings.AUDIO_DEVICE, self.ui.audioDeviceEdit.currentData())
         self.settings.setValue(self.settings.RESULTS_PER_PAGE, self.ui.resultsPerPageEdit.value())
+        self.settings.setValue(
+            self.settings.TIME_DIRECTION, self.ui.timeDirectionComboBox.currentText()
+        )
         self.settings.sync()
         super(OptionsDialog, self).accept()