Anchor-annotator 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

{Anchor_annotator-0.4.0.dist-info → Anchor_annotator-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Anchor_annotator
-Version: 0.4.0
+Version: 0.5.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.5.0.dist-info/RECORD

@@ -0,0 +1,22 @@
+anchor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anchor/__main__.py,sha256=5ufG8lcx2x1am-04xI991AG7saJd24dxPw5JzjmB878,45
+anchor/_version.py,sha256=aeBju2l8GTMwAhIRG_c2Q_oVPFacRkZZwGtxmvFCGPQ,411
+anchor/command_line.py,sha256=EucG805HyWk_zkMO9RXv9Yj0I0JVdDLZb1_DX2_ISjM,503
+anchor/db.py,sha256=ef4lO6HtCKoxC9CorIc0ZbPxKpjHa576a0ZIBOWNU9E,4956
+anchor/main.py,sha256=ZJKMVgh1yFnuqcoCSSDXFWqmw5hxLcoQbA0JaNSK61Y,126473
+anchor/models.py,sha256=tYtj_doI9LokNOo624b1OmVLTFpIdKBVPfAzCO90ou4,96315
+anchor/plot.py,sha256=yNveJ6O52621xC5ggUhFeeSxFp-HWD8D3XVnBWc6vtE,112516
+anchor/resources_rc.py,sha256=ad0TsmUT4851Rh4oWpwefIJ9Ijqhg3gwX8cnaRX_90w,8460639
+anchor/settings.py,sha256=jyqvKYo2ZMeZkU7D6qmLxkF8xvnJsYh7eyk5_kQMKxY,51884
+anchor/ui_corpus_manager.py,sha256=e3ybOd4UdYarrLBATxI8vIFnioa4R_BHrbsEz5mJ5eA,8564
+anchor/ui_error_dialog.py,sha256=HKbjGT_jtdb9jfn9THQMbl1fmcdWyjYDazM4hCwZ5Yo,3931
+anchor/ui_main_window.py,sha256=q7dsxdvjhMy-W_7qEqV9EalWUZsca1OwfdrU0EVz8d0,36574
+anchor/ui_preferences.py,sha256=g3tcjAMFKIAqUJNEke7ww4LkdeTFA1zb8_lrhF6k5fo,43271
+anchor/undo.py,sha256=HUrTT8N-y1jFrSBX4wSNSGF3G0YiBeKUqKJQQg1qffI,32919
+anchor/widgets.py,sha256=iadb6GgR2Q-1eTdle_IPaMyEnkOBXMqBvjC1U6pWtJo,156787
+anchor/workers.py,sha256=rjUWKyRJ-NiZpGvgYgoNi5M9ESoMFXpd7zgnx-f0WBY,172378
+Anchor_annotator-0.5.0.dist-info/LICENSE,sha256=C0oIsblENEgWQ7XMNdYoXyXsIA5wa3YF0I9lK3H7A1s,1076
+Anchor_annotator-0.5.0.dist-info/METADATA,sha256=2ochFmVpqLnnTKHb15k3R4BRxNH2wrrwdZDO0NJFjUg,1500
+Anchor_annotator-0.5.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+Anchor_annotator-0.5.0.dist-info/top_level.txt,sha256=wX6ZKxImGRZKFQjs3f6XYw_TfbAp6Xs3SmbLfLbFAJ0,7
+Anchor_annotator-0.5.0.dist-info/RECORD,,

anchor/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4.0'
-__version_tuple__ = version_tuple = (0, 4, 0)
+__version__ = version = '0.5.0'
+__version_tuple__ = version_tuple = (0, 5, 0)

anchor/main.py

@@ -103,6 +103,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.status_indicator.setFixedWidth(self.ui.statusbar.height())
         self.ui.statusbar.addPermanentWidget(self.status_indicator, 0)
         self.settings = AnchorSettings()
+        self.settings.themeUpdated.connect(self.refresh_style_sheets)
+        self.style_hints = QtGui.QGuiApplication.styleHints()
+        self.style_hints.colorSchemeChanged.connect(self.refresh_style_sheets)
         self.model_manager = ModelManager(
             token=self.settings.value(AnchorSettings.GITHUB_TOKEN), ignore_cache=True
         )
@@ -827,9 +830,6 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.lockEditAct.toggled.connect(self.toggle_lock)
         self.ui.exportFilesAct.setEnabled(True)
         self.ui.exportFilesAct.triggered.connect(self.export_files)
-        self.ui.showAllSpeakersAct.triggered.connect(
-            self.ui.utteranceDetailWidget.plot_widget.update_show_speakers
-        )
         self.ui.muteAct.triggered.connect(self.update_mute_status)
         self.volume_slider = QtWidgets.QSlider(QtCore.Qt.Orientation.Horizontal, self)
         self.volume_slider.setMaximum(100)
@@ -868,9 +868,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.selectMappingFileAct.triggered.connect(self.change_custom_mapping)
 
         self.undo_act = self.undo_group.createUndoAction(self, "Undo")
-        self.undo_act.setIcon(QtGui.QIcon(":undo.svg"))
+        self.undo_act.setIcon(QtGui.QIcon.fromTheme("edit-undo"))
         self.redo_act = self.undo_group.createRedoAction(self, "Redo")
-        self.redo_act.setIcon(QtGui.QIcon(":redo.svg"))
+        self.redo_act.setIcon(QtGui.QIcon.fromTheme("edit-redo"))
         self.ui.menuEdit.addAction(self.undo_act)
         self.ui.menuEdit.addAction(self.redo_act)
         self.undo_group.setActiveStack(self.corpus_undo_stack)
@@ -1851,6 +1851,54 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def refresh_style_sheets(self):
         self.setStyleSheet(self.settings.style_sheet)
+        self.styleSheetChanged.emit(self.settings.style_sheet)
+        self.ui.utteranceDetailWidget.plot_widget.refresh_theme()
+        QtGui.QIcon.setThemeName("anchor_light")
+        if self.settings.theme_preset == "Native":
+            dark_mode = (
+                QtGui.QGuiApplication.styleHints().colorScheme() == QtCore.Qt.ColorScheme.Dark
+            )
+            if dark_mode:
+                QtGui.QIcon.setThemeName("anchor_dark")
+            if False:
+                self.ui.playAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.MediaPlaybackStart)
+                )
+                self.ui.muteAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.AudioVolumeMuted)
+                )
+                self.ui.zoomInAct.setIcon(QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.ZoomIn))
+                self.ui.zoomOutAct.setIcon(QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.ZoomOut))
+                self.ui.zoomToSelectionAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.ZoomFitBest)
+                )
+                self.ui.mergeUtterancesAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.InputGaming)
+                )
+                self.ui.splitUtterancesAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.ViewFullscreen)
+                )
+                self.ui.deleteUtterancesAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.EditDelete)
+                )
+                self.ui.exportFilesAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.DocumentSave)
+                )
+                self.ui.lockEditAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.SystemLockScreen)
+                )
+                self.ui.getHelpAct.setIcon(QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.HelpAbout))
+                self.ui.reportBugAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.MailForward)
+                )
+                self.ui.alignUtteranceAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.FormatTextUnderline)
+                )
+                self.ui.cancelCorpusLoadAct.setIcon(
+                    QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.ProcessStop)
+                )
+                self.undo_act.setIcon(QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.EditUndo))
+                self.redo_act.setIcon(QtGui.QIcon.fromTheme(QtGui.QIcon.ThemeIcon.EditRedo))
 
     def refresh_corpus_history(self):
         self.ui.loadRecentCorpusMenu.clear()
