Anchor-annotator 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

{Anchor_annotator-0.2.0.dist-info → Anchor_annotator-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Anchor_annotator
-Version: 0.2.0
+Version: 0.2.1
 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.2.0.dist-info → Anchor_annotator-0.2.1.dist-info}/RECORD

@@ -1,21 +1,21 @@
 anchor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anchor/__main__.py,sha256=5ufG8lcx2x1am-04xI991AG7saJd24dxPw5JzjmB878,45
-anchor/_version.py,sha256=H-qsvrxCpdhaQzyddR-yajEqI71hPxLa4KxzpP3uS1g,411
+anchor/_version.py,sha256=MxUhzLJIZQfEpDTTcKSxciTGrMLd5v2VmMlHa2HGeo0,411
 anchor/command_line.py,sha256=xvuCWaPWNVZTg5Ic28qbOYsOLaFbodhBsoZHKJSBazs,482
 anchor/db.py,sha256=ef4lO6HtCKoxC9CorIc0ZbPxKpjHa576a0ZIBOWNU9E,4956
 anchor/main.py,sha256=ySas07cnXXBkANqIMHai7tjNwqa5mNd4UaIjh358GgE,114287
-anchor/models.py,sha256=89gqY5qhhO_o_icMv23Zw43hrYP95WglsQNHOkXFs7M,88922
-anchor/plot.py,sha256=wyQQR984vZrVVzB0AvPckJ1SWAQvkyCxQQGT2E0Ikig,107014
+anchor/models.py,sha256=lfQvb0hxXS53xtJLpJcRiDCi7ONMzhDbpZGpTOzEwbs,88737
+anchor/plot.py,sha256=-7fT5TMguHLs96Sn3OqD3J2S2x3Q63eHrJhjl0J3LG4,107015
 anchor/resources_rc.py,sha256=sQ6GvAK3NTVR5bvgR9jCWDeepSYOhEph2mg1ECxnMOs,3560262
 anchor/settings.py,sha256=SJ9-5xjThJp3-zl99OBLWLSXZmsyUU1JNsgGWHlkJS8,46649
 anchor/ui_error_dialog.py,sha256=c_QS0s1VaJEV9AhcrQZQyWHHpUPudWjJY1NI7Ytipio,3832
 anchor/ui_main_window.py,sha256=aEABdKi1Eb1c2MKUsbCbufEp1lKSLFNsC9TPX244UPI,64618
 anchor/ui_preferences.py,sha256=uer2Xzyq26j-5wwbIKKcK8YEe2w7OFJPXfWSkKcPWhI,40146
-anchor/undo.py,sha256=okCDebeamNqSgRahxHjX8l0mcwqZhoQ6i-nOXbzLoZ4,34613
-anchor/widgets.py,sha256=SdNKryO0nzrrmdHXIh3oO0KMkoexYEvExQlN0XL0oQg,135415
+anchor/undo.py,sha256=PLtiAxC7U27vbega_p21vDRy4m9QBiHatDELlcNx08Y,32523
+anchor/widgets.py,sha256=fUiF8fuVMTl2k46Z3xjLH930FPuOjwZGOLSAT6pV8Q8,135416
 anchor/workers.py,sha256=-YPdxgZwZIGq8DPNFGD3oXZqFpruD6alEMMzHdvvVIE,170880
