Polishing new plotting, fixes

Author: Askaniy

src/gui.py

@@ -261,6 +261,7 @@ def translate(window: sg.Window, T2_num: int, lang: str):
     window['T1_colorHEX'].update(tr.gui_hex[lang])
     window['T1_add'].update(tr.gui_add[lang])
     window['T1_plot'].update(tr.gui_plot[lang])
+    window['T1_clear'].update(tr.gui_clear[lang])
     window['T1_export'].update(tr.gui_export[lang])
     window['T2_title1'].update(tr.gui_input[lang])
     window['T2_title2'].update(tr.gui_output[lang])

src/main.py

@@ -65,14 +65,13 @@ def launch_window():
     bitness = int(window['-bitness-'].get())
     rounding = int(window['-rounding-'].get())
 
-    T1_plot_list = [] # list of objects names to plot
-    T1_plot_data = [] # list of X, Y and color for each object to plot
+    T1_plot_data = [] # list of X, Y, color and name for each object to plot
 
 
     # Window events loop
 
     while True:
-        event, values = window.Read()
+        event, values = window.read()
 
         # Independent window events
 
@@ -209,14 +208,12 @@ def launch_window():
                 window['T1_list'].update(tuple(di.obj_dict(objectsDB, values['T1_tags'], lang).keys()))
 
             elif event == 'T1_add' and values['T1_list'] != []:
-                T1_plot_list.append(values['T1_list'][0])
-                T1_plot_data.append((T1_nm, T1_curve, T1_rgb_show))
+                T1_plot_data.append((T1_nm, T1_curve, T1_rgb_show, values['T1_list'][0]))
 
             elif event == 'T1_plot':
-                pl.plot_spectra(T1_plot_list, T1_plot_data, lang)
+                pl.plot_spectra(T1_plot_data, lang)
 
             elif event == 'T1_clear':
-                T1_plot_list = []
                 T1_plot_data = []
 
             elif event == 'T1_export':

src/plotter.py

@@ -24,14 +24,27 @@ def draw_figure(canvas, figure):
     figure_canvas_agg.get_tk_widget().pack(side='top', fill='both', expand=1)
     return figure_canvas_agg
 
-def plot_spectra(names: list, objects: list, lang: str):
-    title = tr.single_title_text[lang] + names[0] if len(names) == 1 else tr.batch_title_text[lang] + ', '.join(names)
-    fig = plt.Figure(figsize=(6, 4), dpi=125)
+def plot_spectra(objects: list, lang: str):
+    """Creates a separate window with plotted spectra from the list"""
+    fig = plt.Figure(figsize=(9, 6), dpi=100)
     ax = fig.add_subplot(111, xlabel=tr.xaxis_text[lang])
-    for name, obj in zip(names, objects):
-        ax.plot(obj[0], obj[1], color=obj[2], label=name)
-    layout = [[sg.Text(title)], [sg.Canvas(key='-canvas-')]]
-    window = sg.Window('True Color Tools: Plot', layout, finalize=True, font='arial 18')
+    for obj in objects:
+        ax.plot(obj[0], obj[1], color=obj[2], label=obj[3])
+    if len(objects) > 0:
+        ax.legend()
+    title = tr.spectral_plot[lang]
+    layout = [
+        [sg.Text(title, font=('arial', 16)), sg.Push(), sg.InputText(visible=False, enable_events=True, key='-path-'),
+         sg.FileSaveAs(tr.gui_save[lang], file_types=('PNG {png}', 'PDF {pdf}', 'SVG {svg}'), default_extension='.png')],
+        [sg.Canvas(key='-canvas-')]
+    ]
+    window = sg.Window(title, layout, finalize=True, element_justification='center')
     fig_canvas_agg = draw_figure(window['-canvas-'].TKCanvas, fig)
-    event, values = window.read()
+    while True:
+        event, values = window.read()
+        if event == sg.WIN_CLOSED:
+            break
+        elif event == '-path-':
+            path = values['-path-']
+            fig.savefig(path, dpi=133.4) # 1200x800
     window.close()