@@ -1869,8 +1917,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.ui.loadRecentCorpusMenu.addAction(a)
 
     def refresh_settings(self):
-        self.setStyleSheet(self.settings.style_sheet)
-        self.styleSheetChanged.emit(self.settings.style_sheet)
+        self.refresh_style_sheets()
         self.refresh_shortcuts()
         self.corpus_model.set_limit(self.settings.value(self.settings.RESULTS_PER_PAGE))
         self.dictionary_model.set_limit(self.settings.value(self.settings.RESULTS_PER_PAGE))
@@ -1880,6 +1927,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ui.dictionaryWidget.refresh_settings()
         self.ui.speakerWidget.refresh_settings()
         self.media_player.refresh_settings()
+        self.ui.utteranceDetailWidget.plot_widget.refresh()
 
     def download_language_model(self):
         self.download_worker.set_params(
@@ -2285,6 +2333,10 @@ class DetailedMessageBox(QtWidgets.QDialog):  # pragma: no cover
         self.ui = Ui_ErrorDialog()
         self.ui.setupUi(self)
         self.settings = AnchorSettings()
+        icon = QtGui.QIcon.fromTheme("emblem-important")
+        size = self.ui.iconLabel.size()
+        self.ui.iconLabel.setPixmap(icon.pixmap(size))
+        self.setWindowIcon(icon)
         self.ui.detailed_message.setText(detailed_message)
         self.ui.buttonBox.report_bug_button.clicked.connect(self.reportBug.emit)
         self.ui.buttonBox.rejected.connect(self.reject)
@@ -2300,6 +2352,14 @@ class ManagerDialog(QtWidgets.QDialog):
         self.ui.setupUi(self)
         self.ui.tabWidget.setCurrentIndex(0)
         self.settings = AnchorSettings()
+        QtGui.QIcon.setThemeName("anchor_light")
+        if self.settings.theme_preset == "Native":
+            dark_mode = (
+                QtGui.QGuiApplication.styleHints().colorScheme() == QtCore.Qt.ColorScheme.Dark
+            )
+            if dark_mode:
+                QtGui.QIcon.setThemeName("anchor_dark")
+
         self.model_manager = model_manager
 
         self.db_engine = db_engine
@@ -2381,33 +2441,10 @@ class OptionsDialog(QtWidgets.QDialog):
         self.ui.setupUi(self)
         self.settings = AnchorSettings()
 
-        self.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus)
-
-        self.ui.primaryBaseEdit.set_color(self.settings.value(self.settings.PRIMARY_BASE_COLOR))
-        self.ui.primaryLightEdit.set_color(self.settings.value(self.settings.PRIMARY_LIGHT_COLOR))
-        self.ui.primaryDarkEdit.set_color(self.settings.value(self.settings.PRIMARY_DARK_COLOR))
-        self.ui.primaryVeryLightEdit.set_color(
-            self.settings.value(self.settings.PRIMARY_VERY_LIGHT_COLOR)
-        )
-        self.ui.primaryVeryDarkEdit.set_color(
-            self.settings.value(self.settings.PRIMARY_VERY_DARK_COLOR)
-        )
-
-        self.ui.accentBaseEdit.set_color(self.settings.value(self.settings.ACCENT_BASE_COLOR))
-        self.ui.accentLightEdit.set_color(self.settings.value(self.settings.ACCENT_LIGHT_COLOR))
-        self.ui.accentDarkEdit.set_color(self.settings.value(self.settings.ACCENT_DARK_COLOR))
-        self.ui.accentVeryLightEdit.set_color(
-            self.settings.value(self.settings.ACCENT_VERY_LIGHT_COLOR)
-        )
-        self.ui.accentVeryDarkEdit.set_color(
-            self.settings.value(self.settings.ACCENT_VERY_DARK_COLOR)
-        )
+        self.initial_theme = self.settings.current_theme
 