-Anchor_annotator-0.2.0.dist-info/LICENSE,sha256=C0oIsblENEgWQ7XMNdYoXyXsIA5wa3YF0I9lK3H7A1s,1076
-Anchor_annotator-0.2.0.dist-info/METADATA,sha256=dKWrW_uX2g3NRWdzRv8OXKKbTiN8tofwt4Oa09mbEI8,1500
-Anchor_annotator-0.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-Anchor_annotator-0.2.0.dist-info/top_level.txt,sha256=wX6ZKxImGRZKFQjs3f6XYw_TfbAp6Xs3SmbLfLbFAJ0,7
-Anchor_annotator-0.2.0.dist-info/RECORD,,
+Anchor_annotator-0.2.1.dist-info/LICENSE,sha256=C0oIsblENEgWQ7XMNdYoXyXsIA5wa3YF0I9lK3H7A1s,1076
+Anchor_annotator-0.2.1.dist-info/METADATA,sha256=XzwfT9KePIG6nnpsil3I1JvQyEZLdor5TJq03oevV6U,1500
+Anchor_annotator-0.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+Anchor_annotator-0.2.1.dist-info/top_level.txt,sha256=wX6ZKxImGRZKFQjs3f6XYw_TfbAp6Xs3SmbLfLbFAJ0,7
+Anchor_annotator-0.2.1.dist-info/RECORD,,

anchor/_version.py

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

anchor/models.py

@@ -1058,27 +1058,19 @@ class CorpusSelectionModel(QtCore.QItemSelectionModel):
     def model(self) -> CorpusModel:
         return super(CorpusSelectionModel, self).model()
 
-    def checkSelected(self, utterance: Utterance):
+    def focus_utterance(self, index):
         m = self.model()
-        for index in self.selectedRows(1):
-            if utterance.id == m._indices[index.row()]:
-                return True
-        return False
-
-    def focusUtterance(self, index):
-        m = self.model()
-        u = m.utteranceAt(index)
-        if u is None:
+        row = index.row()
+        utt_id = m.utterance_id_at(row)
+        if utt_id is None:
             self.min_time = 0
             self.max_time = 1
             self.fileAboutToChange()
             self.fileChanged.emit()
             return
-        begin = u.begin
-        end = u.end
-        padding = 1
-        self.set_view_times(begin - padding, end + padding)
-        self.selectionAudioChanged.emit()
+        self.current_utterance_id = utt_id
+        self.currentUtteranceChanged.emit()
+        self.fileViewRequested.emit(self.model().audio_info_for_utterance(row))
 
 
 class OovModel(TableModel):

anchor/plot.py

@@ -1616,7 +1616,7 @@ class AlignmentRegion(MfaRegion):
     def viewRangeChanged(self):
         if (self.item_max - self.item_min) / (
             self.selection_model.max_time - self.selection_model.min_time
-        ) < 0.01:
+        ) < 0.001:
             self.hide()
         else:
             self.show()

anchor/undo.py

@@ -150,26 +150,10 @@ class DeleteUtteranceCommand(FileCommand):
 
     def _undo(self, session) -> None:
         for i, utt in enumerate(self.deleted_utterances):
-            try:
-                del utt.duration
-            except AttributeError:
-                pass
-            try:
-                del utt.kaldi_id
-            except AttributeError:
-                pass
             make_transient(utt)
             for x in utt.phone_intervals:
-                try:
-                    del x.duration
-                except AttributeError:
-                    pass
                 make_transient(x)
             for x in utt.word_intervals:
-                try:
-                    del x.duration
-                except AttributeError:
-                    pass
                 make_transient(x)
             if utt.channel is None:
                 utt.channel = self.channels[i]
@@ -212,52 +196,20 @@ class SplitUtteranceCommand(FileCommand):
             if u.id is not None:
                 make_transient(u)
             for x in u.phone_intervals:
-                try:
-                    del x.duration
-                except AttributeError:
-                    pass
                 make_transient(x)
             for x in u.word_intervals:
-                try:
-                    del x.duration
-                except AttributeError:
-                    pass
                 make_transient(x)
             if u.channel is None:
                 u.channel = self.merged_utterance.channel
-            try:
-                del u.duration
-            except AttributeError:
-                pass
-            try:
-                del u.kaldi_id
-            except AttributeError:
-                pass
             session.add(u)
 
     def _undo(self, session) -> None:
         if self.merged_utterance.channel is None:
             self.merged_utterance.channel = self.split_utterances[0].channel
