Add PauseFactor control

Author: ways2read

NVDA-addon/addon/globalPlugins/MathCAT/MathCATPreferences.py

@@ -98,6 +98,7 @@ def set_ui_values(self):
             #set the rest of the UI elements
             self.m_choiceSpeechAmount.SetSelection(Speech_Verbosity.index(user_preferences["Speech"]["Verbosity"]))
             self.m_sliderRelativeSpeed.SetValue(user_preferences["Speech"]["MathRate"])
+            self.m_sliderPauseFactor.SetValue(user_preferences["Speech"]["PauseFactor"])
             self.m_checkBoxSpeechSound.SetValue(user_preferences["Speech"]["SpeechSound"] == "Beep")
             self.m_choiceSpeechForChemical.SetSelection(Speech_Chemistry.index(user_preferences["Speech"]["Chemistry"]))
             self.m_choiceNavigationMode.SetSelection(Navigation_NavMode.index(user_preferences["Navigation"]["NavMode"]))
@@ -122,6 +123,7 @@ def get_ui_values(self):
         user_preferences["Speech"]["SpeechStyle"] = self.m_choiceSpeechStyle.GetStringSelection()
         user_preferences["Speech"]["Verbosity"] = Speech_Verbosity[self.m_choiceSpeechAmount.GetSelection()]
         user_preferences["Speech"]["MathRate"] = self.m_sliderRelativeSpeed.GetValue()
+        user_preferences["Speech"]["PauseFactor"] = self.m_sliderPauseFactor.GetValue()
         if self.m_checkBoxSpeechSound.GetValue():
             user_preferences["Speech"]["SpeechSound"] = "Beep"
         else:
@@ -201,6 +203,8 @@ def validate_user_preferences():
         UserInterface.validate("Speech", "Verbosity", ["Terse", "Medium", "Verbose"], "Medium")
         #    MathRate: 100               # Change from text speech rate (%)
         UserInterface.validate("Speech", "MathRate", [0,200], 100)
+        #    PauseFactor: 100            # TBC
+        UserInterface.validate("Speech", "PauseFactor", [0,400], 100)
         #  SpeechSound: None           # make a sound when starting/ending math speech -- None, Beep
         UserInterface.validate("Speech", "SpeechSound", ["None", "Beep"], "None")
         #    SpeechStyle: ClearSpeak     # Any known speech style (falls back to ClearSpeak)
@@ -243,6 +247,13 @@ def OnRelativeSpeedChanged( self, event ):
         text = _(u"<prosody rate='XXX%'>the square root of x squared plus y squared</prosody>").replace("XXX", str(rate), 1)
         speak( ConvertSSMLTextForNVDA(text) )
 
+    def OnPauseFactorChanged( self, event ):
+        from .MathCAT import ConvertSSMLTextForNVDA
+        from  speech import speak
+        pausefactor = self.m_sliderPauseFactor.GetValue()
+        text = _(f"the fraction with numerator <break time='{300*pausefactor//100}ms'/> <mark name='M63i335o-4'/> <say-as interpret-as='characters'>x</say-as> to the <mark name='M63i335o-5'/> <say-as interpret-as='characters'>n</say-as> <phoneme alphabet='ipa' ph='θ'>-th</phoneme> power <break time='{128*pausefactor//100}ms'/> <mark name='M63i335o-6'/> plus  <mark name='M63i335o-7'/> 1 <break time='{300*pausefactor//100}ms'/> and denominator <mark name='M63i335o-10'/> <say-as interpret-as='characters'>x</say-as> to the <mark name='M63i335o-11'/> <say-as interpret-as='characters'>n</say-as> <phoneme alphabet='ipa' ph='θ'>-th</phoneme> power <break time='{128*pausefactor//100}ms'/> <mark name='M63i335o-12'/> minus  <mark name='M63i335o-13'/> 1 <break time='{600*pausefactor//100}ms'/>end fraction <break time='{150*pausefactor//100}ms'/>")
+        speak( ConvertSSMLTextForNVDA(text) )
+
     def OnClickOK(self,event):
         UserInterface.get_ui_values(self)
         UserInterface.write_user_preferences()

NVDA-addon/addon/globalPlugins/MathCAT/MathCATgui.py

@@ -129,6 +129,19 @@ def __init__( self, parent ):
 
 		bSizer121.Add( bSizer7131, 1, wx.EXPAND, 5 )
 
+		bSizerPauseFactor = wx.BoxSizer( wx.HORIZONTAL )
+
+		self.m_staticPauseFactor = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Pause factor:"), wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticPauseFactor.Wrap( -1 )
+
+		bSizerPauseFactor.Add( self.m_staticPauseFactor, 0, wx.ALL, 5 )
+
+		self.m_sliderPauseFactor = wx.Slider( self.m_panelSpeech, wx.ID_ANY, 100, 0, 400, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL )
+		bSizerPauseFactor.Add( self.m_sliderPauseFactor, 0, wx.ALL, 5 )
+
+
+		bSizer121.Add( bSizerPauseFactor, 1, wx.EXPAND, 5 )
+
 		bSizer7121 = wx.BoxSizer( wx.HORIZONTAL )
 
 		self.m_checkBoxSpeechSound = wx.CheckBox( self.m_panelSpeech, wx.ID_ANY, _(u"Make a sound when starting/ending math speech"), wx.DefaultPosition, wx.DefaultSize, 0 )
@@ -329,6 +342,7 @@ def __init__( self, parent ):
 		self.m_listBoxPreferencesTopic.Bind( wx.EVT_LISTBOX, self.OnListBoxCategories )
 		self.m_choiceLanguage.Bind( wx.EVT_CHOICE, self.OnLanguage )
 		self.m_sliderRelativeSpeed.Bind( wx.EVT_SCROLL_CHANGED, self.OnRelativeSpeedChanged )
+		self.m_sliderPauseFactor.Bind( wx.EVT_SCROLL_CHANGED, self.OnPauseFactorChanged )
 		self.m_buttonOK.Bind( wx.EVT_BUTTON, self.OnClickOK )
 		self.m_buttonCancel.Bind( wx.EVT_BUTTON, self.OnClickCancel )
 		self.m_buttonApply.Bind( wx.EVT_BUTTON, self.OnClickApply )
@@ -355,6 +369,9 @@ def OnLanguage( self, event ):
 	def OnRelativeSpeedChanged( self, event ):
 		event.Skip()
 
+	def OnPauseFactorChanged( self, event ):
+		event.Skip()
+
 	def OnClickOK( self, event ):
 		event.Skip()