-        self.ui.mainTextColorEdit.set_color(self.settings.value(self.settings.MAIN_TEXT_COLOR))
-        self.ui.selectedTextColorEdit.set_color(
-            self.settings.value(self.settings.SELECTED_TEXT_COLOR)
-        )
-        self.ui.errorColorEdit.set_color(self.settings.value(self.settings.ERROR_COLOR))
+        self.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus)
+        self.ui.errorColorEdit.colorChanged.connect(self.update_theme)
 
         self.ui.fontEdit.set_font(self.settings.font)
 
@@ -2456,6 +2493,11 @@ class OptionsDialog(QtWidgets.QDialog):
                 self.settings.value(self.settings.TIME_DIRECTION)
             )
         )
+        self.ui.visibleSpeakerComboBox.setCurrentIndex(
+            self.ui.visibleSpeakerComboBox.findText(
+                str(self.settings.value(self.settings.TIER_MAX_SPEAKERS))
+            )
+        )
 
         self.ui.dynamicRangeEdit.setValue(self.settings.value(self.settings.SPEC_DYNAMIC_RANGE))
         self.ui.specMaxTimeEdit.setText(str(self.settings.value(self.settings.SPEC_MAX_TIME)))
@@ -2472,6 +2514,11 @@ class OptionsDialog(QtWidgets.QDialog):
         self.ui.frameLengthEdit.setValue(self.settings.value(self.settings.PITCH_FRAME_LENGTH))
         self.ui.penaltyEdit.setText(str(self.settings.value(self.settings.PITCH_PENALTY_FACTOR)))
         self.ui.pitchDeltaEdit.setText(str(self.settings.value(self.settings.PITCH_DELTA_PITCH)))