-        try:
-            del self.merged_utterance.duration
-        except AttributeError:
-            pass
-        try:
-            del self.merged_utterance.kaldi_id
-        except AttributeError:
-            pass
         make_transient(self.merged_utterance)
         for x in self.merged_utterance.phone_intervals:
-            try:
-                del x.duration
-            except AttributeError:
-                pass
             make_transient(x)
         for x in self.merged_utterance.word_intervals:
-            try:
-                del x.duration
-            except AttributeError:
-                pass
             make_transient(x)
         session.add(self.merged_utterance)
         for u in self.split_utterances:
@@ -300,7 +252,6 @@ class MergeUtteranceCommand(FileCommand):
         make_transient(self.merged_utterance)
         if self.merged_utterance.channel is None:
             self.merged_utterance.channel = self.channel
-        self.merged_utterance.kaldi_id = None
         session.add(self.merged_utterance)
 
     def _undo(self, session) -> None:
@@ -309,12 +260,9 @@ class MergeUtteranceCommand(FileCommand):
             if old_utt.channel is None:
                 old_utt.channel = self.channel
             for x in old_utt.phone_intervals:
-                x.duration = None
                 make_transient(x)
             for x in old_utt.word_intervals:
                 make_transient(x)
-            old_utt.duration = None
-            old_utt.kaldi_id = None
             session.add(old_utt)
         session.delete(self.merged_utterance)
 
@@ -402,14 +350,6 @@ class CreateUtteranceCommand(FileCommand):
         make_transient(self.new_utterance)
         if self.new_utterance.channel is None:
             self.new_utterance.channel = self.channel
-        try:
-            del self.new_utterance.duration
-        except AttributeError:
-            pass
-        try:
-            del self.new_utterance.kaldi_id
-        except AttributeError:
-            pass
         session.add(self.new_utterance)
 
     def _undo(self, session) -> None:
@@ -453,10 +393,6 @@ class UpdateUtteranceTimesCommand(FileCommand):
         self.utterance.xvector = None
         self.utterance.ivector = None
         self.utterance.features = None
-        try:
-            del self.utterance.duration
-        except AttributeError:
-            pass
         session.merge(self.utterance)
 
     def _undo(self, session) -> None:
@@ -465,10 +401,6 @@ class UpdateUtteranceTimesCommand(FileCommand):
         self.utterance.xvector = None
         self.utterance.ivector = None
         self.utterance.features = None
-        try:
-            del self.utterance.duration
-        except AttributeError:
-            pass
         session.merge(self.utterance)
 
     def update_data(self):
@@ -495,10 +427,6 @@ class UpdateUtteranceTextCommand(FileCommand):
         for w in self.new_text.split():
             if not self.corpus_model.dictionary_model.check_word(w, self.speaker_id):
                 oovs.add(w)
-        try:
-            del self.utterance.duration
-        except AttributeError:
-            pass
         self.utterance.text = self.new_text
         self.utterance.normalized_text = self.new_text  # FIXME: Update this
         self.utterance.oovs = " ".join(oovs)
@@ -510,10 +438,6 @@ class UpdateUtteranceTextCommand(FileCommand):
         for w in self.new_text.split():
             if not self.corpus_model.dictionary_model.check_word(w, self.speaker_id):
                 oovs.add(w)
-        try:
-            del self.utterance.duration
-        except AttributeError:
-            pass
         self.utterance.text = self.old_text
         self.utterance.normalized_text = self.old_text  # FIXME: Update this
         self.utterance.oovs = " ".join(oovs)

anchor/widgets.py

@@ -402,7 +402,7 @@ class UtteranceListTable(AnchorTableView):
     def set_models(self, model: CorpusModel, selection_model: CorpusSelectionModel):
         self.setModel(model)
         self.setSelectionModel(selection_model)
-        self.doubleClicked.connect(self.selectionModel().focusUtterance)
+        self.doubleClicked.connect(self.selectionModel().focus_utterance)
         self.model().utteranceTextUpdated.connect(self.repaint)
         self.refresh_settings()
         model.corpusLoaded.connect(self.update_header)