From 18ea894f357bc645efa2e51535609d5f1aee4198 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Fri, 28 May 2021 11:46:56 +0200 Subject: [PATCH] Better titles for area method widgets --- pyzebra/app/panel_ccl_integrate.py | 14 ++++++-------- pyzebra/app/panel_param_study.py | 12 +++++------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pyzebra/app/panel_ccl_integrate.py b/pyzebra/app/panel_ccl_integrate.py index bc1250e..63ec5af 100644 --- a/pyzebra/app/panel_ccl_integrate.py +++ b/pyzebra/app/panel_ccl_integrate.py @@ -28,7 +28,7 @@ from bokeh.models import ( Panel, PanTool, Plot, - RadioButtonGroup, + RadioGroup, ResetTool, Scatter, Select, @@ -505,9 +505,10 @@ def create(): proc_button = Button(label="Process Current", width=145) proc_button.on_click(proc_button_callback) - area_method_radiobutton = RadioButtonGroup(labels=["Fit area", "Int area"], active=0, width=145) + area_method_div = Div(text="Intensity:", margin=(5, 5, 0, 5)) + area_method_radiobutton = RadioGroup(labels=["Function", "Area"], active=0, width=145) - lorentz_checkbox = CheckboxGroup(labels=["Lorentz Correction"], width=145, margin=[13, 5, 5, 5]) + lorentz_checkbox = CheckboxGroup(labels=["Lorentz Correction"], width=145, margin=(13, 5, 5, 5)) export_preview_textinput = TextAreaInput(title="Export file preview:", width=500, height=400) @@ -566,11 +567,8 @@ def create(): column(fitparams_add_dropdown, fitparams_select, fitparams_remove_button), fitparams_table, Spacer(width=20), - column( - row(fit_from_spinner, fit_to_spinner), - row(area_method_radiobutton, lorentz_checkbox), - row(proc_button, proc_all_button), - ), + column(fit_from_spinner, lorentz_checkbox, area_method_div, area_method_radiobutton), + column(fit_to_spinner, proc_button, proc_all_button), ) scan_layout = column( diff --git a/pyzebra/app/panel_param_study.py b/pyzebra/app/panel_param_study.py index 26a5b88..b8ac8fa 100644 --- a/pyzebra/app/panel_param_study.py +++ b/pyzebra/app/panel_param_study.py @@ -590,9 +590,10 @@ def create(): proc_button = Button(label="Process Current", width=145) proc_button.on_click(proc_button_callback) - area_method_radiobutton = RadioButtonGroup(labels=["Fit area", "Int area"], active=0, width=145) + area_method_div = Div(text="Intensity:", margin=(5, 5, 0, 5)) + area_method_radiobutton = RadioButtonGroup(labels=["Function", "Area"], active=0, width=145) - lorentz_checkbox = CheckboxGroup(labels=["Lorentz Correction"], width=145, margin=[13, 5, 5, 5]) + lorentz_checkbox = CheckboxGroup(labels=["Lorentz Correction"], width=145, margin=(13, 5, 5, 5)) export_preview_textinput = TextAreaInput(title="Export file preview:", width=450, height=400) @@ -628,11 +629,8 @@ def create(): column(fitparams_add_dropdown, fitparams_select, fitparams_remove_button), fitparams_table, Spacer(width=20), - column( - row(fit_from_spinner, fit_to_spinner), - row(area_method_radiobutton, lorentz_checkbox), - row(proc_button, proc_all_button), - ), + column(fit_from_spinner, lorentz_checkbox, area_method_div, area_method_radiobutton), + column(fit_to_spinner, proc_button, proc_all_button), ) scan_layout = column(scan_table, row(monitor_spinner, param_select))