+        self.ui.presetThemeEdit.setCurrentIndex(
+            self.ui.presetThemeEdit.findText(str(self.settings.value(self.settings.THEME_PRESET)))
+        )
+        self.ui.presetThemeEdit.currentIndexChanged.connect(self.update_preset_theme)
+        self.ui.presetThemeEdit.currentIndexChanged.connect(self.update_theme)
 
         self.ui.audioDeviceEdit.clear()
         for o in QtMultimedia.QMediaDevices.audioOutputs():
@@ -2486,6 +2533,82 @@ class OptionsDialog(QtWidgets.QDialog):
         # self.setFont(self.settings.font)
         # self.setStyleSheet(self.settings.style_sheet)
 
+    def set_theme(self, theme):
+        self.ui.primaryBaseEdit.set_color(theme[self.settings.PRIMARY_BASE_COLOR])
+        self.ui.primaryLightEdit.set_color(theme[self.settings.PRIMARY_LIGHT_COLOR])
+        self.ui.primaryDarkEdit.set_color(theme[self.settings.PRIMARY_DARK_COLOR])
+        self.ui.primaryVeryLightEdit.set_color(theme[self.settings.PRIMARY_VERY_LIGHT_COLOR])
+        self.ui.primaryVeryDarkEdit.set_color(theme[self.settings.PRIMARY_VERY_DARK_COLOR])
+
+        self.ui.accentBaseEdit.set_color(theme[self.settings.ACCENT_BASE_COLOR])
+        self.ui.accentLightEdit.set_color(theme[self.settings.ACCENT_LIGHT_COLOR])
+        self.ui.accentDarkEdit.set_color(theme[self.settings.ACCENT_DARK_COLOR])
+        self.ui.accentVeryLightEdit.set_color(theme[self.settings.ACCENT_VERY_LIGHT_COLOR])
+        self.ui.accentVeryDarkEdit.set_color(theme[self.settings.ACCENT_VERY_DARK_COLOR])
+
+        self.ui.mainTextColorEdit.set_color(theme[self.settings.MAIN_TEXT_COLOR])
+        self.ui.selectedTextColorEdit.set_color(theme[self.settings.SELECTED_TEXT_COLOR])
+        self.ui.errorColorEdit.set_color(theme[self.settings.ERROR_COLOR])
+
+    def update_preset_theme(self):
+        theme = self.ui.presetThemeEdit.currentText()
+        self.ui.primaryBaseEdit.setEnabled(False)
+        self.ui.primaryLightEdit.setEnabled(False)
+        self.ui.primaryDarkEdit.setEnabled(False)
+        self.ui.primaryVeryLightEdit.setEnabled(False)
+        self.ui.primaryVeryDarkEdit.setEnabled(False)
+        self.ui.accentBaseEdit.setEnabled(False)
+        self.ui.accentLightEdit.setEnabled(False)
+        self.ui.accentDarkEdit.setEnabled(False)
+        self.ui.accentVeryLightEdit.setEnabled(False)
+        self.ui.accentVeryDarkEdit.setEnabled(False)
+        self.ui.mainTextColorEdit.setEnabled(False)
+        self.ui.selectedTextColorEdit.setEnabled(False)
+        self.ui.errorColorEdit.setEnabled(False)
+        if theme == "MFA":
+            self.set_theme(self.settings.mfa_theme)
+            self.settings.set_mfa_theme()
+        elif theme != "Native":
+            self.ui.primaryBaseEdit.setEnabled(True)
+            self.ui.primaryLightEdit.setEnabled(True)
+            self.ui.primaryDarkEdit.setEnabled(True)
+            self.ui.primaryVeryLightEdit.setEnabled(True)
+            self.ui.primaryVeryDarkEdit.setEnabled(True)
+            self.ui.accentBaseEdit.setEnabled(True)
+            self.ui.accentLightEdit.setEnabled(True)
+            self.ui.accentDarkEdit.setEnabled(True)
+            self.ui.accentVeryLightEdit.setEnabled(True)
+            self.ui.accentVeryDarkEdit.setEnabled(True)
+            self.ui.mainTextColorEdit.setEnabled(True)
+            self.ui.selectedTextColorEdit.setEnabled(True)
+            self.ui.errorColorEdit.setEnabled(True)
+
+    def update_theme(self):
+        preset_theme = self.ui.presetThemeEdit.currentText()
+        self.settings.setValue(self.settings.THEME_PRESET, preset_theme)
+        if preset_theme != "Native":
+            self.settings.set_theme(self.current_theme)
+        else:
+            self.settings.themeUpdated.emit()
+
+    @property
+    def current_theme(self):
+        return {
+            AnchorSettings.MAIN_TEXT_COLOR: self.ui.mainTextColorEdit.color,
+            AnchorSettings.SELECTED_TEXT_COLOR: self.ui.selectedTextColorEdit.color,
+            AnchorSettings.ERROR_COLOR: self.ui.errorColorEdit.color,
+            AnchorSettings.PRIMARY_BASE_COLOR: self.ui.primaryBaseEdit.color,
+            AnchorSettings.PRIMARY_LIGHT_COLOR: self.ui.primaryLightEdit.color,
+            AnchorSettings.PRIMARY_DARK_COLOR: self.ui.primaryDarkEdit.color,
+            AnchorSettings.PRIMARY_VERY_LIGHT_COLOR: self.ui.primaryVeryLightEdit.color,
+            AnchorSettings.PRIMARY_VERY_DARK_COLOR: self.ui.primaryVeryDarkEdit.color,
+            AnchorSettings.ACCENT_BASE_COLOR: self.ui.accentBaseEdit.color,
+            AnchorSettings.ACCENT_LIGHT_COLOR: self.ui.accentLightEdit.color,
+            AnchorSettings.ACCENT_DARK_COLOR: self.ui.accentDarkEdit.color,
+            AnchorSettings.ACCENT_VERY_LIGHT_COLOR: self.ui.accentVeryLightEdit.color,
+            AnchorSettings.ACCENT_VERY_DARK_COLOR: self.ui.accentVeryDarkEdit.color,
+        }
+
     def accept(self) -> None:
         config.NUM_JOBS = self.ui.numJobsEdit.value()
         config.USE_MP = self.ui.useMpCheckBox.isChecked()
