diff --git a/main.py b/main.py index 459cb9bbb374ad6c22c331d8138c61fb4658c5d7..bded1a2a1d53faa2c3f5bb9e28b4573c78e24c12 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,5 @@ ''' -W.Wojnowski 2021 +W.Wojnowski 2022 ''' # imports: import tkinter as tk @@ -650,18 +650,18 @@ entry2.bind('<Return>', calc_crit_2) ttk.Button(tab2.frame, text='Set', command=calc_crit_2, width=8).grid(column=0, row=3, padx=80, pady=8, sticky='w') # --------------------------- TAB3 --------------------------- -tab3 = Tab(tab_no='3', title='Sustainability and renewability of materials', - text1='The application of materials from sustainable or renewable sources ' +tab3 = Tab(tab_no='3', title='Sustainability, renewability, and reusability of materials', + text1='The application of materials from sustainable and renewable sources ' 'should be prioritized.', text2='Ratio of the mass of sustainable and renewable materials to the total ' 'mass of materials used:', criterion=criteria[2]) -tab3_choices = {'Only sustainable and renewable materials are used several times': 1.0, +tab3_choices = {'Only sustainable and renewable materials are used SEVERAL TIMES': 1.0, '> 75% of reagents and materials are sustainable or renewable': 0.75, - '50-75% of reagents and materials are sustainable or renewable and can only be used once': 0.50, + '50-75% of reagents and materials are sustainable or renewable, but can only be used ONCE': 0.50, + 'Materials are not sustainable or renewable, but are used SEVERAL TIMES': 0.50, '25-50% of reagents and materials are sustainable or renewable': 0.25, - '< 25% of reagents and materials are sustainable or renewable and can only be used once': 0, - 'Materials are not sustainable or renewable and are used several times': 0.5, } + '< 25% of reagents and materials are sustainable or renewable, but can only be used ONCE': 0,} dropdown3 = ttk.OptionMenu(tab3.frame, criteria[2].optionvar, criteria[2].optionvar.get(), *tab3_choices.keys(), command=lambda x: change_dropdown(criteria[2], tab3_choices)) # the ttk style for OptionMenu does not include a style for the tk dropdown menu, @@ -932,6 +932,3 @@ def main(): main() - - -