From 73b4634243cc875591e535207375528ce5b36690 Mon Sep 17 00:00:00 2001 From: Camden Zhu <123699579+camsinfiniteram@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:03:45 -0600 Subject: [PATCH 1/9] wider leftmost panel To do: make panel size adjustable? --- wave_viewer.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wave_viewer.m b/wave_viewer.m index d48970f..2fdc7e6 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -136,7 +136,7 @@ % create panel for buttons buttonPanelXPos = panelPad; buttonPanelYPos = panelPad; -buttonPanelXSpan = 0.1; +buttonPanelXSpan = 0.2; buttonPanelYSpan = 1 - panelPad*2; buttonPanelPos = [buttonPanelXPos buttonPanelYPos buttonPanelXSpan buttonPanelYSpan]; p.guidata.buttonPanel = uipanel(p.guidata.f,'Units','Normalized',... From 047e6250c1ad28cd04471c3cc6578959befbacf1 Mon Sep 17 00:00:00 2001 From: Chris Naber Date: Mon, 25 Nov 2024 10:41:54 -0600 Subject: [PATCH 2/9] left panel size 0.14 --- wave_viewer.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wave_viewer.m b/wave_viewer.m index 2fdc7e6..65d8ec0 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -136,7 +136,7 @@ % create panel for buttons buttonPanelXPos = panelPad; buttonPanelYPos = panelPad; -buttonPanelXSpan = 0.2; +buttonPanelXSpan = 0.14; buttonPanelYSpan = 1 - panelPad*2; buttonPanelPos = [buttonPanelXPos buttonPanelYPos buttonPanelXSpan buttonPanelYSpan]; p.guidata.buttonPanel = uipanel(p.guidata.f,'Units','Normalized',... From 88930f79c1b6670e7579c0bebce4060445b451a7 Mon Sep 17 00:00:00 2001 From: Camden Zhu <123699579+camsinfiniteram@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:03:04 -0600 Subject: [PATCH 3/9] ui adjustments (panels, font size, etc) --- wave_viewer.m | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/wave_viewer.m b/wave_viewer.m index 65d8ec0..7fe3f42 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -146,9 +146,9 @@ 'BorderType','none'); % create panel for frequency-based axes -faxesPanelXPos = buttonPanelXPos + buttonPanelXSpan + panelPad*.75; +faxesPanelXPos = buttonPanelXPos + buttonPanelXSpan; faxesPanelYPos = panelPad*2; % extra pad on bottom -faxesPanelXSpan = 1 - faxesPanelXPos - panelPad; +faxesPanelXSpan = 0.8 - faxesPanelXPos - panelPad; %TODO reference for right panels faxesPanelYSpan = 0.2; faxesPanelPos = [faxesPanelXPos faxesPanelYPos faxesPanelXSpan faxesPanelYSpan]; p.guidata.faxesPanel = uipanel(p.guidata.f,'Units','Normalized',... @@ -212,15 +212,17 @@ buttonWidth = .9; buttonHeight = .05; -buttonFontSize = .4; +buttonFontSize = .45; sliderHeight = .025; dropdownHeight = .03; dropdownFontSize = .5; editHeight = .025; -editFontSize = .6; +editFontSize = 1; textHeight = buttonHeight; textFontSize = buttonFontSize; +labelFontSize = textFontSize * 1.3; textPosYOffset = 0.0240; +labelPosYOffset = 0.5; tinyHeight = textHeight*.75; tinyPosYOffset = textPosYOffset*.75; @@ -377,7 +379,7 @@ function contprogram(hObject,eventdata) % callback for h_button_contprogram hbutton.cont = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','
rename
events
',... 'Units','Normalized','Position',editEventsButtonPos,... - 'FontUnits','Normalized','FontSize',buttonFontSize*0.75,... + 'FontUnits','Normalized','FontSize',buttonFontSize*0.86,... 'Callback',@edit_events); % no change in horiz_orig, since "previous" button is in-line with "continue" button function edit_events(hObject,eventdata) % callback for h_button_edit_events @@ -446,7 +448,7 @@ function edit_events(hObject,eventdata) % callback for h_button_edit_events hbutton.clear_events = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','
clear
events
',... 'Units','Normalized','Position',clearEventsButtonPos,... - 'FontUnits','Normalized','FontSize',buttonFontSize*0.75,... + 'FontUnits','Normalized','FontSize',buttonFontSize*0.86,... 'Callback',@clear_events); horiz_orig = horiz_orig + buttonHeight + padYButton; function clear_events(hObject,eventdata) % callback for h_button_clear_events @@ -597,14 +599,14 @@ function set_max_gray(hObject,eventdata) % callback for h_slider_max_gray horiz_orig = horiz_orig + dropdownHeight + padYSmall; % ms framespec: gram text -horiz_orig = horiz_orig - tinyPosYOffset; +horiz_orig = horiz_orig - tinyPosYOffset + 0.01; msFramespecGramTextPos = [padL horiz_orig buttonWidth tinyHeight]; htext.ms_framespec_gram = uicontrol(p.guidata.buttonPanel,'Style','text',... 'String','framespec: gram',... 'Units','Normalized','Position',msFramespecGramTextPos,... - 'FontUnits','Normalized','FontSize',textFontSize); + 'FontUnits','Normalized','FontSize',labelFontSize); uistack(htext.ms_framespec_gram,'bottom'); % move to bottom -horiz_orig = horiz_orig + tinyHeight + padYSmall; +horiz_orig = horiz_orig + tinyHeight + padYBig*0.5; last_sigproc_params.ms_framespec_gram = p.sigproc_params.ms_framespec_gram; function set_ms_framespec_gram(hObject,eventdata) % callback for hdropdown.ms_framespec_gram p.sigproc_params.ms_framespec_gram = all_ms_framespecs.name{get(hdropdown.ms_framespec_gram,'Value')}; @@ -627,14 +629,14 @@ function set_ms_framespec_gram(hObject,eventdata) % callback for hdropdown.ms_fr horiz_orig = horiz_orig + dropdownHeight + padYSmall; % ms framespec: formant text -horiz_orig = horiz_orig - tinyPosYOffset; +horiz_orig = horiz_orig - tinyPosYOffset + 0.01; msFramespecFormTextPos = [padL horiz_orig buttonWidth tinyHeight]; htext.ms_framespec_form = uicontrol(p.guidata.buttonPanel,'Style','text',... 'String','framespec: formants',... 'Units','Normalized','Position',msFramespecFormTextPos,... - 'FontUnits','Normalized','FontSize',textFontSize); + 'FontUnits','Normalized','FontSize',labelFontSize); uistack(htext.ms_framespec_form,'bottom'); % move to bottom -horiz_orig = horiz_orig + tinyHeight + padYBig; +horiz_orig = horiz_orig + tinyHeight + padYBig*0.5; last_sigproc_params.ms_framespec_form = p.sigproc_params.ms_framespec_form; function set_ms_framespec_form(hObject,eventdata) % callback for hdropdown.ms_framespec_form p.sigproc_params.ms_framespec_form = all_ms_framespecs.name{get(hdropdown.ms_framespec_form,'Value')}; @@ -665,7 +667,7 @@ function set_ms_framespec_form(hObject,eventdata) % callback for hdropdown.ms_fr 'Units','Normalized','Position',nlpcTextPos,... 'FontUnits','Normalized','FontSize',textFontSize); uistack(htext.nlpc,'bottom'); % move to bottom -horiz_orig = horiz_orig + textHeight + padYBig; +horiz_orig = horiz_orig + textHeight + padYBig*0.5; last_sigproc_params.nlpc = p.sigproc_params.nlpc; function set_nlpc_choice(hObject,eventdata) % callback for hdropdown.nlpc p.sigproc_params.nlpc = p.sigproc_params.nlpc_choices(get(hdropdown.nlpc,'Value')); @@ -689,7 +691,7 @@ function set_nlpc_choice(hObject,eventdata) % callback for hdropdown.nlpc 'Units','Normalized','Position',amplThreshTextPos,... 'FontUnits','Normalized','FontSize',textFontSize); uistack(p.guidata.text_ampl_thresh4voicing,'bottom'); % move to bottom -horiz_orig = horiz_orig + textHeight + padYBig; +horiz_orig = horiz_orig + textHeight + padYBig*.5; function set_edit_ampl_thresh4voicing(hObject,eventdata) % callback for hedit.ampl_thresh4voicing set_ampl_thresh4voicing(str2double(get(hedit.ampl_thresh4voicing,'String'))); end @@ -711,7 +713,7 @@ function set_ampl_thresh4voicing(new_ampl_thresh4voicing) 'Units','Normalized','Position',calcButtonPos,... 'FontUnits','Normalized','FontSize',buttonFontSize,... 'Callback',@toggle_formants); -horiz_orig = horiz_orig + buttonHeight + padYButton; +horiz_orig = horiz_orig + buttonHeight + padYButton*0.8; function toggle_formants(hObject,eventdata) % callback for hbutton.toggle_formant axinfo = get(gram_ax,'UserData'); locF1 = find(gram_ax.Children == axinfo.hply(2)); @@ -736,7 +738,7 @@ function toggle_formants(hObject,eventdata) % callback for hbutton.toggle_forman 'Units','Normalized','Position',calcButtonPos,... 'FontUnits','Normalized','FontSize',buttonFontSize,... 'Callback',@calcFx); -horiz_orig = horiz_orig + buttonHeight + padYButton; +horiz_orig = horiz_orig + buttonHeight + padYButton*0.25; normal_bgcolor = get(hbutton.calc,'BackgroundColor'); function calcFx(hObject,eventdata) % callback for hbutton.calc update_ampl_ax( ampl_ax,wave_ax, p); From 7d35ddab2fbe89bba64569e1a0b149cac8e713a5 Mon Sep 17 00:00:00 2001 From: Camden Zhu <123699579+camsinfiniteram@users.noreply.github.com> Date: Mon, 2 Dec 2024 12:13:21 -0600 Subject: [PATCH 4/9] increased button font size, reduced left panel margins --- wave_viewer.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wave_viewer.m b/wave_viewer.m index 7fe3f42..bf605e6 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -148,7 +148,7 @@ % create panel for frequency-based axes faxesPanelXPos = buttonPanelXPos + buttonPanelXSpan; faxesPanelYPos = panelPad*2; % extra pad on bottom -faxesPanelXSpan = 0.8 - faxesPanelXPos - panelPad; %TODO reference for right panels +faxesPanelXSpan = 1 - faxesPanelXPos - panelPad; %TODO reference for right panels faxesPanelYSpan = 0.2; faxesPanelPos = [faxesPanelXPos faxesPanelYPos faxesPanelXSpan faxesPanelYSpan]; p.guidata.faxesPanel = uipanel(p.guidata.f,'Units','Normalized',... @@ -332,11 +332,11 @@ function endprogram(hObject,eventdata) % callback for h_button_endprogram end % previous button -prevButtonPos = [padL horiz_orig buttonWidth/3 buttonHeight]; +prevButtonPos = [padL horiz_orig buttonWidth/2 buttonHeight]; hbutton.cont = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','previous',... 'Units','Normalized','Position',prevButtonPos,... - 'FontUnits','Normalized','FontSize',buttonFontSize*2/3,... + 'FontUnits','Normalized','FontSize',buttonFontSize,... 'Callback',@prevprogram); % no change in horiz_orig, since "previous" button is in-line with "continue" button function prevprogram(hObject,eventdata) % callback for h_button_contprogram @@ -347,7 +347,7 @@ function prevprogram(hObject,eventdata) % callback for h_button_contprogram end % continue button -contButtonPos = [padL+buttonWidth*1/3 horiz_orig buttonWidth*2/3 buttonHeight]; +contButtonPos = [padL+buttonWidth*1/2 horiz_orig buttonWidth/2 buttonHeight]; hbutton.cont = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','continue',... 'Units','Normalized','Position',contButtonPos,... @@ -377,9 +377,9 @@ function contprogram(hObject,eventdata) % callback for h_button_contprogram % edit events button editEventsButtonPos = [padL horiz_orig buttonWidth/2 buttonHeight]; hbutton.cont = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... - 'String','
rename
events
',... + 'String','
rename events
',... 'Units','Normalized','Position',editEventsButtonPos,... - 'FontUnits','Normalized','FontSize',buttonFontSize*0.86,... + 'FontUnits','Normalized','FontSize',buttonFontSize*0.9,... 'Callback',@edit_events); % no change in horiz_orig, since "previous" button is in-line with "continue" button function edit_events(hObject,eventdata) % callback for h_button_edit_events @@ -448,7 +448,7 @@ function edit_events(hObject,eventdata) % callback for h_button_edit_events hbutton.clear_events = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','
clear
events
',... 'Units','Normalized','Position',clearEventsButtonPos,... - 'FontUnits','Normalized','FontSize',buttonFontSize*0.86,... + 'FontUnits','Normalized','FontSize',buttonFontSize*0.9,... 'Callback',@clear_events); horiz_orig = horiz_orig + buttonHeight + padYButton; function clear_events(hObject,eventdata) % callback for h_button_clear_events @@ -679,7 +679,7 @@ function set_nlpc_choice(hObject,eventdata) % callback for hdropdown.nlpc hedit.ampl_thresh4voicing = uicontrol(p.guidata.buttonPanel,'Style','edit',... 'String',p.sigproc_params.ampl_thresh4voicing, ... 'Units','Normalized','Position',amplThreshEditPos,... - 'FontUnits','Normalized','FontSize',editFontSize,... + 'FontUnits','Normalized','FontSize',editFontSize*0.9,... 'Callback',@set_edit_ampl_thresh4voicing); horiz_orig = horiz_orig + editHeight + padYSmall; @@ -689,7 +689,7 @@ function set_nlpc_choice(hObject,eventdata) % callback for hdropdown.nlpc p.guidata.text_ampl_thresh4voicing = uicontrol(p.guidata.buttonPanel,'Style','text',... 'String','ampl threshold',... 'Units','Normalized','Position',amplThreshTextPos,... - 'FontUnits','Normalized','FontSize',textFontSize); + 'FontUnits','Normalized','FontSize',textFontSize*0.9); uistack(p.guidata.text_ampl_thresh4voicing,'bottom'); % move to bottom horiz_orig = horiz_orig + textHeight + padYBig*.5; function set_edit_ampl_thresh4voicing(hObject,eventdata) % callback for hedit.ampl_thresh4voicing From 30a66fdc24a3874615bf935e7235f1ecc6617d25 Mon Sep 17 00:00:00 2001 From: Camden Zhu <123699579+camsinfiniteram@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:24:05 -0600 Subject: [PATCH 5/9] additional ui edits minor font size changes to match rest of panels --- wave_viewer.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wave_viewer.m b/wave_viewer.m index bf605e6..b5e0b3f 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -501,7 +501,7 @@ function update_toggle_display() hedit.preemph = uicontrol(p.guidata.buttonPanel,'Style','edit',... 'String',p.sigproc_params.preemph, ... 'Units','Normalized','Position',preemphEditPos,... - 'FontUnits','Normalized','FontSize',editFontSize,... + 'FontUnits','Normalized','FontSize',editFontSize*0.8,... 'TooltipString','Default of 0 includes Praat preemph', ... 'Callback', @preemph_text); horiz_orig = horiz_orig + editHeight + padYSmall; @@ -679,7 +679,7 @@ function set_nlpc_choice(hObject,eventdata) % callback for hdropdown.nlpc hedit.ampl_thresh4voicing = uicontrol(p.guidata.buttonPanel,'Style','edit',... 'String',p.sigproc_params.ampl_thresh4voicing, ... 'Units','Normalized','Position',amplThreshEditPos,... - 'FontUnits','Normalized','FontSize',editFontSize*0.9,... + 'FontUnits','Normalized','FontSize',editFontSize*0.7,... 'Callback',@set_edit_ampl_thresh4voicing); horiz_orig = horiz_orig + editHeight + padYSmall; From 5a2e402dcbd20722cb902f7d1d6a6ded8ce8b995 Mon Sep 17 00:00:00 2001 From: Camden Zhu <123699579+camsinfiniteram@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:30:04 -0600 Subject: [PATCH 6/9] 'pitch params' button text size matches other buttons --- wave_viewer.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wave_viewer.m b/wave_viewer.m index b5e0b3f..1a944ed 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -261,7 +261,7 @@ function my_help_func(hObject,eventdata) % callback for help button hbutton.pitch_params = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','pitch params',... 'Units','Normalized','Position',pitchParamButtonPos,... - 'FontUnits','Normalized','FontSize',buttonFontSize*0.75,... + 'FontUnits','Normalized','FontSize',buttonFontSize*0.9,... 'Callback',@edit_pitch_params); % TODO make text in 2 rows horiz_orig = horiz_orig + buttonHeight + padYButton; From 4e589dcd29097a95bf41fe43d778dc68af2eef22 Mon Sep 17 00:00:00 2001 From: Chris Naber <50926971+cwnaber@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:24:00 -0600 Subject: [PATCH 7/9] reduce "events" button sizes --- wave_viewer.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wave_viewer.m b/wave_viewer.m index 1a944ed..63dee02 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -379,7 +379,7 @@ function contprogram(hObject,eventdata) % callback for h_button_contprogram hbutton.cont = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','
rename events
',... 'Units','Normalized','Position',editEventsButtonPos,... - 'FontUnits','Normalized','FontSize',buttonFontSize*0.9,... + 'FontUnits','Normalized','FontSize',buttonFontSize*0.85,... 'Callback',@edit_events); % no change in horiz_orig, since "previous" button is in-line with "continue" button function edit_events(hObject,eventdata) % callback for h_button_edit_events @@ -446,9 +446,9 @@ function edit_events(hObject,eventdata) % callback for h_button_edit_events % clear events button clearEventsButtonPos = [padL+buttonWidth*1/2 horiz_orig buttonWidth*1/2 buttonHeight]; hbutton.clear_events = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... - 'String','
clear
events
',... + 'String','
clear events
',... 'Units','Normalized','Position',clearEventsButtonPos,... - 'FontUnits','Normalized','FontSize',buttonFontSize*0.9,... + 'FontUnits','Normalized','FontSize',buttonFontSize*0.85,... 'Callback',@clear_events); horiz_orig = horiz_orig + buttonHeight + padYButton; function clear_events(hObject,eventdata) % callback for h_button_clear_events From 367edc9c14751dc403a615f546aaa2181b827939 Mon Sep 17 00:00:00 2001 From: Camden Zhu <123699579+camsinfiniteram@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:48:55 -0600 Subject: [PATCH 8/9] reduced spacing between 'framespec' dropdowns, bolded prev/continue buttons --- wave_viewer.m | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/wave_viewer.m b/wave_viewer.m index 63dee02..eda6295 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -337,6 +337,7 @@ function endprogram(hObject,eventdata) % callback for h_button_endprogram 'String','previous',... 'Units','Normalized','Position',prevButtonPos,... 'FontUnits','Normalized','FontSize',buttonFontSize,... + 'FontWeight','bold', ... 'Callback',@prevprogram); % no change in horiz_orig, since "previous" button is in-line with "continue" button function prevprogram(hObject,eventdata) % callback for h_button_contprogram @@ -352,6 +353,7 @@ function prevprogram(hObject,eventdata) % callback for h_button_contprogram 'String','continue',... 'Units','Normalized','Position',contButtonPos,... 'FontUnits','Normalized','FontSize',buttonFontSize,... + 'FontWeight','bold', ... 'Callback',@contprogram); horiz_orig = horiz_orig + buttonHeight + padYButton; function contprogram(hObject,eventdata) % callback for h_button_contprogram @@ -599,14 +601,14 @@ function set_max_gray(hObject,eventdata) % callback for h_slider_max_gray horiz_orig = horiz_orig + dropdownHeight + padYSmall; % ms framespec: gram text -horiz_orig = horiz_orig - tinyPosYOffset + 0.01; +horiz_orig = horiz_orig - tinyPosYOffset; msFramespecGramTextPos = [padL horiz_orig buttonWidth tinyHeight]; htext.ms_framespec_gram = uicontrol(p.guidata.buttonPanel,'Style','text',... 'String','framespec: gram',... 'Units','Normalized','Position',msFramespecGramTextPos,... - 'FontUnits','Normalized','FontSize',labelFontSize); + 'FontUnits','Normalized','FontSize',textFontSize); uistack(htext.ms_framespec_gram,'bottom'); % move to bottom -horiz_orig = horiz_orig + tinyHeight + padYBig*0.5; +horiz_orig = horiz_orig + tinyHeight + padYSmall; last_sigproc_params.ms_framespec_gram = p.sigproc_params.ms_framespec_gram; function set_ms_framespec_gram(hObject,eventdata) % callback for hdropdown.ms_framespec_gram p.sigproc_params.ms_framespec_gram = all_ms_framespecs.name{get(hdropdown.ms_framespec_gram,'Value')}; @@ -629,14 +631,14 @@ function set_ms_framespec_gram(hObject,eventdata) % callback for hdropdown.ms_fr horiz_orig = horiz_orig + dropdownHeight + padYSmall; % ms framespec: formant text -horiz_orig = horiz_orig - tinyPosYOffset + 0.01; +horiz_orig = horiz_orig - tinyPosYOffset; msFramespecFormTextPos = [padL horiz_orig buttonWidth tinyHeight]; htext.ms_framespec_form = uicontrol(p.guidata.buttonPanel,'Style','text',... 'String','framespec: formants',... 'Units','Normalized','Position',msFramespecFormTextPos,... - 'FontUnits','Normalized','FontSize',labelFontSize); + 'FontUnits','Normalized','FontSize',textFontSize); uistack(htext.ms_framespec_form,'bottom'); % move to bottom -horiz_orig = horiz_orig + tinyHeight + padYBig*0.5; +horiz_orig = horiz_orig + tinyHeight + padYBig*0.75; last_sigproc_params.ms_framespec_form = p.sigproc_params.ms_framespec_form; function set_ms_framespec_form(hObject,eventdata) % callback for hdropdown.ms_framespec_form p.sigproc_params.ms_framespec_form = all_ms_framespecs.name{get(hdropdown.ms_framespec_form,'Value')}; From 9540d4a937f04eb8d8ebd5d992c503a778bc5243 Mon Sep 17 00:00:00 2001 From: Camden Zhu <123699579+camsinfiniteram@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:40:31 -0600 Subject: [PATCH 9/9] final panel edits --- wave_viewer.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wave_viewer.m b/wave_viewer.m index eda6295..a3a37e1 100644 --- a/wave_viewer.m +++ b/wave_viewer.m @@ -148,7 +148,7 @@ % create panel for frequency-based axes faxesPanelXPos = buttonPanelXPos + buttonPanelXSpan; faxesPanelYPos = panelPad*2; % extra pad on bottom -faxesPanelXSpan = 1 - faxesPanelXPos - panelPad; %TODO reference for right panels +faxesPanelXSpan = 1 - faxesPanelXPos - panelPad; % reference for right panels faxesPanelYSpan = 0.2; faxesPanelPos = [faxesPanelXPos faxesPanelYPos faxesPanelXSpan faxesPanelYSpan]; p.guidata.faxesPanel = uipanel(p.guidata.f,'Units','Normalized',... @@ -652,7 +652,7 @@ function set_ms_framespec_form(hObject,eventdata) % callback for hdropdown.ms_fr end initial_dropdown_value = find(p.sigproc_params.nlpc_choices == p.sigproc_params.nlpc); if isempty(initial_dropdown_value), initial_dropdown_value = 1; end -nlpcDropdownPos = [padL horiz_orig buttonWidth dropdownHeight]; +nlpcDropdownPos = [padL horiz_orig+0.01 buttonWidth dropdownHeight]; hdropdown.nlpc = uicontrol(p.guidata.buttonPanel,'Style','popupmenu',... 'String',nlpc_choice_strs,... 'Value',initial_dropdown_value, ... @@ -663,7 +663,7 @@ function set_ms_framespec_form(hObject,eventdata) % callback for hdropdown.ms_fr % nlpc text horiz_orig = horiz_orig - textPosYOffset; -nlpcTextPos = [padL horiz_orig buttonWidth textHeight]; +nlpcTextPos = [padL horiz_orig+0.01 buttonWidth textHeight]; htext.nlpc = uicontrol(p.guidata.buttonPanel,'Style','text',... 'String','LPC order',... 'Units','Normalized','Position',nlpcTextPos,... @@ -677,7 +677,7 @@ function set_nlpc_choice(hObject,eventdata) % callback for hdropdown.nlpc end % amplitude threshold edit -amplThreshEditPos = [padL horiz_orig buttonWidth editHeight]; +amplThreshEditPos = [padL horiz_orig+0.02 buttonWidth editHeight]; hedit.ampl_thresh4voicing = uicontrol(p.guidata.buttonPanel,'Style','edit',... 'String',p.sigproc_params.ampl_thresh4voicing, ... 'Units','Normalized','Position',amplThreshEditPos,... @@ -687,11 +687,11 @@ function set_nlpc_choice(hObject,eventdata) % callback for hdropdown.nlpc % amplitude threshold text horiz_orig = horiz_orig - textPosYOffset; -amplThreshTextPos = [padL horiz_orig buttonWidth textHeight]; +amplThreshTextPos = [padL horiz_orig+0.02 buttonWidth textHeight]; p.guidata.text_ampl_thresh4voicing = uicontrol(p.guidata.buttonPanel,'Style','text',... 'String','ampl threshold',... 'Units','Normalized','Position',amplThreshTextPos,... - 'FontUnits','Normalized','FontSize',textFontSize*0.9); + 'FontUnits','Normalized','FontSize',textFontSize); uistack(p.guidata.text_ampl_thresh4voicing,'bottom'); % move to bottom horiz_orig = horiz_orig + textHeight + padYBig*.5; function set_edit_ampl_thresh4voicing(hObject,eventdata) % callback for hedit.ampl_thresh4voicing @@ -709,7 +709,7 @@ function set_ampl_thresh4voicing(new_ampl_thresh4voicing) end % show/hide formant button -calcButtonPos = [padL horiz_orig buttonWidth buttonHeight]; +calcButtonPos = [padL horiz_orig+0.03 buttonWidth buttonHeight]; hbutton.toggle_formant = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','toggle formants',... 'Units','Normalized','Position',calcButtonPos,... @@ -734,13 +734,13 @@ function toggle_formants(hObject,eventdata) % callback for hbutton.toggle_forman set(gram_ax,'UserData',axinfo); end % calc button -calcButtonPos = [padL horiz_orig buttonWidth buttonHeight]; +calcButtonPos = [padL horiz_orig+0.03 buttonWidth buttonHeight]; hbutton.calc = uicontrol(p.guidata.buttonPanel,'Style','pushbutton',... 'String','calc',... 'Units','Normalized','Position',calcButtonPos,... 'FontUnits','Normalized','FontSize',buttonFontSize,... 'Callback',@calcFx); -horiz_orig = horiz_orig + buttonHeight + padYButton*0.25; +horiz_orig = horiz_orig + buttonHeight + padYButton; normal_bgcolor = get(hbutton.calc,'BackgroundColor'); function calcFx(hObject,eventdata) % callback for hbutton.calc update_ampl_ax( ampl_ax,wave_ax, p);