@@ -2524,32 +2647,8 @@ class OptionsDialog(QtWidgets.QDialog):
         self.settings.setValue(
             self.settings.PITCH_DELTA_PITCH, float(self.ui.pitchDeltaEdit.text())
         )
-
-        self.settings.setValue(self.settings.PRIMARY_BASE_COLOR, self.ui.primaryBaseEdit.color)
-        self.settings.setValue(self.settings.PRIMARY_LIGHT_COLOR, self.ui.primaryLightEdit.color)
-        self.settings.setValue(self.settings.PRIMARY_DARK_COLOR, self.ui.primaryDarkEdit.color)
-        self.settings.setValue(
-            self.settings.PRIMARY_VERY_LIGHT_COLOR, self.ui.primaryVeryLightEdit.color
-        )
-        self.settings.setValue(
-            self.settings.PRIMARY_VERY_DARK_COLOR, self.ui.primaryVeryDarkEdit.color
-        )
-
-        self.settings.setValue(self.settings.ACCENT_BASE_COLOR, self.ui.accentBaseEdit.color)
-        self.settings.setValue(self.settings.ACCENT_LIGHT_COLOR, self.ui.accentLightEdit.color)
-        self.settings.setValue(self.settings.ACCENT_DARK_COLOR, self.ui.accentDarkEdit.color)
-        self.settings.setValue(
-            self.settings.ACCENT_VERY_LIGHT_COLOR, self.ui.accentVeryLightEdit.color
-        )
-        self.settings.setValue(
-            self.settings.ACCENT_VERY_DARK_COLOR, self.ui.accentVeryDarkEdit.color
-        )
-
-        self.settings.setValue(self.settings.MAIN_TEXT_COLOR, self.ui.mainTextColorEdit.color)
-        self.settings.setValue(
-            self.settings.SELECTED_TEXT_COLOR, self.ui.selectedTextColorEdit.color
-        )
-        self.settings.setValue(self.settings.ERROR_COLOR, self.ui.errorColorEdit.color)
+        preset_theme = self.ui.presetThemeEdit.currentText()
+        self.settings.setValue(self.settings.THEME_PRESET, preset_theme)
 
         self.settings.setValue(self.settings.FONT, self.ui.fontEdit.font.toString())
 
@@ -2605,11 +2704,26 @@ class OptionsDialog(QtWidgets.QDialog):
         self.settings.setValue(
             self.settings.TIME_DIRECTION, self.ui.timeDirectionComboBox.currentText()
         )
+        self.settings.setValue(
+            self.settings.TIER_MAX_SPEAKERS, int(self.ui.visibleSpeakerComboBox.currentText())
+        )
         self.settings.sync()
-        super(OptionsDialog, self).accept()
+        if preset_theme != "Native":
+            self.settings.set_theme(self.current_theme)
+        else:
+            self.settings.themeUpdated.emit()
+        super().accept()
+
+    def reject(self):
+        self.settings.set_theme(self.initial_theme)
+        self.settings.sync()
+        super().reject()
 
 
 class Application(QtWidgets.QApplication):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
     def setActiveWindow(self, act):
         super().setActiveWindow(act)
         act.styleSheetChanged.connect(self.setStyleSheet)

anchor/models.py

@@ -505,7 +505,13 @@ class FileUtterancesModel(QtCore.QAbstractListModel):
         normalized_text = ""
         speaker_id = None
         channel = None
+        prev_index = None
         for old_utt in sorted(utterances, key=lambda x: x.begin):
+            index = self.reversed_indices[old_utt.id]
+            if prev_index is not None:
+                if index - prev_index != 1:
+                    return
+            prev_index = index
             if speaker_id is None:
                 speaker_id = old_utt.speaker_id
             if channel is None:
@@ -567,7 +573,7 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
     channelChanged = QtCore.Signal()
     resetView = QtCore.Signal()
     viewChanged = QtCore.Signal(object, object)
-    selectionAudioChanged = QtCore.Signal()
+    selectionAudioChanged = QtCore.Signal(object)
     currentUtteranceChanged = QtCore.Signal()
     speakerRequested = QtCore.Signal(object)
 
@@ -606,6 +612,9 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
         self.model().utterancesReady.connect(self.finalize_set_new_file)
         self.viewChanged.connect(self.load_audio_selection)
         self.model().selectionRequested.connect(self.update_selected_utterances)
+        self.view_change_timer = QtCore.QTimer()
+        self.view_change_timer.setInterval(50)
+        self.view_change_timer.timeout.connect(self.send_selection_update)
 
     def selected_utterances(self):
         utts = []
@@ -728,22 +737,21 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
         self.waveformReady.emit()
 
     def select_audio(self, begin, end):
-        if end is not None and end - begin < 0.025:
+        if end is not None and end - begin < 0.05:
             end = None
         self.selected_min_time = begin
         self.selected_max_time = end
         if self.selected_min_time != self.min_time:
-            self.selectionAudioChanged.emit()
+            self.selectionAudioChanged.emit(False)
 
-    def request_start_time(self, start_time):
+    def request_start_time(self, start_time, update=False):
         if start_time >= self.max_time:
             return
         if start_time < self.min_time:
             return
         self.selected_min_time = start_time
         self.selected_max_time = None
-        if self.selected_min_time != self.min_time:
-            self.selectionAudioChanged.emit()
+        self.selectionAudioChanged.emit(update)
 
     def set_current_channel(self, channel):
         if channel == self.selected_channel:
@@ -813,7 +821,21 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
 
     def zoom_to_selection(self):
         if self.selected_min_time is not None and self.selected_max_time is not None:
-            self.set_view_times(self.selected_min_time, self.selected_max_time)
+            begin = self.selected_min_time
+            end = self.selected_max_time
+        elif len(self.selectedRows(0)) > 0:
+            m = self.model()
+            begin = 100000
+            end = 0
+            for index in self.selectedRows(0):
+                u = m.utterances[index.row()]
+                if u.begin < begin:
+                    begin = u.begin
+                if u.end > end:
+                    end = u.end
+        else:
+            return
+        self.set_view_times(begin, end)
 
     def update_from_slider(self, value):
         if not self.max_time:
@@ -821,16 +843,6 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
         cur_window = self.max_time - self.min_time
         self.set_view_times(value, value + cur_window)
 
-    def update_selection_audio(self, begin, end):
-        if begin < self.min_time:
-            begin = self.min_time
-        if end > self.max_time:
-            end = self.max_time
-        self.selected_min_time = begin
-        self.selected_max_time = end
-        if self.selected_min_time != self.min_time:
-            self.selectionAudioChanged.emit()
-
     def visible_utterances(self) -> typing.List[Utterance]:
         file_utts = []
         if not self.model().file:
@@ -866,6 +878,10 @@ class FileSelectionModel(QtCore.QItemSelectionModel):
             and not self.min_time <= self.selected_max_time <= self.max_time
         ):
             self.selected_max_time = None
+        self.view_change_timer.start()
+
+    def send_selection_update(self):
+        self.view_change_timer.stop()
         self.viewChanged.emit(self.min_time, self.max_time)
 
     def set_current_file(self, file_id, begin, end, utterance_id, speaker_id, force_update=False):
@@ -971,7 +987,7 @@ class CorpusSelectionModel(QtCore.QItemSelectionModel):
         self.currentRowChanged.connect(self.switch_utterance)
         # self.selectionChanged.connect(self.update_selection_audio)
         # self.selectionChanged.connect(self.update_selection_audio)
-        self.model().newResults.connect(self.check_selection)
+        # self.model().newResults.connect(self.check_selection)
         self.model().unlockCorpus.connect(self.fileChanged.emit)
 
     def set_current_utterance(self, utterance_id):