diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9c98718 --- /dev/null +++ b/.gitignore @@ -0,0 +1,164 @@ +#LIBStick +./LIBStick_ACP_ChatGPT.py + + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ diff --git a/LIBStick.py b/LIBStick.py old mode 100755 new mode 100644 index 073202e..37ff5cb --- a/LIBStick.py +++ b/LIBStick.py @@ -43,6 +43,7 @@ ################################################################################################### NOM_OS = os.name rep_LIBStick = os.getcwd() +# print(rep_LIBStick) #rep_NIST = "NIST_atomic_spectra" rep_NIST = "NIST_LIBS" @@ -52,10 +53,18 @@ flag_bouton_efface_L_ext = True flag_bouton_efface_L_comp = True flag_bouton_efface_L_ACP = True -largeur_fenetre_principale = 1155 -hauteur_fenetre_principale = 750 -largeur_canevas_spectres = 1000 -hauteur_canevas_spectres = 200 + +# largeur_ecran = tk.winfo_width() +# hauteur_ecran = tk.winfo_height() +# if largeur_ecran <= 1100 : +# largeur_fenetre_principale = 1155 +# hauteur_fenetre_principale = 750 +# else : +# largeur_fenetre_principale = 1350 +# hauteur_fenetre_principale = 790 + +largeur_canevas_spectres = 0 +hauteur_canevas_spectres = 0 # espacement_en_pixels = 50 # multiple_du_pas_en_nm = 10 @@ -65,7 +74,7 @@ LARGEUR_LIGNES = 2 # taille_font= 10 if NOM_OS == "posix" : - TAILLE_CASE = [2,2] + TAILLE_CASE = [3,2] if NOM_OS == "nt" : TAILLE_CASE = [4, 2] TAILLE_FONT_CLASSIFICATION = 8 @@ -316,19 +325,28 @@ def change_taille_fenetre(event): """ global largeur_canevas_spectres global hauteur_canevas_spectres - # global old_time - if fenetre_principale.winfo_width() < 1150 : - largeur_canevas_spectres = 1000 - else : - largeur_canevas_spectres = 1000 + fenetre_principale.winfo_width() - 1150 - if fenetre_principale.winfo_height() < 750 : - hauteur_canevas_spectres = 200 + + if largeur_ecran <= 1921 : + if fenetre_principale.winfo_width() < 1150 : + largeur_canevas_spectres = largeur_canevas_spectres_reference + else : + largeur_canevas_spectres = largeur_canevas_spectres_reference + fenetre_principale.winfo_width() - 1155 + + if fenetre_principale.winfo_height() < 750 : + hauteur_canevas_spectres = hauteur_canevas_spectres_reference + else : + hauteur_canevas_spectres = hauteur_canevas_spectres_reference + int((fenetre_principale.winfo_height() - 750)/2) else : - hauteur_canevas_spectres = 200 + (fenetre_principale.winfo_height() - 750)/2 - # cur_time = time.time() - # if (cur_time - old_time) > 0.001 : - # applique_change_taille_fenetre() - # old_time = time.time() + if fenetre_principale.winfo_width() < 1250 : + largeur_canevas_spectres = largeur_canevas_spectres_reference + else : + largeur_canevas_spectres = largeur_canevas_spectres_reference + fenetre_principale.winfo_width() - 1250 + + if fenetre_principale.winfo_height() < 770 : + hauteur_canevas_spectres = hauteur_canevas_spectres_reference + else : + hauteur_canevas_spectres = hauteur_canevas_spectres_reference + int((fenetre_principale.winfo_height() - 770)/2) + applique_change_taille_fenetre() @@ -339,8 +357,8 @@ def applique_change_taille_fenetre(): canevas0_L_ext.config(width=largeur_canevas_spectres, height=hauteur_canevas_spectres) canevas1_L_ext.config(width=largeur_canevas_spectres/2, height=hauteur_canevas_spectres) canevas2_L_ext.config(width=largeur_canevas_spectres/2, height=hauteur_canevas_spectres) - canevas3_L_ext.config(width=largeur_canevas_spectres/2, height=200) - canevas4_L_ext.config(width=largeur_canevas_spectres/2, height=200) + canevas3_L_ext.config(width=largeur_canevas_spectres/2, height=hauteur_canevas_spectres_reference) + canevas4_L_ext.config(width=largeur_canevas_spectres/2, height=hauteur_canevas_spectres_reference) canevas0_L_comp.config(width=largeur_canevas_spectres, height=hauteur_canevas_spectres) canevas1_L_comp.config(width=largeur_canevas_spectres, height=hauteur_canevas_spectres) canevas0_L_ACP.config(width=largeur_canevas_spectres, height=hauteur_canevas_spectres) @@ -504,11 +522,11 @@ def choix_fichier_L_trait(): global liste_fichiers_L_trait global nombre_fichiers_L_trait nom_fichier_L_trait = fd.askopenfilename(initialdir=rep_travail_L_trait, - title=_('Choisissez un fichier spectre'), - filetypes=(("fichiers IVEA", "*.asc"), - ("fichiers SciAps", "*.csv"), - ("fichiers LIBStick", "*.tsv"), - ("fichiers LIBStick moyen", "*.mean"))) + title=_('Choisissez un fichier spectre'), + filetypes=(("fichiers IVEA", "*.asc"), + ("fichiers SciAps", "*.csv"), + ("fichiers LIBStick", "*.tsv"), + ("fichiers LIBStick moyen", "*.mean"))) nom_fichier_seul_L_trait = os.path.basename(nom_fichier_L_trait) type_fichier_L_trait.set(pathlib.Path(nom_fichier_seul_L_trait).suffix) rep_travail_L_trait = os.path.dirname(nom_fichier_L_trait) @@ -4416,7 +4434,8 @@ def ouvre_fenetre_change_tree_label_L_ACP(event): textvariable=label_L_ACP, foreground="black") entree_label_L_ACP.pack(ipadx=0, ipady=0) buttonFont = font.Font(family='Helvetica', size=30) - bouton_label_L_ACP = tk.Button(frame_label_L_ACP, text=_("Valider"), font=buttonFont, width=200, height=100, + bouton_label_L_ACP = tk.Button(frame_label_L_ACP, text=_("Valider"), + font=buttonFont, width=200, height=100, command=validation_label_L_ACP) # bouton_label_L_ACP = ttk.Button(frame_label_L_ACP, text="Valider", font=buttonFont, width=200, height=100, # command=validation_label_L_ACP) @@ -4483,9 +4502,12 @@ def ouvre_fenetre_recherche_elements_L_rec(): global flag_fenetre_recherche_elements_ouvert_L_rec if flag_fenetre_recherche_elements_ouvert_L_rec == False : fenetre_recherche_elements_L_rec = tk.Toplevel(fenetre_principale) - fenetre_recherche_elements_L_rec.geometry("660x490") + if largeur_ecran <= 1921 : + fenetre_recherche_elements_L_rec.geometry("660x490") + else : + fenetre_recherche_elements_L_rec.geometry("905x640") fenetre_recherche_elements_L_rec.configure(bg="black") - fenetre_recherche_elements_L_rec.resizable(False, False) + fenetre_recherche_elements_L_rec.resizable(True, True) frame_recherche_elements_L_rec = ttk.Frame(fenetre_recherche_elements_L_rec) frame_recherche_elements_L_rec.pack() @@ -4518,7 +4540,7 @@ def ouvre_fenetre_recherche_elements_L_rec(): coche_NIST_LIBS_L_rec.grid(row=3, column=1, columnspan=2) buttonFont = font.Font(family='Helvetica', size=15) - bouton_recherche_elements_L_rec = tk.Button(frame_recherche_elements_L_rec, text="Valider", + bouton_recherche_elements_L_rec = tk.Button(frame_recherche_elements_L_rec, text=_("Valider"), font=buttonFont, width=10, bg="black", fg="white", command=recherche_elements_L_rec) bouton_recherche_elements_L_rec.grid(row=3, column=3, columnspan=2) @@ -4595,7 +4617,8 @@ def ouvre_fenetre_a_propos_L_aide(): if flag_fenetre_a_propos_L_aide == False : fenetre_a_propos_L_aide = tk.Toplevel(fenetre_principale) - fenetre_a_propos_L_aide.geometry("670x450") + fenetre_a_propos_L_aide.geometry("700x500") + # fenetre_a_propos_L_aide.geometry("670x450") fenetre_a_propos_L_aide.configure(bg="black") fenetre_a_propos_L_aide.resizable(False, False) @@ -4617,7 +4640,7 @@ def ouvre_fenetre_a_propos_L_aide(): buttonFont = font.Font(family='Helvetica', size=15) bouton_ferme_fenetre_a_propos_L_aide = tk.Button(frame_a_propos_L_aide, - text="Fermer", font=buttonFont, + text=_("Fermer"), font=buttonFont, width=10, bg="black", fg="white", command=ferme_fenetre_a_propos_L_aide) bouton_ferme_fenetre_a_propos_L_aide.grid(row=2, column=1, columnspan=2) @@ -4935,6 +4958,12 @@ def ouvre_fenetre_classification_L_ele(): global flag_tableau_periodique_ouvert_L_ele if flag_tableau_periodique_ouvert_L_ele is False: fenetre_classification_L_ele = tk.Toplevel(fenetre_principale) + # if largeur_ecran <= 1281 : + # fenetre_classification_L_ele.geometry("660x490") + # elif largeur_ecran <= 1921: + # fenetre_classification_L_ele.geometry("780x565") + # else : + # fenetre_classification_L_ele.geometry("905x640") fenetre_classification_L_ele.resizable(False, False) frame1_L_ele = ttk.Frame(fenetre_classification_L_ele) frame1_L_ele.pack() @@ -4971,7 +5000,7 @@ def ouvre_fenetre_classification_L_ele(): variable=flag_sup10_L_ele, command=affiche_lignes_element_L_ele) coche_sup10_L_ele.grid(row=1, column=9, columnspan=4, sticky=tk.W) - coche_sup1_L_ele = ttk.Checkbutton(frame1_L_ele, text=_("1% <= I relative < 10%"), + coche_sup1_L_ele = ttk.Checkbutton(frame1_L_ele, text=_("1% <= I rel < 10%"), variable=flag_sup1_L_ele, command=affiche_lignes_element_L_ele) coche_sup1_L_ele.grid(row=2, column=9, columnspan=4, sticky=tk.W) @@ -5020,7 +5049,6 @@ class AutoScrollbar(ttk.Scrollbar): # a scrollbar that hides itself if it's not needed. only # works if you use the grid geometry manager. # cf. : http://effbot.org/zone/tk-autoscrollbar.htm - def set(self, lo, hi): if float(lo) <= 0.0 and float(hi) >= 1.0: # grid_remove is currently missing from tk! @@ -5029,6 +5057,16 @@ def set(self, lo, hi): self.grid() tk.Scrollbar.set(self, lo, hi) + # Defining pack method + def pack(self, **kw): + # If pack is used it throws an error + raise (tk.TclError,"pack cannot be used with this widget") + + # Defining place method + def place(self, **kw): + # If place is used it throws an error + raise (tk.TclError, "place cannot be used with this widget") + class case_classification(tk.Button): """ @@ -5070,7 +5108,45 @@ def affiche_pics(self, nom, symbole, Z, couleur, bouton_affichage): ################################################################################################### # fenetre_principale = tk.Tk() fenetre_principale =ThemedTk(theme = style_interface_LIBStick) + +largeur_ecran = fenetre_principale.winfo_screenwidth() +hauteur_ecran = fenetre_principale.winfo_screenheight() +# dpi_ecran= fenetre_principale.winfo_fpixels('1i') +# echelle_ecran= fenetre_principale.winfo_geometry() +# largeur_ecran_mm = fenetre_principale.winfo_screenmmwidth() +# hauteur_ecran_mm = fenetre_principale.winfo_screenmmheight() +# print("largeur_ecran : " + str(largeur_ecran)) +# print("hauteur_ecran : "+ str(hauteur_ecran)) +# print(dpi_ecran) +# print(echelle_ecran) +# print(largeur_ecran_mm) +# print(hauteur_ecran_mm) +if largeur_ecran <= 1281 : + largeur_fenetre_principale = 1155 + hauteur_fenetre_principale = 750 + largeur_canevas_spectres = largeur_canevas_spectres_reference = 1000 + hauteur_canevas_spectres = hauteur_canevas_spectres_reference = 200 + default_font = font.nametofont("TkDefaultFont") + default_font.configure(size=10) +elif largeur_ecran <= 1921: + largeur_fenetre_principale = 1500 + hauteur_fenetre_principale = 900 + largeur_canevas_spectres = largeur_canevas_spectres_reference = 1000 + hauteur_canevas_spectres = hauteur_canevas_spectres_reference = 200 + default_font = font.nametofont("TkDefaultFont") + default_font.configure(size=11) +else : + largeur_fenetre_principale = 1900 + hauteur_fenetre_principale = 1000 + largeur_canevas_spectres = largeur_canevas_spectres_reference = 1050 + hauteur_canevas_spectres = hauteur_canevas_spectres_reference = 195 + default_font = font.nametofont("TkDefaultFont") + default_font.configure(size=11) + +# print("taille de la police : " + str(default_font.cget('size'))) + style_LIBStick = ttk.Style() +style_LIBStick.configure('TButton', justify = "center", anchor = "center") if flag_style_LIBStick_ini == str(True) : # Create style used by default for all Frames style_LIBStick.configure('TFrame', background = COULEUR_INTERFACE) @@ -5086,8 +5162,7 @@ def affiche_pics(self, nom, symbole, Z, couleur, bouton_affichage): bg_couleur = fenetre_principale._get_bg_color() # print(fenetre_principale.get_themes()) fenetre_principale.title("LIBStick v3.0") -fenetre_principale.geometry("1155x750+100+50") - +fenetre_principale.geometry(str(largeur_fenetre_principale) + "x" + str(hauteur_fenetre_principale) + "+100+50") # vscrollbar = AutoScrollbar(fenetre_principale, orient=tk.VERTICAL) # vscrollbar.grid(row=0, column=1, sticky=tk.N+tk.S) # hscrollbar = AutoScrollbar(fenetre_principale, orient=tk.HORIZONTAL) @@ -5097,8 +5172,10 @@ def affiche_pics(self, nom, symbole, Z, couleur, bouton_affichage): hscrollbar = AutoScrollbar(fenetre_principale, orient=tk.HORIZONTAL) hscrollbar.grid(row=1, column=0, sticky=tk.E+tk.W) -canevas_scroll = tk.Canvas(fenetre_principale, yscrollcommand=vscrollbar.set, - xscrollcommand=hscrollbar.set, bg = bg_couleur) +canevas_scroll = tk.Canvas(fenetre_principale, + yscrollcommand=vscrollbar.set, + xscrollcommand=hscrollbar.set, + bg = bg_couleur) canevas_scroll.grid(row=0, column=0, sticky=tk.N+tk.S+tk.E+tk.W) vscrollbar.config(command=canevas_scroll.yview) @@ -5107,20 +5184,24 @@ def affiche_pics(self, nom, symbole, Z, couleur, bouton_affichage): fenetre_principale.grid_rowconfigure(0, weight=1) fenetre_principale.grid_columnconfigure(0, weight=1) -frame_scroll = ttk.Frame(canevas_scroll) -# frame_scroll.rowconfigure(1, weight=1) -# frame_scroll.columnconfigure(1, weight=1) +frame_scroll = tk.Frame(canevas_scroll, + height=canevas_scroll.winfo_height(), + width=canevas_scroll.winfo_width()) +frame_scroll.rowconfigure(0, weight=1) +frame_scroll.columnconfigure(0, weight=1) onglets = ttk.Notebook(frame_scroll) -onglets.pack() +onglets.pack(expand=True, fill=tk.BOTH) +onglets.rowconfigure(0, weight=1) +onglets.columnconfigure(0, weight=1) onglet1 = ttk.Frame(onglets) onglet2 = ttk.Frame(onglets) onglet3 = ttk.Frame(onglets) onglet4 = ttk.Frame(onglets) -onglet1.pack() -onglet2.pack() -onglet3.pack() -onglet4.pack() +onglet1.pack(expand=True, fill=tk.BOTH) +onglet2.pack(expand=True, fill=tk.BOTH) +onglet3.pack(expand=True, fill=tk.BOTH) +onglet4.pack(expand=True, fill=tk.BOTH) onglets.add(onglet1, text=_("LIBStick pré-traitements")) onglets.add(onglet2, text=_("LIBStick extraction")) @@ -5326,7 +5407,7 @@ def __________IHM_traitement__________(): ################################################################################################### canevas0_L_trait = tk.Canvas(frame1_L_trait, width=largeur_canevas_spectres, height=(hauteur_canevas_spectres+170), bg="white") -canevas0_L_trait.grid(row=1, column=1, columnspan=6) +canevas0_L_trait.grid(row=1, column=1, columnspan=6, sticky="nsew") ligne_position_0_x_L_trait = canevas0_L_trait.create_line(0, 0, 0, hauteur_canevas_spectres+170, fill="white") ligne_position_0_y_L_trait = canevas0_L_trait.create_line(0, 0, largeur_canevas_spectres, 0, fill="white") @@ -5404,7 +5485,7 @@ def __________IHM_traitement__________(): frame1_1_L_trait.grid(row=1, column=7, rowspan=4, sticky=tk.N+tk.S) text_zoom_L_trait = ttk.Label(frame1_1_L_trait, text="Zoom : ", width=8) -text_zoom_L_trait.grid(row=1, column=1, sticky=tk.N) +text_zoom_L_trait.grid(row=1, column=1, sticky=tk.N+tk.W) variable_zoom_inf_L_trait = tk.DoubleVar(value=198) variable_zoom_sup_L_trait = tk.DoubleVar(value=1013) entree_zoom_inf_L_trait = ttk.Spinbox(frame1_1_L_trait, from_=198, to=1013, increment=5, @@ -5413,19 +5494,19 @@ def __________IHM_traitement__________(): entree_zoom_sup_L_trait = ttk.Spinbox(frame1_1_L_trait, from_=198, to=1013, increment=5, textvariable=variable_zoom_sup_L_trait, command=change_zoom_sup_L_trait, width=8, foreground="black") -entree_zoom_inf_L_trait.grid(row=2, column=1, sticky=tk.N) -entree_zoom_sup_L_trait.grid(row=3, column=1, sticky=tk.N) +entree_zoom_inf_L_trait.grid(row=2, column=1, sticky=tk.N+tk.W) +entree_zoom_sup_L_trait.grid(row=3, column=1, sticky=tk.N+tk.W) type_fichier_L_trait = tk.StringVar(value=".asc") -bouton_rep_L_trait = ttk.Button(frame1_1_L_trait, text=_("Fichier"), - command=choix_fichier_L_trait, width=10) -bouton_visualisation_L_trait = ttk.Button(frame1_1_L_trait, text=_("Visualisation"), - command=visualisation_L_trait, state="disable", width=10) +bouton_rep_L_trait = ttk.Button(frame1_1_L_trait, text=_("Fichier"), style = 'TButton', + command=choix_fichier_L_trait, width=8) +bouton_visualisation_L_trait = ttk.Button(frame1_1_L_trait, text=_("Visu"), + command=visualisation_L_trait, state="disable", width=8) # bouton_rep_L_trait = ttk.Button(frame1_1_L_trait, text=_("Fichier"), # command=choix_fichier_L_trait, width=8) # bouton_visualisation_L_trait = ttk.Button(frame1_1_L_trait, text=_("Visualisation"), # command=visualisation_L_trait, state="disable", width=8) -bouton_rep_L_trait.grid(row=4, column=1, sticky=tk.N) -bouton_visualisation_L_trait.grid(row=5, column=1, sticky=tk.N) +bouton_rep_L_trait.grid(row=4, column=1, sticky=tk.N+tk.W) +bouton_visualisation_L_trait.grid(row=5, column=1, sticky=tk.N+tk.W) image_classification = tk.PhotoImage(file=rep_LIBStick+"/LIBStick_datas/icons/Classification.png") @@ -5439,7 +5520,7 @@ def __________IHM_traitement__________(): ################################################################################################### canevas1_L_trait = tk.Canvas(frame2_L_trait, width=largeur_canevas_spectres, height=hauteur_canevas_spectres, bg="white") -canevas1_L_trait.grid(row=1, column=1, columnspan=2) +canevas1_L_trait.grid(row=1, column=1, columnspan=2, sticky="nsew") ligne_position_1_x_L_trait = canevas1_L_trait.create_line(0, 0, 0, hauteur_canevas_spectres, fill="white") ligne_position_1_y_L_trait = canevas0_L_trait.create_line(0, 0, largeur_canevas_spectres, 0, fill="white") @@ -5460,15 +5541,15 @@ def __________IHM_traitement__________(): coche_sauve_fond_L_trait.grid(row=2, column=1) bouton_execute_L_trait = ttk.Button(frame2_1_L_trait, text=_("Executer"), state="disable", - command=execute_L_trait, width=10) -bouton_execute_L_trait.grid(row=3, column=1) + command=execute_L_trait, width=8) +bouton_execute_L_trait.grid(row=3, column=1, sticky=tk.W) text_spectre_L_trait = ttk.Label(frame2_1_L_trait, text=_("Spectre : ")) -text_spectre_L_trait.grid(row=4, column=1, sticky=tk.N) +text_spectre_L_trait.grid(row=4, column=1, sticky=tk.W) numero_spectre_L_trait = tk.IntVar(value=1) entree_spectre_L_trait = ttk.Spinbox(frame2_1_L_trait, from_=1, to=50, textvariable=numero_spectre_L_trait, command=lit_affiche_spectre_numero_L_trait, width=8, foreground="black") -entree_spectre_L_trait.grid(row=5, column=1, sticky=tk.N) +entree_spectre_L_trait.grid(row=5, column=1, sticky=tk.W) ################################################################################################### @@ -5552,7 +5633,7 @@ def __________IHM_extraction__________(): ################################################################################################### canevas0_L_ext = tk.Canvas(frame1_L_ext, width=largeur_canevas_spectres, height=hauteur_canevas_spectres, bg="white") -canevas0_L_ext.grid(row=1, column=1, columnspan=6) +canevas0_L_ext.grid(row=1, column=1, columnspan=6, sticky="nsew") ligne_position_x_L_ext = canevas0_L_ext.create_line(0, 0, 0, hauteur_canevas_spectres, fill="white") ligne_position_y_L_ext = canevas0_L_ext.create_line(0, 0, largeur_canevas_spectres, 0, fill="white") @@ -5561,10 +5642,10 @@ def __________IHM_extraction__________(): text="Lambda = " + str(format(lambda_texte_spectre_L_ext, "4.2f") + " nm")) lambda_texte_L_ext.grid(row=2, column=5) -text1_L_ext = ttk.Label(frame1_L_ext, text=_("Première borne inf (nm)")) -text2_L_ext = ttk.Label(frame1_L_ext, text=_("Première borne sup (nm)")) -text3_L_ext = ttk.Label(frame1_L_ext, text=_("Seconde borne inf (nm)")) -text4_L_ext = ttk.Label(frame1_L_ext, text=_("Seconde borne sup (nm)")) +text1_L_ext = ttk.Label(frame1_L_ext, text=_("1ere borne inf (nm)")) +text2_L_ext = ttk.Label(frame1_L_ext, text=_("1ere borne sup (nm)")) +text3_L_ext = ttk.Label(frame1_L_ext, text=_("2de borne inf (nm)")) +text4_L_ext = ttk.Label(frame1_L_ext, text=_("2de borne sup (nm)")) text1_L_ext.grid(row=2, column=1, sticky=tk.E) text2_L_ext.grid(row=2, column=3, sticky=tk.E) text3_L_ext.grid(row=3, column=1, sticky=tk.E) @@ -5588,16 +5669,16 @@ def __________IHM_extraction__________(): entree4_L_ext.grid(row=3, column=4, sticky=tk.W) flag_zone2_L_ext = tk.IntVar(value=flag_zone2_init_L_ext) -coche_zone2_L_ext = ttk.Checkbutton(frame1_L_ext, text=_("Seconde extraction"), - variable=flag_zone2_L_ext, command=change_flag_zone2_L_ext) +coche_zone2_L_ext = ttk.Checkbutton(frame1_L_ext, text=_("2de extraction"), + variable=flag_zone2_L_ext, command=change_flag_zone2_L_ext) coche_zone2_L_ext.grid(row=3, column=5) bouton_reset_L_ext = ttk.Button(frame1_L_ext, text=_("Reset"), - command=reset_tableau_L_ext, width=10) + command=reset_tableau_L_ext, width=7) bouton_reset_L_ext.grid(row=2, column=6, rowspan=2) frame1_1_L_ext = ttk.Frame(frame1_L_ext) -frame1_1_L_ext.grid(row=1, column=7, rowspan=3, sticky=tk.N) +frame1_1_L_ext.grid(row=1, column=7, rowspan=3, sticky=tk.N+tk.W) text_zoom_L_ext = ttk.Label(frame1_1_L_ext, text="Zoom : ", width=8) text_zoom_L_ext.grid(row=1, column=1) @@ -5609,15 +5690,15 @@ def __________IHM_extraction__________(): entree_zoom_sup_L_ext = ttk.Spinbox(frame1_1_L_ext, from_=198, to=1013, increment=5, textvariable=variable_zoom_sup_L_ext, command=change_zoom_sup_L_ext, width=8, foreground="black") -entree_zoom_inf_L_ext.grid(row=2, column=1) -entree_zoom_sup_L_ext.grid(row=3, column=1) +entree_zoom_inf_L_ext.grid(row=2, column=1, sticky=tk.N) +entree_zoom_sup_L_ext.grid(row=3, column=1, sticky=tk.N) type_fichier_L_ext = tk.StringVar(value=".asc") # bouton_rep_L_ext=ttk.Button(frame1_1_L_ext, text="Repertoire\nde travail" ,command=choix_rep_L_ext, width=8) bouton_rep_L_ext = ttk.Button(frame1_1_L_ext, text=_("Fichier"), - command=choix_fichier_L_ext, width=10) -bouton_execute_L_ext = ttk.Button( - frame1_1_L_ext, text=_("Exécute"), command=execute_scripts_L_ext, state="disable", width=10) + command=choix_fichier_L_ext, width=8) +bouton_execute_L_ext = ttk.Button(frame1_1_L_ext, text=_("Exécute"), + command=execute_scripts_L_ext, state="disable", width=8) bouton_rep_L_ext.grid(row=4, column=1) bouton_execute_L_ext.grid(row=5, column=1) @@ -5646,15 +5727,13 @@ def __________IHM_extraction__________(): height=hauteur_canevas_spectres, bg="white") canevas2_L_ext = tk.Canvas(frame2_L_ext, width=largeur_canevas_spectres/2, height=hauteur_canevas_spectres, bg="white") -canevas1_L_ext.grid(row=1, column=1, columnspan=4) -canevas2_L_ext.grid(row=1, column=5, columnspan=4) - -text5_L_ext = ttk.Label(frame2_L_ext, text=_("Position x (nm) : ")) -text6_L_ext = ttk.Label( - frame2_L_ext, text=_("Position y (n° de spectre) : ")) -text7_L_ext = ttk.Label(frame2_L_ext, text=_("Position x (nm) : ")) -text8_L_ext = ttk.Label( - frame2_L_ext, text=_("Position y (n° de spectre) : ")) +canevas1_L_ext.grid(row=1, column=1, columnspan=4, sticky="nsew") +canevas2_L_ext.grid(row=1, column=5, columnspan=4, sticky="nsew") + +text5_L_ext = ttk.Label(frame2_L_ext, text=_("x (nm) : ")) +text6_L_ext = ttk.Label(frame2_L_ext, text=_("y (n° de spectre) : ")) +text7_L_ext = ttk.Label(frame2_L_ext, text=_("x (nm) : ")) +text8_L_ext = ttk.Label(frame2_L_ext, text=_("y (n° de spectre) : ")) text5_L_ext.grid(row=2, column=1, sticky=tk.E) text6_L_ext.grid(row=2, column=3, sticky=tk.E) text7_L_ext.grid(row=2, column=5, sticky=tk.E) @@ -5686,7 +5765,7 @@ def __________IHM_extraction__________(): coche_image_brute_L_ext.grid(row=1, column=1) flag_spectre_inclus_moyenne_L_ext = tk.BooleanVar(value=True) -coche_spectre_inclus_moyenne_L_ext = ttk.Checkbutton(frame2_1_L_ext, text=_("Spectre inclus\ndans spectre\nmoyen"), +coche_spectre_inclus_moyenne_L_ext = ttk.Checkbutton(frame2_1_L_ext, text=_("\n Spectre inclus\ndans spectre\nmoyen"), variable=flag_spectre_inclus_moyenne_L_ext, command=change_bool_spectre_L_ext) coche_spectre_inclus_moyenne_L_ext.grid(row=2, column=1) @@ -5706,16 +5785,16 @@ def __________IHM_extraction__________(): height=200, bg="white") canevas4_L_ext = tk.Canvas(frame3_L_ext, width=largeur_canevas_spectres/2, height=200, bg="white") -canevas3_L_ext.grid(row=3, column=1, columnspan=2) -canevas4_L_ext.grid(row=3, column=3, columnspan=2) +canevas3_L_ext.grid(row=3, column=1, columnspan=2, sticky="nsew") +canevas4_L_ext.grid(row=3, column=3, columnspan=2, sticky="nsew") frame3_1_L_ext = ttk.Frame(frame3_L_ext) frame3_1_L_ext.grid(row=1, column=5, rowspan=4, sticky=tk.N) text9_L_ext = ttk.Label(frame3_1_L_ext, text=_("Du spectre n° :")) text10_L_ext = ttk.Label(frame3_1_L_ext, text=_("Au spectre n° :")) -text9_L_ext.grid(row=1, column=1) -text10_L_ext.grid(row=3, column=1) +text9_L_ext.grid(row=1, column=1, sticky=tk.W) +text10_L_ext.grid(row=3, column=1, sticky=tk.W) variable_9_L_ext = tk.IntVar(value=0) variable_9_avant_L_ext = tk.IntVar(value=1) @@ -5725,18 +5804,18 @@ def __________IHM_extraction__________(): command=retro_action_entree10_L_ext, width=5, foreground="black") entree10_L_ext = ttk.Spinbox(frame3_1_L_ext, from_=1, to=hauteur_canevas_spectres,textvariable=variable_10_L_ext, command=retro_action_entree9_L_ext, width=5, foreground="black") -entree9_L_ext.grid(row=2, column=1) -entree10_L_ext.grid(row=4, column=1) +entree9_L_ext.grid(row=2, column=1, sticky=tk.W) +entree10_L_ext.grid(row=4, column=1, sticky=tk.W) bouton_extraction_L_ext = ttk.Button(frame3_1_L_ext, text=_("Extraction"), state="disable", - command=creation_spectre_moyen_L_ext, width=10) -bouton_extraction_L_ext.grid(row=5, column=1) + command=creation_spectre_moyen_L_ext, width=9) +bouton_extraction_L_ext.grid(row=5, column=1, sticky=tk.W) flag_spectres_normalises_moyenne_L_ext = tk.BooleanVar(value=True) coche_spectres_normalises_moyenne_L_ext = ttk.Checkbutton(frame3_1_L_ext, text=_("Moyenne des\nspectres \nnormalisés"), variable=flag_spectres_normalises_moyenne_L_ext) -coche_spectres_normalises_moyenne_L_ext.grid(row=6, column=1) +coche_spectres_normalises_moyenne_L_ext.grid(row=6, column=1, sticky=tk.W) ################################################################################################### @@ -5833,7 +5912,7 @@ def __________IHM_compare__________(): ################################################################################################### canevas0_L_comp = tk.Canvas(frame1_L_comp, width=largeur_canevas_spectres, height=hauteur_canevas_spectres, bg="white") -canevas0_L_comp.grid(row=1, column=1, columnspan=6) +canevas0_L_comp.grid(row=1, column=1, columnspan=6, sticky="nsew") ligne_position_x_L_comp = canevas0_L_comp.create_line(0, 0, 0, hauteur_canevas_spectres, fill="white") ligne_position_y_L_comp = canevas0_L_comp.create_line(0, 0, largeur_canevas_spectres, 0, fill="white") @@ -5842,10 +5921,10 @@ def __________IHM_compare__________(): text="Lambda = " + str(format(lambda_texte_spectre_L_comp, "4.2f") + " nm")) lambda_texte_L_comp.grid(row=2, column=5) -text1_L_comp = ttk.Label(frame1_L_comp, text=_("Numérateur borne inf (nm)")) -text2_L_comp = ttk.Label(frame1_L_comp, text=_("Numérateur borne sup (nm)")) -text3_L_comp = ttk.Label(frame1_L_comp, text=_("Dénominateur borne inf (nm)")) -text4_L_comp = ttk.Label(frame1_L_comp, text=_("Dénominateur borne sup( nm)")) +text1_L_comp = ttk.Label(frame1_L_comp, text=_("Num. borne inf (nm)")) +text2_L_comp = ttk.Label(frame1_L_comp, text=_("Num. borne sup (nm)")) +text3_L_comp = ttk.Label(frame1_L_comp, text=_("Dénom. borne inf (nm)")) +text4_L_comp = ttk.Label(frame1_L_comp, text=_("Dénom. borne sup( nm)")) text1_L_comp.grid(row=2, column=1, sticky=tk.E) text2_L_comp.grid(row=2, column=3, sticky=tk.E) text3_L_comp.grid(row=3, column=1, sticky=tk.E) @@ -5876,7 +5955,7 @@ def __________IHM_compare__________(): bouton_reset_L_comp = ttk.Button(frame1_L_comp, text=_("Reset"), command=reset_tableau_L_comp, - width=10) + width=7) bouton_reset_L_comp.grid(row=2, column=6, rowspan=2) frame1_1_L_comp = ttk.Frame(frame1_L_comp) @@ -5899,10 +5978,10 @@ def __________IHM_compare__________(): # bouton_rep_L_comp=ttk.Button(frame1_1_L_comp, text="Repertoire\nde travail" , # command=choix_rep_L_comp, width=8) bouton_rep_L_comp = ttk.Button(frame1_1_L_comp, text=_("Fichier"), - command=choix_fichier_L_comp, width=10) + command=choix_fichier_L_comp, width=8) bouton_execute_L_comp = ttk.Button(frame1_1_L_comp, text=_("Exécute"), command=execute_scripts_L_comp, - state="disable", width=10) + state="disable", width=8) bouton_rep_L_comp.grid(row=4, column=1) bouton_execute_L_comp.grid(row=5, column=1) @@ -5931,7 +6010,7 @@ def __________IHM_compare__________(): ################################################################################################### canevas1_L_comp = tk.Canvas(frame2_L_comp, width=largeur_canevas_spectres, height=hauteur_canevas_spectres, bg="white") -canevas1_L_comp.grid(row=1, column=1, columnspan=4) +canevas1_L_comp.grid(row=1, column=1, columnspan=4, sticky="nsew") # text5_L_comp = ttk.Label(frame2_L_comp, text="Position x (nm) : ") # text6_L_comp = ttk.Label(frame2_L_comp, text="Position y (n° de spectre) : ") @@ -5957,7 +6036,7 @@ def __________IHM_compare__________(): coche_traitement_L_comp = ttk.Checkbutton(frame2_1_L_comp, text=_("Normalisation\ndes spectres"), variable=flag_traitement_L_comp) -coche_traitement_L_comp.grid(row=1, column=1) +coche_traitement_L_comp.grid(row=1, column=1, sticky=tk.W) # type_traitement_L_comp=tk.StringVar(value="Echantillons différents") # type_traitement_combobox_L_comp=ttk.Combobox(frame2_1_L_comp, textvariable=type_traitement_L_comp, @@ -5971,15 +6050,15 @@ def __________IHM_compare__________(): coche_stat_L_comp = ttk.Checkbutton(frame2_1_L_comp, text=_("Statistiques"), variable=flag_stat_L_comp) -coche_stat_L_comp.grid(row=2, column=1) +coche_stat_L_comp.grid(row=2, column=1, sticky=tk.W) ligne1_vert_L_comp = canevas1_L_comp.create_line(x1_L_comp, 0, x1_L_comp, hauteur_canevas_spectres, fill="white") ligne1_hori_L_comp = canevas1_L_comp.create_line(0, y1_L_comp, largeur_canevas_spectres/2, y1_L_comp, fill="white") text5_L_comp = ttk.Label(frame2_1_L_comp, text=_("\nPosition x (nm) : ")) text6_L_comp = ttk.Label(frame2_1_L_comp, text=_("Position y \n(n° de spectre) : ")) -text5_L_comp.grid(row=4, column=1) -text6_L_comp.grid(row=6, column=1) +text5_L_comp.grid(row=4, column=1, sticky=tk.W) +text6_L_comp.grid(row=6, column=1, sticky=tk.W) variable_5_L_comp = tk.DoubleVar(value=0) variable_6_L_comp = tk.IntVar(value=0) @@ -5987,8 +6066,8 @@ def __________IHM_compare__________(): command=vars_5_6_to_coord1_L_comp, increment=0.5, width=5, foreground="black") entree6_L_comp = ttk.Spinbox(frame2_1_L_comp, from_=1, to=100, textvariable=variable_6_L_comp, command=vars_5_6_to_coord1_L_comp, width=5, foreground="black") -entree5_L_comp.grid(row=5, column=1) -entree6_L_comp.grid(row=7, column=1) +entree5_L_comp.grid(row=5, column=1, sticky=tk.W) +entree6_L_comp.grid(row=7, column=1, sticky=tk.W) affiche_lignes_spectre_L_comp() @@ -5996,17 +6075,17 @@ def __________IHM_compare__________(): ################################################################################################### # Interface graphique frame3_L_comp : affichage des résultats sous forme de TreeView ################################################################################################### -tree_resultats_L_comp = ttk.Treeview( - frame3_L_comp, columns=(1, 2, 3), height=10, show="headings") -tree_resultats_L_comp.column(1, width=hauteur_canevas_spectres) -tree_resultats_L_comp.column(2, width=600) -tree_resultats_L_comp.column(3, width=hauteur_canevas_spectres) +tree_resultats_L_comp = ttk.Treeview(frame3_L_comp, columns=(1, 2, 3), + height=10, show="headings") +tree_resultats_L_comp.column(1, width=100) +tree_resultats_L_comp.column(2, width=650) +tree_resultats_L_comp.column(3, width=250) tree_resultats_L_comp.heading(1, text=_("n°")) tree_resultats_L_comp.heading(2, text=_("Nom du spectre")) tree_resultats_L_comp.heading(3, text=_("Rapport zone1/zone2")) tree_resultats_L_comp.grid(row=1, column=1, sticky=tk.N+tk.S+tk.E+tk.W) -scroll_tree_resultat_L_comp = ttk.Scrollbar( - frame3_L_comp, orient=tk.VERTICAL, command=tree_resultats_L_comp.yview) +scroll_tree_resultat_L_comp = ttk.Scrollbar(frame3_L_comp, orient=tk.VERTICAL, + command=tree_resultats_L_comp.yview) scroll_tree_resultat_L_comp.grid(row=1, column=2, sticky=tk.N+tk.S) tree_resultats_L_comp.configure(yscrollcommand=scroll_tree_resultat_L_comp.set) @@ -6095,7 +6174,7 @@ def __________IHM_ACP__________(): ################################################################################################### canevas0_L_ACP = tk.Canvas(frame1_L_ACP, width=largeur_canevas_spectres, height=hauteur_canevas_spectres, bg="white") -canevas0_L_ACP.grid(row=1, column=1, columnspan=6) +canevas0_L_ACP.grid(row=1, column=1, columnspan=6, sticky="nsew") ligne_position_x_L_ACP = canevas0_L_ACP.create_line(0, 0, 0, hauteur_canevas_spectres, fill="white") ligne_position_y_L_ACP = canevas0_L_ACP.create_line(0, 0, largeur_canevas_spectres, 0, fill="white") @@ -6137,7 +6216,7 @@ def __________IHM_ACP__________(): type_fichier_L_ACP = tk.StringVar(value=".mean") bouton_rep_L_ACP = ttk.Button(frame1_1_L_ACP, text=_("Fichier"), - command=choix_fichier_L_ACP, width=10) + command=choix_fichier_L_ACP, width=8) bouton_rep_L_ACP.grid(row=4, column=1, sticky=tk.N) bouton_classification_L_ACP = tk.Button(frame1_1_L_ACP, image=image_classification, @@ -6158,16 +6237,16 @@ def __________IHM_ACP__________(): else : tree_L_ACP.tag_configure("select", foreground="black") tree_L_ACP.column(1, width=50) -tree_L_ACP.column(2, width=600) -tree_L_ACP.column(3, width=hauteur_canevas_spectres) -tree_L_ACP.column(4, width=80) +tree_L_ACP.column(2, width=650) +tree_L_ACP.column(3, width=200) +tree_L_ACP.column(4, width=100) tree_L_ACP.heading(1, text=_("n°")) tree_L_ACP.heading(2, text=_("Nom du spectre")) tree_L_ACP.heading(3, text=_("Utlisé pour l'ACP :")) tree_L_ACP.heading(4, text=_("Label :")) tree_L_ACP.grid(row=1, column=1, sticky=tk.N+tk.S+tk.E+tk.W) -scroll_tree_L_ACP = ttk.Scrollbar( - frame2_L_ACP, orient=tk.VERTICAL, command=tree_L_ACP.yview) +scroll_tree_L_ACP = ttk.Scrollbar(frame2_L_ACP, orient=tk.VERTICAL, + command=tree_L_ACP.yview) scroll_tree_L_ACP.grid(row=1, column=2, sticky=tk.N+tk.S) tree_L_ACP.configure(yscrollcommand=scroll_tree_L_ACP.set) @@ -6239,13 +6318,13 @@ def __________IHM_ACP__________(): ################################################################################################### canevas1_L_ACP = tk.Canvas(frame3_L_ACP, width=largeur_canevas_spectres, height=hauteur_canevas_spectres, bg="white") -canevas1_L_ACP.grid(row=1, column=1, columnspan=6) +canevas1_L_ACP.grid(row=1, column=1, columnspan=6, sticky="nsew") frame3_1_L_ACP = ttk.Frame(frame3_L_ACP) frame3_1_L_ACP.grid(row=1, column=7, rowspan=3, sticky=tk.N) flag_plotly_L_ACP = tk.BooleanVar(value=True) -coche_plotly_L_ACP = ttk.Checkbutton(frame3_1_L_ACP, text=_("Diag. plotly"), variable=flag_plotly_L_ACP) +coche_plotly_L_ACP = ttk.Checkbutton(frame3_1_L_ACP, text=_("\n Diag. plotly\n"), variable=flag_plotly_L_ACP) coche_plotly_L_ACP.grid(row=1, column=1) bouton_enregistre_L_ACP = ttk.Button(frame3_1_L_ACP, text=_("Enregistrer \nfacteurs \nde l'ACP"), @@ -6334,7 +6413,8 @@ def __________IHM_interface_principale__________(): # Interface graphique : gestion du redimentionnement de la fenêtre principale ################################################################################################### canevas_scroll.create_window(0, 0, anchor='nw', window=frame_scroll) -frame_scroll.update_idletasks() +# frame_scroll.update_idletasks() +fenetre_principale.update_idletasks() canevas_scroll.config(scrollregion=canevas_scroll.bbox("all")) fenetre_principale.bind("", change_taille_fenetre) @@ -6342,5 +6422,14 @@ def __________IHM_interface_principale__________(): # fenetre_principale.bind("", applique_change_taille_fenetre_event) # fenetre_principale.bind("", applique_change_taille_fenetre_event) +onglet1.columnconfigure(10, weight=1) +onglet2.columnconfigure(10, weight=1) +onglet3.columnconfigure(10, weight=1) +onglet4.columnconfigure(10, weight=1) + +onglet1.rowconfigure(10, weight=1) +onglet2.rowconfigure(30, weight=1) +onglet3.rowconfigure(30, weight=1) +onglet4.rowconfigure(20, weight=1) fenetre_principale.mainloop() diff --git a/LIBStick.sh b/LIBStick.sh old mode 100755 new mode 100644 index e6637d1..ad131e8 --- a/LIBStick.sh +++ b/LIBStick.sh @@ -1,5 +1,5 @@ #!/bin/sh # - -python3 /home/yannick/Bureau/LIBS/LIBStick/LIBStick.py +cd /home/yannick/Bureau/LIBS/LIBStick +python3 ./LIBStick.py -w diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_AverageSpectrum.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_AverageSpectrum.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum1.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum1.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum10.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum10.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum11.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum11.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum12.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum12.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum2.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum2.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum3.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum3.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum4.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum4.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum5.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum5.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum6.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum6.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum7.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum7.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum8.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum8.csv old mode 100755 new mode 100644 diff --git a/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum9.csv b/docs/Exemples/SciApps Spectra/Stone_26584_1/26584_1_2023_03_07_03_12_04_PM_Spectrum9.csv old mode 100755 new mode 100644 diff --git a/docs/LICENSE b/docs/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/docs/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/docs/Manuel/Manuel LIBStick V3.0.odt b/docs/Manuel/Manuel LIBStick V3.0.odt index bf995b2..6c82ed9 100644 Binary files a/docs/Manuel/Manuel LIBStick V3.0.odt and b/docs/Manuel/Manuel LIBStick V3.0.odt differ diff --git a/docs/Manuel/Manuel LIBStick V3.0.pdf b/docs/Manuel/Manuel LIBStick V3.0.pdf index 0c064f7..87e8544 100644 Binary files a/docs/Manuel/Manuel LIBStick V3.0.pdf and b/docs/Manuel/Manuel LIBStick V3.0.pdf differ diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..48a7ab8 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,14 @@ + +# LIBStick + + + +![GitHub release (latest by date)](https://img.shields.io/github/v/release/crp2a/libstick) + + + +## Overview + +**LIBStick** is intended to process LIBS spectra. This package allows to import, +inspect and batch-process spectra. + diff --git a/locale/LIBStick.pot b/locale/LIBStick.pot index 6ebcfe5..5ece36f 100644 --- a/locale/LIBStick.pot +++ b/locale/LIBStick.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: LIBStick v2.0\n" -"POT-Creation-Date: 2024-02-09 09:41+0100\n" +"POT-Creation-Date: 2024-06-21 12:05+0200\n" "PO-Revision-Date: 2022-02-07 15:31+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -11,453 +11,453 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.4\n" +"X-Generator: Poedit 3.0.1\n" "X-Poedit-Basepath: ..\n" "X-Poedit-SearchPath-0: LIBStick.py\n" "X-Poedit-SearchPath-1: LIBStick_ACP.py\n" -#: LIBStick.py:179 LIBStick.py:4677 +#: LIBStick.py:201 LIBStick.py:4708 msgid "Attention !" msgstr "" -#: LIBStick.py:180 +#: LIBStick.py:202 msgid "Veuillez redémarrer LIBStick pour retrouver les paramètres par défaut." msgstr "" -#: LIBStick.py:494 +#: LIBStick.py:515 msgid "Choisissez un fichier spectre" msgstr "" -#: LIBStick.py:4402 +#: LIBStick.py:4427 msgid "Valider" msgstr "" -#: LIBStick.py:4475 +#: LIBStick.py:4506 msgid "Lambda (nm) :" msgstr "" -#: LIBStick.py:4476 +#: LIBStick.py:4507 msgid "Delta (nm) :" msgstr "" -#: LIBStick.py:4477 +#: LIBStick.py:4508 msgid "Seuil (> I rela.) :" msgstr "" -#: LIBStick.py:4499 LIBStick.py:4847 +#: LIBStick.py:4530 LIBStick.py:4986 msgid "NIST LIBS" msgstr "" -#: LIBStick.py:4678 +#: LIBStick.py:4709 msgid "Pas d'informations pour cet élément." msgstr "" -#: LIBStick.py:4828 -msgid "Ferme" +#: LIBStick.py:4967 +msgid "Efface" msgstr "" -#: LIBStick.py:4838 +#: LIBStick.py:4977 msgid "Neutres" msgstr "" -#: LIBStick.py:4842 +#: LIBStick.py:4981 msgid "Ions +" msgstr "" -#: LIBStick.py:4852 +#: LIBStick.py:4991 msgid "I relative >= 10%" msgstr "" -#: LIBStick.py:4856 -msgid "1% <= I relative < 10%" +#: LIBStick.py:4995 +msgid "1% <= I rel < 10%" msgstr "" -#: LIBStick.py:4860 +#: LIBStick.py:4999 msgid "I relative < 1%" msgstr "" -#: LIBStick.py:4997 +#: LIBStick.py:5159 msgid "LIBStick pré-traitements" msgstr "" -#: LIBStick.py:4998 +#: LIBStick.py:5160 msgid "LIBStick extraction" msgstr "" -#: LIBStick.py:4999 +#: LIBStick.py:5161 msgid "LIBStick comparaison" msgstr "" -#: LIBStick.py:5000 +#: LIBStick.py:5162 msgid "LIBStick ACP" msgstr "" -#: LIBStick.py:5014 LIBStick.py:5291 LIBStick.py:5489 LIBStick.py:5773 -#: LIBStick.py:6011 +#: LIBStick.py:5176 LIBStick.py:5453 LIBStick.py:5651 LIBStick.py:5935 +#: LIBStick.py:6173 msgid "Fichier" msgstr "" -#: LIBStick.py:5015 +#: LIBStick.py:5177 msgid "Sauvegarde des paramètres actuels" msgstr "" -#: LIBStick.py:5017 +#: LIBStick.py:5179 msgid "Restaure les paramètres par défaut au prochain démarrage" msgstr "" -#: LIBStick.py:5019 +#: LIBStick.py:5181 msgid "Quitter" msgstr "" -#: LIBStick.py:5021 +#: LIBStick.py:5183 msgid "Redémarrer" msgstr "" -#: LIBStick.py:5024 +#: LIBStick.py:5186 msgid "Traitement" msgstr "" -#: LIBStick.py:5026 LIBStick.py:5031 LIBStick.py:5036 LIBStick.py:5041 +#: LIBStick.py:5188 LIBStick.py:5193 LIBStick.py:5198 LIBStick.py:5203 msgid "Echelle log y" msgstr "" -#: LIBStick.py:5029 LIBStick.py:5603 +#: LIBStick.py:5191 LIBStick.py:5765 msgid "Extraction" msgstr "" -#: LIBStick.py:5034 +#: LIBStick.py:5196 msgid "Comparaison" msgstr "" -#: LIBStick.py:5039 LIBStick.py:6061 +#: LIBStick.py:5201 LIBStick.py:6223 msgid "ACP" msgstr "" -#: LIBStick.py:5044 +#: LIBStick.py:5206 msgid "Outils" msgstr "" -#: LIBStick.py:5046 +#: LIBStick.py:5208 msgid "Zoom auto en y" msgstr "" -#: LIBStick.py:5047 +#: LIBStick.py:5209 msgid "Graduations" msgstr "" -#: LIBStick.py:5049 +#: LIBStick.py:5211 msgid "Pas multiple de 10" msgstr "" -#: LIBStick.py:5051 +#: LIBStick.py:5213 msgid "Pas multiple de 5" msgstr "" -#: LIBStick.py:5053 +#: LIBStick.py:5215 msgid "Pas multiple de 2" msgstr "" -#: LIBStick.py:5055 +#: LIBStick.py:5217 msgid "Pas multiple de 1" msgstr "" -#: LIBStick.py:5059 +#: LIBStick.py:5221 msgid "Espacement mini 100 pixels" msgstr "" -#: LIBStick.py:5061 +#: LIBStick.py:5223 msgid "Espacement mini 50 pixels" msgstr "" -#: LIBStick.py:5063 +#: LIBStick.py:5225 msgid "Espacement mini 20 pixels" msgstr "" -#: LIBStick.py:5067 +#: LIBStick.py:5229 msgid "Recherche d'éléments" msgstr "" -#: LIBStick.py:5069 +#: LIBStick.py:5231 msgid "Tableau périodique" msgstr "" -#: LIBStick.py:5073 +#: LIBStick.py:5235 msgid "Fenetre principale premier plan" msgstr "" -#: LIBStick.py:5077 +#: LIBStick.py:5239 msgid "Langue au prochain démarage" msgstr "" -#: LIBStick.py:5079 +#: LIBStick.py:5241 msgid "Français" msgstr "" -#: LIBStick.py:5081 +#: LIBStick.py:5243 msgid "Anglais" msgstr "" -#: LIBStick.py:5083 +#: LIBStick.py:5245 msgid "Espagnol" msgstr "" -#: LIBStick.py:5085 +#: LIBStick.py:5247 msgid "Italien" msgstr "" -#: LIBStick.py:5088 +#: LIBStick.py:5250 msgid "Style au prochain démarage" msgstr "" -#: LIBStick.py:5090 +#: LIBStick.py:5252 msgid "Couleur de LIBStick" msgstr "" -#: LIBStick.py:5135 +#: LIBStick.py:5297 msgid "Aide" msgstr "" -#: LIBStick.py:5136 +#: LIBStick.py:5298 msgid "Aide (F1)" msgstr "" -#: LIBStick.py:5138 +#: LIBStick.py:5300 msgid "A propos de LIBStick" msgstr "" -#: LIBStick.py:5210 LIBStick.py:5979 +#: LIBStick.py:5372 LIBStick.py:6141 msgid "Borne inf :" msgstr "" -#: LIBStick.py:5211 LIBStick.py:5980 +#: LIBStick.py:5373 LIBStick.py:6142 msgid "Borne sup :" msgstr "" -#: LIBStick.py:5223 +#: LIBStick.py:5385 msgid "Filtre :" msgstr "" -#: LIBStick.py:5224 +#: LIBStick.py:5386 msgid "Taille :" msgstr "" -#: LIBStick.py:5225 +#: LIBStick.py:5387 msgid "Ordre :" msgstr "" -#: LIBStick.py:5226 +#: LIBStick.py:5388 msgid "Dérivée :" msgstr "" -#: LIBStick.py:5238 LIBStick.py:5263 +#: LIBStick.py:5400 LIBStick.py:5425 msgid "Aucun" msgstr "" -#: LIBStick.py:5250 +#: LIBStick.py:5412 msgid "Fond :" msgstr "" -#: LIBStick.py:5251 +#: LIBStick.py:5413 msgid "Itérations :" msgstr "" -#: LIBStick.py:5293 +#: LIBStick.py:5455 msgid "Visualisation" msgstr "" -#: LIBStick.py:5324 +#: LIBStick.py:5486 msgid "" "Appliquer sur\n" "tous les fichiers\n" "du répertoire" msgstr "" -#: LIBStick.py:5330 +#: LIBStick.py:5492 msgid "" "Sauvegarde du\n" "fond continu" msgstr "" -#: LIBStick.py:5334 +#: LIBStick.py:5496 msgid "Executer" msgstr "" -#: LIBStick.py:5338 +#: LIBStick.py:5500 msgid "Spectre : " msgstr "" -#: LIBStick.py:5436 +#: LIBStick.py:5598 msgid "Première borne inf (nm)" msgstr "" -#: LIBStick.py:5437 +#: LIBStick.py:5599 msgid "Première borne sup (nm)" msgstr "" -#: LIBStick.py:5438 +#: LIBStick.py:5600 msgid "Seconde borne inf (nm)" msgstr "" -#: LIBStick.py:5439 +#: LIBStick.py:5601 msgid "Seconde borne sup (nm)" msgstr "" -#: LIBStick.py:5463 +#: LIBStick.py:5625 msgid "Seconde extraction" msgstr "" -#: LIBStick.py:5467 LIBStick.py:5749 +#: LIBStick.py:5629 LIBStick.py:5911 msgid "Reset" msgstr "" -#: LIBStick.py:5492 LIBStick.py:5775 +#: LIBStick.py:5654 LIBStick.py:5937 msgid "Exécute" msgstr "" -#: LIBStick.py:5499 LIBStick.py:5782 +#: LIBStick.py:5661 LIBStick.py:5944 msgid "Sortie 2D" msgstr "" -#: LIBStick.py:5505 LIBStick.py:5789 +#: LIBStick.py:5667 LIBStick.py:5951 msgid "Sortie 3D" msgstr "" -#: LIBStick.py:5524 LIBStick.py:5527 +#: LIBStick.py:5686 LIBStick.py:5689 msgid "Position x (nm) : " msgstr "" -#: LIBStick.py:5526 LIBStick.py:5529 +#: LIBStick.py:5688 LIBStick.py:5691 msgid "Position y (n° de spectre) : " msgstr "" -#: LIBStick.py:5555 +#: LIBStick.py:5717 msgid "" "Image brute\n" "spectres non\n" "normalisés" msgstr "" -#: LIBStick.py:5561 +#: LIBStick.py:5723 msgid "" "Spectre inclus\n" "dans spectre\n" "moyen" msgstr "" -#: LIBStick.py:5587 +#: LIBStick.py:5749 msgid "Du spectre n° :" msgstr "" -#: LIBStick.py:5588 +#: LIBStick.py:5750 msgid "Au spectre n° :" msgstr "" -#: LIBStick.py:5609 +#: LIBStick.py:5771 msgid "" "Moyenne des\n" "spectres \n" "normalisés" msgstr "" -#: LIBStick.py:5717 +#: LIBStick.py:5879 msgid "Numérateur borne inf (nm)" msgstr "" -#: LIBStick.py:5718 +#: LIBStick.py:5880 msgid "Numérateur borne sup (nm)" msgstr "" -#: LIBStick.py:5719 +#: LIBStick.py:5881 msgid "Dénominateur borne inf (nm)" msgstr "" -#: LIBStick.py:5720 +#: LIBStick.py:5882 msgid "Dénominateur borne sup( nm)" msgstr "" -#: LIBStick.py:5744 +#: LIBStick.py:5906 msgid "Dénominateur ?" msgstr "" -#: LIBStick.py:5830 +#: LIBStick.py:5992 msgid "" "Normalisation\n" "des spectres" msgstr "" -#: LIBStick.py:5844 +#: LIBStick.py:6006 msgid "Statistiques" msgstr "" -#: LIBStick.py:5851 +#: LIBStick.py:6013 msgid "" "\n" "Position x (nm) : " msgstr "" -#: LIBStick.py:5852 +#: LIBStick.py:6014 msgid "" "Position y \n" "(n° de spectre) : " msgstr "" -#: LIBStick.py:5876 LIBStick.py:6036 +#: LIBStick.py:6038 LIBStick.py:6198 msgid "n°" msgstr "" -#: LIBStick.py:5877 LIBStick.py:6037 +#: LIBStick.py:6039 LIBStick.py:6199 msgid "Nom du spectre" msgstr "" -#: LIBStick.py:5878 +#: LIBStick.py:6040 msgid "Rapport zone1/zone2" msgstr "" -#: LIBStick.py:6038 +#: LIBStick.py:6200 msgid "Utlisé pour l'ACP :" msgstr "" -#: LIBStick.py:6039 +#: LIBStick.py:6201 msgid "Label :" msgstr "" -#: LIBStick.py:6050 +#: LIBStick.py:6212 msgid "Spectres normalisés" msgstr "" -#: LIBStick.py:6056 +#: LIBStick.py:6218 msgid "Centré reduit" msgstr "" -#: LIBStick.py:6065 +#: LIBStick.py:6227 msgid "+ ind. supp." msgstr "" -#: LIBStick.py:6069 +#: LIBStick.py:6231 msgid "Ouvre" msgstr "" -#: LIBStick.py:6073 +#: LIBStick.py:6235 msgid "Sauve" msgstr "" -#: LIBStick.py:6077 +#: LIBStick.py:6239 msgid "Dimensions : " msgstr "" -#: LIBStick.py:6097 +#: LIBStick.py:6259 msgid "Même echelle x et y" msgstr "" -#: LIBStick.py:6101 +#: LIBStick.py:6263 msgid "Diag. éboulis" msgstr "" -#: LIBStick.py:6120 +#: LIBStick.py:6282 msgid "Diag. plotly" msgstr "" -#: LIBStick.py:6123 +#: LIBStick.py:6285 msgid "" "Enregistrer \n" "facteurs \n" diff --git a/locale/en/LC_MESSAGES/en.mo b/locale/en/LC_MESSAGES/en.mo index 41a5ddf..07559a0 100644 Binary files a/locale/en/LC_MESSAGES/en.mo and b/locale/en/LC_MESSAGES/en.mo differ diff --git a/locale/en/LC_MESSAGES/en.po b/locale/en/LC_MESSAGES/en.po index 87ae9cc..77af388 100644 --- a/locale/en/LC_MESSAGES/en.po +++ b/locale/en/LC_MESSAGES/en.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: LIBStick v2.0\n" -"POT-Creation-Date: 2024-02-09 09:42+0100\n" -"PO-Revision-Date: 2024-02-09 09:46+0100\n" +"POT-Creation-Date: 2024-06-21 12:12+0200\n" +"PO-Revision-Date: 2024-06-21 12:13+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" @@ -10,261 +10,261 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.4\n" +"X-Generator: Poedit 3.0.1\n" "X-Poedit-Basepath: ../../..\n" "X-Poedit-SearchPath-0: LIBStick.py\n" "X-Poedit-SearchPath-1: LIBStick_ACP.py\n" -#: LIBStick.py:179 LIBStick.py:4677 +#: LIBStick.py:201 LIBStick.py:4708 msgid "Attention !" msgstr "Caution !" -#: LIBStick.py:180 +#: LIBStick.py:202 msgid "Veuillez redémarrer LIBStick pour retrouver les paramètres par défaut." msgstr "Start again LIBStick to go back to default parameters." -#: LIBStick.py:494 +#: LIBStick.py:515 msgid "Choisissez un fichier spectre" msgstr "Choose a spectrum file" -#: LIBStick.py:4402 +#: LIBStick.py:4427 msgid "Valider" msgstr "Accept" -#: LIBStick.py:4475 +#: LIBStick.py:4506 msgid "Lambda (nm) :" msgstr "Lambda (nm) :" -#: LIBStick.py:4476 +#: LIBStick.py:4507 msgid "Delta (nm) :" msgstr "Delta (nm) :" -#: LIBStick.py:4477 +#: LIBStick.py:4508 msgid "Seuil (> I rela.) :" msgstr "Limit (> I rela.) :" -#: LIBStick.py:4499 LIBStick.py:4847 +#: LIBStick.py:4530 LIBStick.py:4986 msgid "NIST LIBS" msgstr "NIST LIBS" -#: LIBStick.py:4678 +#: LIBStick.py:4709 msgid "Pas d'informations pour cet élément." msgstr "No information for this element." -#: LIBStick.py:4828 -msgid "Ferme" -msgstr "Close" +#: LIBStick.py:4967 +msgid "Efface" +msgstr "Clear" -#: LIBStick.py:4838 +#: LIBStick.py:4977 msgid "Neutres" msgstr "Neutral" -#: LIBStick.py:4842 +#: LIBStick.py:4981 msgid "Ions +" msgstr "Ions +" -#: LIBStick.py:4852 +#: LIBStick.py:4991 msgid "I relative >= 10%" msgstr "I relative >= 10%" -#: LIBStick.py:4856 -msgid "1% <= I relative < 10%" -msgstr "1% <= I relative < 10%" +#: LIBStick.py:4995 +msgid "1% <= I rel < 10%" +msgstr "1% <= I rel < 10%" -#: LIBStick.py:4860 +#: LIBStick.py:4999 msgid "I relative < 1%" msgstr "I relative < 1%" -#: LIBStick.py:4997 +#: LIBStick.py:5159 msgid "LIBStick pré-traitements" msgstr "LIBStick pre-treatment" -#: LIBStick.py:4998 +#: LIBStick.py:5160 msgid "LIBStick extraction" msgstr "LIBStick extraction" -#: LIBStick.py:4999 +#: LIBStick.py:5161 msgid "LIBStick comparaison" msgstr "LIBStick comparison" -#: LIBStick.py:5000 +#: LIBStick.py:5162 msgid "LIBStick ACP" msgstr "LIBStick PCA" -#: LIBStick.py:5014 LIBStick.py:5291 LIBStick.py:5489 LIBStick.py:5773 -#: LIBStick.py:6011 +#: LIBStick.py:5176 LIBStick.py:5453 LIBStick.py:5651 LIBStick.py:5935 +#: LIBStick.py:6173 msgid "Fichier" msgstr "File" -#: LIBStick.py:5015 +#: LIBStick.py:5177 msgid "Sauvegarde des paramètres actuels" msgstr "Saving the current settings" -#: LIBStick.py:5017 +#: LIBStick.py:5179 msgid "Restaure les paramètres par défaut au prochain démarrage" msgstr "Restores default settings at next startup" -#: LIBStick.py:5019 +#: LIBStick.py:5181 msgid "Quitter" msgstr "Quit" -#: LIBStick.py:5021 +#: LIBStick.py:5183 msgid "Redémarrer" msgstr "Restart" -#: LIBStick.py:5024 +#: LIBStick.py:5186 msgid "Traitement" msgstr "Treatment" -#: LIBStick.py:5026 LIBStick.py:5031 LIBStick.py:5036 LIBStick.py:5041 +#: LIBStick.py:5188 LIBStick.py:5193 LIBStick.py:5198 LIBStick.py:5203 msgid "Echelle log y" msgstr "Log scale y" -#: LIBStick.py:5029 LIBStick.py:5603 +#: LIBStick.py:5191 LIBStick.py:5765 msgid "Extraction" msgstr "Extraction" -#: LIBStick.py:5034 +#: LIBStick.py:5196 msgid "Comparaison" msgstr "Comparison" -#: LIBStick.py:5039 LIBStick.py:6061 +#: LIBStick.py:5201 LIBStick.py:6223 msgid "ACP" msgstr "PCA" -#: LIBStick.py:5044 +#: LIBStick.py:5206 msgid "Outils" msgstr "Tools" -#: LIBStick.py:5046 +#: LIBStick.py:5208 msgid "Zoom auto en y" msgstr "Auto Zoom in y" -#: LIBStick.py:5047 +#: LIBStick.py:5209 msgid "Graduations" msgstr "Graduations" -#: LIBStick.py:5049 +#: LIBStick.py:5211 msgid "Pas multiple de 10" msgstr "Step multiple of 10" -#: LIBStick.py:5051 +#: LIBStick.py:5213 msgid "Pas multiple de 5" msgstr "Step multiple of 5" -#: LIBStick.py:5053 +#: LIBStick.py:5215 msgid "Pas multiple de 2" msgstr "Step multiple of 2" -#: LIBStick.py:5055 +#: LIBStick.py:5217 msgid "Pas multiple de 1" msgstr "Step multiple of 1" -#: LIBStick.py:5059 +#: LIBStick.py:5221 msgid "Espacement mini 100 pixels" msgstr "Min. spacing 100 pixels" -#: LIBStick.py:5061 +#: LIBStick.py:5223 msgid "Espacement mini 50 pixels" msgstr "Min. spacing 50 pixels" -#: LIBStick.py:5063 +#: LIBStick.py:5225 msgid "Espacement mini 20 pixels" msgstr "Min. spacing 20 pixels" -#: LIBStick.py:5067 +#: LIBStick.py:5229 msgid "Recherche d'éléments" msgstr "Search elements" -#: LIBStick.py:5069 +#: LIBStick.py:5231 msgid "Tableau périodique" msgstr "Periodic table" -#: LIBStick.py:5073 +#: LIBStick.py:5235 msgid "Fenetre principale premier plan" msgstr "Main window foreground" -#: LIBStick.py:5077 +#: LIBStick.py:5239 msgid "Langue au prochain démarage" msgstr "Language at next start-up" -#: LIBStick.py:5079 +#: LIBStick.py:5241 msgid "Français" msgstr "French" -#: LIBStick.py:5081 +#: LIBStick.py:5243 msgid "Anglais" msgstr "English" -#: LIBStick.py:5083 +#: LIBStick.py:5245 msgid "Espagnol" msgstr "Spanish" -#: LIBStick.py:5085 +#: LIBStick.py:5247 msgid "Italien" msgstr "Italian" -#: LIBStick.py:5088 +#: LIBStick.py:5250 msgid "Style au prochain démarage" msgstr "Style at next start-up" -#: LIBStick.py:5090 +#: LIBStick.py:5252 msgid "Couleur de LIBStick" msgstr "Colour of LIBStick" -#: LIBStick.py:5135 +#: LIBStick.py:5297 msgid "Aide" msgstr "Help" -#: LIBStick.py:5136 +#: LIBStick.py:5298 msgid "Aide (F1)" msgstr "Help (F1)" -#: LIBStick.py:5138 +#: LIBStick.py:5300 msgid "A propos de LIBStick" msgstr "About LIBStick" -#: LIBStick.py:5210 LIBStick.py:5979 +#: LIBStick.py:5372 LIBStick.py:6141 msgid "Borne inf :" msgstr "Lower limit :" -#: LIBStick.py:5211 LIBStick.py:5980 +#: LIBStick.py:5373 LIBStick.py:6142 msgid "Borne sup :" msgstr "Upper limit :" -#: LIBStick.py:5223 +#: LIBStick.py:5385 msgid "Filtre :" msgstr "Filter :" -#: LIBStick.py:5224 +#: LIBStick.py:5386 msgid "Taille :" msgstr "Size :" -#: LIBStick.py:5225 +#: LIBStick.py:5387 msgid "Ordre :" msgstr "Order :" -#: LIBStick.py:5226 +#: LIBStick.py:5388 msgid "Dérivée :" msgstr "Derivation :" -#: LIBStick.py:5238 LIBStick.py:5263 +#: LIBStick.py:5400 LIBStick.py:5425 msgid "Aucun" msgstr "None" -#: LIBStick.py:5250 +#: LIBStick.py:5412 msgid "Fond :" msgstr "Background :" -#: LIBStick.py:5251 +#: LIBStick.py:5413 msgid "Itérations :" msgstr "Iterations :" -#: LIBStick.py:5293 +#: LIBStick.py:5455 msgid "Visualisation" msgstr "Visualization" -#: LIBStick.py:5324 +#: LIBStick.py:5486 msgid "" "Appliquer sur\n" "tous les fichiers\n" @@ -274,7 +274,7 @@ msgstr "" "all files in\n" "the directory" -#: LIBStick.py:5330 +#: LIBStick.py:5492 msgid "" "Sauvegarde du\n" "fond continu" @@ -283,59 +283,59 @@ msgstr "" "continuous\n" "background" -#: LIBStick.py:5334 +#: LIBStick.py:5496 msgid "Executer" msgstr "Execute" -#: LIBStick.py:5338 +#: LIBStick.py:5500 msgid "Spectre : " msgstr "Spectrum : " -#: LIBStick.py:5436 +#: LIBStick.py:5598 msgid "Première borne inf (nm)" msgstr "First lower limit (nm)" -#: LIBStick.py:5437 +#: LIBStick.py:5599 msgid "Première borne sup (nm)" msgstr "First upper limit (nm)" -#: LIBStick.py:5438 +#: LIBStick.py:5600 msgid "Seconde borne inf (nm)" msgstr "Second lower limit (nm)" -#: LIBStick.py:5439 +#: LIBStick.py:5601 msgid "Seconde borne sup (nm)" msgstr "Second upper limit (nm)" -#: LIBStick.py:5463 +#: LIBStick.py:5625 msgid "Seconde extraction" msgstr "Second extraction" -#: LIBStick.py:5467 LIBStick.py:5749 +#: LIBStick.py:5629 LIBStick.py:5911 msgid "Reset" msgstr "Reset" -#: LIBStick.py:5492 LIBStick.py:5775 +#: LIBStick.py:5654 LIBStick.py:5937 msgid "Exécute" msgstr "Execute" -#: LIBStick.py:5499 LIBStick.py:5782 +#: LIBStick.py:5661 LIBStick.py:5944 msgid "Sortie 2D" msgstr "2D output" -#: LIBStick.py:5505 LIBStick.py:5789 +#: LIBStick.py:5667 LIBStick.py:5951 msgid "Sortie 3D" msgstr "3D output" -#: LIBStick.py:5524 LIBStick.py:5527 +#: LIBStick.py:5686 LIBStick.py:5689 msgid "Position x (nm) : " msgstr "Position x (nm) : " -#: LIBStick.py:5526 LIBStick.py:5529 +#: LIBStick.py:5688 LIBStick.py:5691 msgid "Position y (n° de spectre) : " msgstr "Position y (spectrum number) : " -#: LIBStick.py:5555 +#: LIBStick.py:5717 msgid "" "Image brute\n" "spectres non\n" @@ -345,7 +345,7 @@ msgstr "" "unnormalized\n" "spectra" -#: LIBStick.py:5561 +#: LIBStick.py:5723 msgid "" "Spectre inclus\n" "dans spectre\n" @@ -356,15 +356,15 @@ msgstr "" "in average\n" "spectrum" -#: LIBStick.py:5587 +#: LIBStick.py:5749 msgid "Du spectre n° :" msgstr "From spectrum :" -#: LIBStick.py:5588 +#: LIBStick.py:5750 msgid "Au spectre n° :" msgstr "To spectrum :" -#: LIBStick.py:5609 +#: LIBStick.py:5771 msgid "" "Moyenne des\n" "spectres \n" @@ -374,27 +374,27 @@ msgstr "" "normalized \n" "spectra" -#: LIBStick.py:5717 +#: LIBStick.py:5879 msgid "Numérateur borne inf (nm)" msgstr "Numerator lower limit (nm)" -#: LIBStick.py:5718 +#: LIBStick.py:5880 msgid "Numérateur borne sup (nm)" msgstr "Numerator upper limit (nm)" -#: LIBStick.py:5719 +#: LIBStick.py:5881 msgid "Dénominateur borne inf (nm)" msgstr "Denominator lower limit (nm)" -#: LIBStick.py:5720 +#: LIBStick.py:5882 msgid "Dénominateur borne sup( nm)" msgstr "Denominator upper limit (nm)" -#: LIBStick.py:5744 +#: LIBStick.py:5906 msgid "Dénominateur ?" msgstr "Denominator ?" -#: LIBStick.py:5830 +#: LIBStick.py:5992 msgid "" "Normalisation\n" "des spectres" @@ -402,11 +402,11 @@ msgstr "" "Standardization\n" "of spectra" -#: LIBStick.py:5844 +#: LIBStick.py:6006 msgid "Statistiques" msgstr "Statistics" -#: LIBStick.py:5851 +#: LIBStick.py:6013 msgid "" "\n" "Position x (nm) : " @@ -414,7 +414,7 @@ msgstr "" "\n" "Position x (nm) : " -#: LIBStick.py:5852 +#: LIBStick.py:6014 msgid "" "Position y \n" "(n° de spectre) : " @@ -422,63 +422,63 @@ msgstr "" "Position y \n" "(spectrum number) : " -#: LIBStick.py:5876 LIBStick.py:6036 +#: LIBStick.py:6038 LIBStick.py:6198 msgid "n°" msgstr "n°" -#: LIBStick.py:5877 LIBStick.py:6037 +#: LIBStick.py:6039 LIBStick.py:6199 msgid "Nom du spectre" msgstr "Name of the spectrum" -#: LIBStick.py:5878 +#: LIBStick.py:6040 msgid "Rapport zone1/zone2" msgstr "Zone1/zone2 ratio" -#: LIBStick.py:6038 +#: LIBStick.py:6200 msgid "Utlisé pour l'ACP :" msgstr "Used for PCA :" -#: LIBStick.py:6039 +#: LIBStick.py:6201 msgid "Label :" msgstr "Label :" -#: LIBStick.py:6050 +#: LIBStick.py:6212 msgid "Spectres normalisés" msgstr "Standardised spectra" -#: LIBStick.py:6056 +#: LIBStick.py:6218 msgid "Centré reduit" msgstr "Reduced centered" -#: LIBStick.py:6065 +#: LIBStick.py:6227 msgid "+ ind. supp." msgstr "+ supp.ind." -#: LIBStick.py:6069 +#: LIBStick.py:6231 msgid "Ouvre" msgstr "Open" -#: LIBStick.py:6073 +#: LIBStick.py:6235 msgid "Sauve" msgstr "Save" -#: LIBStick.py:6077 +#: LIBStick.py:6239 msgid "Dimensions : " msgstr "Dimensions : " -#: LIBStick.py:6097 +#: LIBStick.py:6259 msgid "Même echelle x et y" msgstr "Same scale x and y" -#: LIBStick.py:6101 +#: LIBStick.py:6263 msgid "Diag. éboulis" msgstr "Scree diagram" -#: LIBStick.py:6120 +#: LIBStick.py:6282 msgid "Diag. plotly" msgstr "Plotly diag." -#: LIBStick.py:6123 +#: LIBStick.py:6285 msgid "" "Enregistrer \n" "facteurs \n" @@ -504,6 +504,9 @@ msgstr "Principal components" msgid "Diagramme d'éboulis" msgstr "Scree diagram" +#~ msgid "Ferme" +#~ msgstr "Close" + #~ msgid "Calcule" #~ msgstr "Calculates" diff --git a/locale/es/LC_MESSAGES/es.mo b/locale/es/LC_MESSAGES/es.mo index 9a34197..cd17a65 100644 Binary files a/locale/es/LC_MESSAGES/es.mo and b/locale/es/LC_MESSAGES/es.mo differ diff --git a/locale/es/LC_MESSAGES/es.po b/locale/es/LC_MESSAGES/es.po index 355f237..b0411d7 100644 --- a/locale/es/LC_MESSAGES/es.po +++ b/locale/es/LC_MESSAGES/es.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: LIBStick v2.0\n" -"POT-Creation-Date: 2024-02-09 09:42+0100\n" -"PO-Revision-Date: 2024-02-09 09:45+0100\n" +"POT-Creation-Date: 2024-06-21 12:09+0200\n" +"PO-Revision-Date: 2024-06-21 12:11+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: es\n" @@ -10,260 +10,260 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.4\n" +"X-Generator: Poedit 3.0.1\n" "X-Poedit-Basepath: ../../..\n" "X-Poedit-SearchPath-0: LIBStick.py\n" -#: LIBStick.py:179 LIBStick.py:4677 +#: LIBStick.py:201 LIBStick.py:4708 msgid "Attention !" msgstr "¡Atención!" -#: LIBStick.py:180 +#: LIBStick.py:202 msgid "Veuillez redémarrer LIBStick pour retrouver les paramètres par défaut." msgstr "Por favor, reinicie LIBStick para restaurar la configuración por defecto." -#: LIBStick.py:494 +#: LIBStick.py:515 msgid "Choisissez un fichier spectre" msgstr "Elegir un archivo de espectro" -#: LIBStick.py:4402 +#: LIBStick.py:4427 msgid "Valider" msgstr "Validar" -#: LIBStick.py:4475 +#: LIBStick.py:4506 msgid "Lambda (nm) :" msgstr "Lambda (nm) :" -#: LIBStick.py:4476 +#: LIBStick.py:4507 msgid "Delta (nm) :" msgstr "Delta (nm) :" -#: LIBStick.py:4477 +#: LIBStick.py:4508 msgid "Seuil (> I rela.) :" msgstr "Umbral (> I rela.) :" -#: LIBStick.py:4499 LIBStick.py:4847 +#: LIBStick.py:4530 LIBStick.py:4986 msgid "NIST LIBS" msgstr "NIST LIBS" -#: LIBStick.py:4678 +#: LIBStick.py:4709 msgid "Pas d'informations pour cet élément." msgstr "No hay información para este elemento." -#: LIBStick.py:4828 -msgid "Ferme" -msgstr "Cerrar" +#: LIBStick.py:4967 +msgid "Efface" +msgstr "Borrar" -#: LIBStick.py:4838 +#: LIBStick.py:4977 msgid "Neutres" msgstr "Neutral" -#: LIBStick.py:4842 +#: LIBStick.py:4981 msgid "Ions +" msgstr "Iones +" -#: LIBStick.py:4852 +#: LIBStick.py:4991 msgid "I relative >= 10%" msgstr "I relativo >= 10%" -#: LIBStick.py:4856 -msgid "1% <= I relative < 10%" -msgstr "1% <= I relativo < 10%" +#: LIBStick.py:4995 +msgid "1% <= I rel < 10%" +msgstr "1% <= I rel < 10%" -#: LIBStick.py:4860 +#: LIBStick.py:4999 msgid "I relative < 1%" msgstr "I relativo < 1%" -#: LIBStick.py:4997 +#: LIBStick.py:5159 msgid "LIBStick pré-traitements" msgstr "LIBStick pre-tratamientos" -#: LIBStick.py:4998 +#: LIBStick.py:5160 msgid "LIBStick extraction" msgstr "LIBStick Extracción" -#: LIBStick.py:4999 +#: LIBStick.py:5161 msgid "LIBStick comparaison" msgstr "LIBStick Comparación" -#: LIBStick.py:5000 +#: LIBStick.py:5162 msgid "LIBStick ACP" msgstr "LIBStick ACP" -#: LIBStick.py:5014 LIBStick.py:5291 LIBStick.py:5489 LIBStick.py:5773 -#: LIBStick.py:6011 +#: LIBStick.py:5176 LIBStick.py:5453 LIBStick.py:5651 LIBStick.py:5935 +#: LIBStick.py:6173 msgid "Fichier" msgstr "Archivo" -#: LIBStick.py:5015 +#: LIBStick.py:5177 msgid "Sauvegarde des paramètres actuels" msgstr "Guardar la configuración actual" -#: LIBStick.py:5017 +#: LIBStick.py:5179 msgid "Restaure les paramètres par défaut au prochain démarrage" msgstr "Restaurar la configuración por defecto en el próximo inicio" -#: LIBStick.py:5019 +#: LIBStick.py:5181 msgid "Quitter" msgstr "Salida" -#: LIBStick.py:5021 +#: LIBStick.py:5183 msgid "Redémarrer" msgstr "Reiniciar" -#: LIBStick.py:5024 +#: LIBStick.py:5186 msgid "Traitement" msgstr "Procesando" -#: LIBStick.py:5026 LIBStick.py:5031 LIBStick.py:5036 LIBStick.py:5041 +#: LIBStick.py:5188 LIBStick.py:5193 LIBStick.py:5198 LIBStick.py:5203 msgid "Echelle log y" msgstr "Escala Log y" -#: LIBStick.py:5029 LIBStick.py:5603 +#: LIBStick.py:5191 LIBStick.py:5765 msgid "Extraction" msgstr "Extracción" -#: LIBStick.py:5034 +#: LIBStick.py:5196 msgid "Comparaison" msgstr "Comparación" -#: LIBStick.py:5039 LIBStick.py:6061 +#: LIBStick.py:5201 LIBStick.py:6223 msgid "ACP" msgstr "PCA" -#: LIBStick.py:5044 +#: LIBStick.py:5206 msgid "Outils" msgstr "Herramientas" -#: LIBStick.py:5046 +#: LIBStick.py:5208 msgid "Zoom auto en y" msgstr "Zoom automático en y" -#: LIBStick.py:5047 +#: LIBStick.py:5209 msgid "Graduations" msgstr "Graduaciones" -#: LIBStick.py:5049 +#: LIBStick.py:5211 msgid "Pas multiple de 10" msgstr "Paso múltiplo de 10" -#: LIBStick.py:5051 +#: LIBStick.py:5213 msgid "Pas multiple de 5" msgstr "Paso múltiplo de 5" -#: LIBStick.py:5053 +#: LIBStick.py:5215 msgid "Pas multiple de 2" msgstr "Paso múltiplo de 2" -#: LIBStick.py:5055 +#: LIBStick.py:5217 msgid "Pas multiple de 1" msgstr "Paso múltiplo de 1" -#: LIBStick.py:5059 +#: LIBStick.py:5221 msgid "Espacement mini 100 pixels" msgstr "Espacio mínimo 100 píxeles" -#: LIBStick.py:5061 +#: LIBStick.py:5223 msgid "Espacement mini 50 pixels" msgstr "Espacio mínimo 50 píxeles" -#: LIBStick.py:5063 +#: LIBStick.py:5225 msgid "Espacement mini 20 pixels" msgstr "Espacio mínimo 20 píxeles" -#: LIBStick.py:5067 +#: LIBStick.py:5229 msgid "Recherche d'éléments" msgstr "Buscar elementos" -#: LIBStick.py:5069 +#: LIBStick.py:5231 msgid "Tableau périodique" msgstr "Tabla periódica" -#: LIBStick.py:5073 +#: LIBStick.py:5235 msgid "Fenetre principale premier plan" msgstr "Ventana principal en primer plano" -#: LIBStick.py:5077 +#: LIBStick.py:5239 msgid "Langue au prochain démarage" msgstr "Lengua en el próximo inicio" -#: LIBStick.py:5079 +#: LIBStick.py:5241 msgid "Français" msgstr "Francés" -#: LIBStick.py:5081 +#: LIBStick.py:5243 msgid "Anglais" msgstr "Inglés" -#: LIBStick.py:5083 +#: LIBStick.py:5245 msgid "Espagnol" msgstr "Español" -#: LIBStick.py:5085 +#: LIBStick.py:5247 msgid "Italien" msgstr "Italiano" -#: LIBStick.py:5088 +#: LIBStick.py:5250 msgid "Style au prochain démarage" msgstr "Estilo en el próximo inicio" -#: LIBStick.py:5090 +#: LIBStick.py:5252 msgid "Couleur de LIBStick" msgstr "Color del LIBStick" -#: LIBStick.py:5135 +#: LIBStick.py:5297 msgid "Aide" msgstr "Asistencia" -#: LIBStick.py:5136 +#: LIBStick.py:5298 msgid "Aide (F1)" msgstr "Asistencia (F1)" -#: LIBStick.py:5138 +#: LIBStick.py:5300 msgid "A propos de LIBStick" msgstr "por cierto del LIBStick" -#: LIBStick.py:5210 LIBStick.py:5979 +#: LIBStick.py:5372 LIBStick.py:6141 msgid "Borne inf :" msgstr "Límite inf:" -#: LIBStick.py:5211 LIBStick.py:5980 +#: LIBStick.py:5373 LIBStick.py:6142 msgid "Borne sup :" msgstr "Límite sup:" -#: LIBStick.py:5223 +#: LIBStick.py:5385 msgid "Filtre :" msgstr "Filtro:" -#: LIBStick.py:5224 +#: LIBStick.py:5386 msgid "Taille :" msgstr "Tamaño:" -#: LIBStick.py:5225 +#: LIBStick.py:5387 msgid "Ordre :" msgstr "Orden:" -#: LIBStick.py:5226 +#: LIBStick.py:5388 msgid "Dérivée :" msgstr "Derivado:" -#: LIBStick.py:5238 LIBStick.py:5263 +#: LIBStick.py:5400 LIBStick.py:5425 msgid "Aucun" msgstr "Ninguno" -#: LIBStick.py:5250 +#: LIBStick.py:5412 msgid "Fond :" msgstr "Fondo:" -#: LIBStick.py:5251 +#: LIBStick.py:5413 msgid "Itérations :" msgstr "Iteraciones:" -#: LIBStick.py:5293 +#: LIBStick.py:5455 msgid "Visualisation" msgstr "Visualización" -#: LIBStick.py:5324 +#: LIBStick.py:5486 msgid "" "Appliquer sur\n" "tous les fichiers\n" @@ -273,7 +273,7 @@ msgstr "" "los archivos en\n" " el directorio" -#: LIBStick.py:5330 +#: LIBStick.py:5492 msgid "" "Sauvegarde du\n" "fond continu" @@ -281,59 +281,59 @@ msgstr "" "Registrar\n" "fondo continuo" -#: LIBStick.py:5334 +#: LIBStick.py:5496 msgid "Executer" msgstr "Ejecutar" -#: LIBStick.py:5338 +#: LIBStick.py:5500 msgid "Spectre : " msgstr "Espectro: " -#: LIBStick.py:5436 +#: LIBStick.py:5598 msgid "Première borne inf (nm)" msgstr "Primer límite inf (nm)" -#: LIBStick.py:5437 +#: LIBStick.py:5599 msgid "Première borne sup (nm)" msgstr "Primer límite sup (nm)" -#: LIBStick.py:5438 +#: LIBStick.py:5600 msgid "Seconde borne inf (nm)" msgstr "Segundo límite inf (nm)" -#: LIBStick.py:5439 +#: LIBStick.py:5601 msgid "Seconde borne sup (nm)" msgstr "Segundo límite sup (nm)" -#: LIBStick.py:5463 +#: LIBStick.py:5625 msgid "Seconde extraction" msgstr "Segunda extracción" -#: LIBStick.py:5467 LIBStick.py:5749 +#: LIBStick.py:5629 LIBStick.py:5911 msgid "Reset" msgstr "Reiniciar" -#: LIBStick.py:5492 LIBStick.py:5775 +#: LIBStick.py:5654 LIBStick.py:5937 msgid "Exécute" msgstr "Ejecutar" -#: LIBStick.py:5499 LIBStick.py:5782 +#: LIBStick.py:5661 LIBStick.py:5944 msgid "Sortie 2D" msgstr "Salida 2D" -#: LIBStick.py:5505 LIBStick.py:5789 +#: LIBStick.py:5667 LIBStick.py:5951 msgid "Sortie 3D" msgstr "Salida 3D" -#: LIBStick.py:5524 LIBStick.py:5527 +#: LIBStick.py:5686 LIBStick.py:5689 msgid "Position x (nm) : " msgstr "Posición x (nm) : " -#: LIBStick.py:5526 LIBStick.py:5529 +#: LIBStick.py:5688 LIBStick.py:5691 msgid "Position y (n° de spectre) : " msgstr "Posición y (# de espectro): " -#: LIBStick.py:5555 +#: LIBStick.py:5717 msgid "" "Image brute\n" "spectres non\n" @@ -343,7 +343,7 @@ msgstr "" "espectros no\n" "normalizados" -#: LIBStick.py:5561 +#: LIBStick.py:5723 msgid "" "Spectre inclus\n" "dans spectre\n" @@ -353,15 +353,15 @@ msgstr "" "en el espectro\n" "promedio" -#: LIBStick.py:5587 +#: LIBStick.py:5749 msgid "Du spectre n° :" msgstr "Desde el espectro #:" -#: LIBStick.py:5588 +#: LIBStick.py:5750 msgid "Au spectre n° :" msgstr "Hasta el espectro #:" -#: LIBStick.py:5609 +#: LIBStick.py:5771 msgid "" "Moyenne des\n" "spectres \n" @@ -371,27 +371,27 @@ msgstr "" "espectros \n" "normalizados" -#: LIBStick.py:5717 +#: LIBStick.py:5879 msgid "Numérateur borne inf (nm)" msgstr "Numerador límite inf. (nm)" -#: LIBStick.py:5718 +#: LIBStick.py:5880 msgid "Numérateur borne sup (nm)" msgstr "Numerador límite sup. (nm)" -#: LIBStick.py:5719 +#: LIBStick.py:5881 msgid "Dénominateur borne inf (nm)" msgstr "Denominador límite inf. (nm)" -#: LIBStick.py:5720 +#: LIBStick.py:5882 msgid "Dénominateur borne sup( nm)" msgstr "Denominador límite sup. (nm)" -#: LIBStick.py:5744 +#: LIBStick.py:5906 msgid "Dénominateur ?" msgstr "Denominador ?" -#: LIBStick.py:5830 +#: LIBStick.py:5992 msgid "" "Normalisation\n" "des spectres" @@ -399,11 +399,11 @@ msgstr "" "Normalización\n" "de los espectros" -#: LIBStick.py:5844 +#: LIBStick.py:6006 msgid "Statistiques" msgstr "Estadísticas" -#: LIBStick.py:5851 +#: LIBStick.py:6013 msgid "" "\n" "Position x (nm) : " @@ -411,7 +411,7 @@ msgstr "" "\n" "Posición x (nm) : " -#: LIBStick.py:5852 +#: LIBStick.py:6014 msgid "" "Position y \n" "(n° de spectre) : " @@ -419,63 +419,63 @@ msgstr "" "Posición y \n" "(# de espectro) : " -#: LIBStick.py:5876 LIBStick.py:6036 +#: LIBStick.py:6038 LIBStick.py:6198 msgid "n°" msgstr "n°" -#: LIBStick.py:5877 LIBStick.py:6037 +#: LIBStick.py:6039 LIBStick.py:6199 msgid "Nom du spectre" msgstr "Nombre del espectro" -#: LIBStick.py:5878 +#: LIBStick.py:6040 msgid "Rapport zone1/zone2" msgstr "Ratio zona1/zona2" -#: LIBStick.py:6038 +#: LIBStick.py:6200 msgid "Utlisé pour l'ACP :" msgstr "Utizado para PCA:" -#: LIBStick.py:6039 +#: LIBStick.py:6201 msgid "Label :" msgstr "Etiqueta:" -#: LIBStick.py:6050 +#: LIBStick.py:6212 msgid "Spectres normalisés" msgstr "Espectros normalizados" -#: LIBStick.py:6056 +#: LIBStick.py:6218 msgid "Centré reduit" msgstr "Centrado reducido" -#: LIBStick.py:6065 +#: LIBStick.py:6227 msgid "+ ind. supp." msgstr "+ ind. adicional" -#: LIBStick.py:6069 +#: LIBStick.py:6231 msgid "Ouvre" msgstr "Abrir" -#: LIBStick.py:6073 +#: LIBStick.py:6235 msgid "Sauve" msgstr "Guardar" -#: LIBStick.py:6077 +#: LIBStick.py:6239 msgid "Dimensions : " msgstr "Dimensiones: " -#: LIBStick.py:6097 +#: LIBStick.py:6259 msgid "Même echelle x et y" msgstr "Misma escala x e y" -#: LIBStick.py:6101 +#: LIBStick.py:6263 msgid "Diag. éboulis" msgstr "Diag. scree" -#: LIBStick.py:6120 +#: LIBStick.py:6282 msgid "Diag. plotly" msgstr "Diag. plotly" -#: LIBStick.py:6123 +#: LIBStick.py:6285 msgid "" "Enregistrer \n" "facteurs \n" @@ -485,6 +485,9 @@ msgstr "" "factores\n" "de la PCA" +#~ msgid "Ferme" +#~ msgstr "Cerrar" + #, fuzzy #~| msgid "Diag. éboulis" #~ msgid "Diagramme d'éboulis" diff --git a/locale/it/LC_MESSAGES/it.mo b/locale/it/LC_MESSAGES/it.mo index 631bd97..fab3837 100644 Binary files a/locale/it/LC_MESSAGES/it.mo and b/locale/it/LC_MESSAGES/it.mo differ diff --git a/locale/it/LC_MESSAGES/it.po b/locale/it/LC_MESSAGES/it.po index fbfb359..f228607 100644 --- a/locale/it/LC_MESSAGES/it.po +++ b/locale/it/LC_MESSAGES/it.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: LIBStick v2.0\n" -"POT-Creation-Date: 2024-02-09 09:45+0100\n" -"PO-Revision-Date: 2024-02-09 09:46+0100\n" +"POT-Creation-Date: 2024-06-21 12:05+0200\n" +"PO-Revision-Date: 2024-06-21 12:09+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: it\n" @@ -10,260 +10,260 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.4\n" +"X-Generator: Poedit 3.0.1\n" "X-Poedit-Basepath: ../../..\n" "X-Poedit-SearchPath-0: LIBStick.py\n" -#: LIBStick.py:179 LIBStick.py:4677 +#: LIBStick.py:201 LIBStick.py:4708 msgid "Attention !" msgstr "Attenzione !" -#: LIBStick.py:180 +#: LIBStick.py:202 msgid "Veuillez redémarrer LIBStick pour retrouver les paramètres par défaut." msgstr "Riavviare LIBStick per ritrovare i parametri di défault." -#: LIBStick.py:494 +#: LIBStick.py:515 msgid "Choisissez un fichier spectre" msgstr "Scegliere un file spettro" -#: LIBStick.py:4402 +#: LIBStick.py:4427 msgid "Valider" msgstr "Validare" -#: LIBStick.py:4475 +#: LIBStick.py:4506 msgid "Lambda (nm) :" msgstr "Lambda (nm) :" -#: LIBStick.py:4476 +#: LIBStick.py:4507 msgid "Delta (nm) :" msgstr "Delta (nm) :" -#: LIBStick.py:4477 +#: LIBStick.py:4508 msgid "Seuil (> I rela.) :" msgstr "Soglia (> I rela.) :" -#: LIBStick.py:4499 LIBStick.py:4847 +#: LIBStick.py:4530 LIBStick.py:4986 msgid "NIST LIBS" msgstr "NIST LIBS" -#: LIBStick.py:4678 +#: LIBStick.py:4709 msgid "Pas d'informations pour cet élément." msgstr "Nessuna informazione per quest'elemento." -#: LIBStick.py:4828 -msgid "Ferme" -msgstr "Chiuso" +#: LIBStick.py:4967 +msgid "Efface" +msgstr "Cancellare" -#: LIBStick.py:4838 +#: LIBStick.py:4977 msgid "Neutres" msgstr "Neutri" -#: LIBStick.py:4842 +#: LIBStick.py:4981 msgid "Ions +" msgstr "Ioni +" -#: LIBStick.py:4852 +#: LIBStick.py:4991 msgid "I relative >= 10%" msgstr "I relativa >= 10%" -#: LIBStick.py:4856 -msgid "1% <= I relative < 10%" -msgstr "1% <= I relativa < 10%" +#: LIBStick.py:4995 +msgid "1% <= I rel < 10%" +msgstr "1% <= I rel < 10%" -#: LIBStick.py:4860 +#: LIBStick.py:4999 msgid "I relative < 1%" msgstr "I relativa < 1%" -#: LIBStick.py:4997 +#: LIBStick.py:5159 msgid "LIBStick pré-traitements" msgstr "LIBStick pretrattamenti" -#: LIBStick.py:4998 +#: LIBStick.py:5160 msgid "LIBStick extraction" msgstr "LIBStick estrazione" -#: LIBStick.py:4999 +#: LIBStick.py:5161 msgid "LIBStick comparaison" msgstr "LIBStick paragone" -#: LIBStick.py:5000 +#: LIBStick.py:5162 msgid "LIBStick ACP" msgstr "LIBStick PCA" -#: LIBStick.py:5014 LIBStick.py:5291 LIBStick.py:5489 LIBStick.py:5773 -#: LIBStick.py:6011 +#: LIBStick.py:5176 LIBStick.py:5453 LIBStick.py:5651 LIBStick.py:5935 +#: LIBStick.py:6173 msgid "Fichier" msgstr "Documento" -#: LIBStick.py:5015 +#: LIBStick.py:5177 msgid "Sauvegarde des paramètres actuels" msgstr "Salvare i parametri attuali" -#: LIBStick.py:5017 +#: LIBStick.py:5179 msgid "Restaure les paramètres par défaut au prochain démarrage" msgstr "Ristabilire i parametri di défault al prossimo avvio" -#: LIBStick.py:5019 +#: LIBStick.py:5181 msgid "Quitter" msgstr "Chiudere" -#: LIBStick.py:5021 +#: LIBStick.py:5183 msgid "Redémarrer" msgstr "Riavviare" -#: LIBStick.py:5024 +#: LIBStick.py:5186 msgid "Traitement" msgstr "Trattamento" -#: LIBStick.py:5026 LIBStick.py:5031 LIBStick.py:5036 LIBStick.py:5041 +#: LIBStick.py:5188 LIBStick.py:5193 LIBStick.py:5198 LIBStick.py:5203 msgid "Echelle log y" msgstr "Scala log y" -#: LIBStick.py:5029 LIBStick.py:5603 +#: LIBStick.py:5191 LIBStick.py:5765 msgid "Extraction" msgstr "Estrazione" -#: LIBStick.py:5034 +#: LIBStick.py:5196 msgid "Comparaison" msgstr "Paragone" -#: LIBStick.py:5039 LIBStick.py:6061 +#: LIBStick.py:5201 LIBStick.py:6223 msgid "ACP" msgstr "PCA" -#: LIBStick.py:5044 +#: LIBStick.py:5206 msgid "Outils" msgstr "Strumenti" -#: LIBStick.py:5046 +#: LIBStick.py:5208 msgid "Zoom auto en y" msgstr "Zoom auto in y" -#: LIBStick.py:5047 +#: LIBStick.py:5209 msgid "Graduations" -msgstr "" +msgstr "Graduatorie" -#: LIBStick.py:5049 +#: LIBStick.py:5211 msgid "Pas multiple de 10" msgstr "Passo multiplo di 10" -#: LIBStick.py:5051 +#: LIBStick.py:5213 msgid "Pas multiple de 5" msgstr "Passo multiplo di 5" -#: LIBStick.py:5053 +#: LIBStick.py:5215 msgid "Pas multiple de 2" msgstr "Passo multiplo di 2" -#: LIBStick.py:5055 +#: LIBStick.py:5217 msgid "Pas multiple de 1" msgstr "Passo multiplo di 1" -#: LIBStick.py:5059 +#: LIBStick.py:5221 msgid "Espacement mini 100 pixels" msgstr "Spazio minimo 100 pixel" -#: LIBStick.py:5061 +#: LIBStick.py:5223 msgid "Espacement mini 50 pixels" msgstr "Spazio minimo 50 pixel" -#: LIBStick.py:5063 +#: LIBStick.py:5225 msgid "Espacement mini 20 pixels" msgstr "Spazio minimo 20 pixel" -#: LIBStick.py:5067 +#: LIBStick.py:5229 msgid "Recherche d'éléments" msgstr "Ricerca di elementi" -#: LIBStick.py:5069 +#: LIBStick.py:5231 msgid "Tableau périodique" msgstr "Tavola periodica" -#: LIBStick.py:5073 +#: LIBStick.py:5235 msgid "Fenetre principale premier plan" msgstr "Finestra principale primo piano" -#: LIBStick.py:5077 +#: LIBStick.py:5239 msgid "Langue au prochain démarage" msgstr "Lingua al prossimo avvio" -#: LIBStick.py:5079 +#: LIBStick.py:5241 msgid "Français" msgstr "Francese" -#: LIBStick.py:5081 +#: LIBStick.py:5243 msgid "Anglais" msgstr "Inglese" -#: LIBStick.py:5083 +#: LIBStick.py:5245 msgid "Espagnol" msgstr "Spagnolo" -#: LIBStick.py:5085 +#: LIBStick.py:5247 msgid "Italien" msgstr "Italiano" -#: LIBStick.py:5088 +#: LIBStick.py:5250 msgid "Style au prochain démarage" msgstr "Stile al prossimo avvio" -#: LIBStick.py:5090 +#: LIBStick.py:5252 msgid "Couleur de LIBStick" msgstr "Colore di LIBStick" -#: LIBStick.py:5135 +#: LIBStick.py:5297 msgid "Aide" msgstr "Aiuto" -#: LIBStick.py:5136 +#: LIBStick.py:5298 msgid "Aide (F1)" msgstr "Aiuto (F1)" -#: LIBStick.py:5138 +#: LIBStick.py:5300 msgid "A propos de LIBStick" msgstr "Informazioni su LIBStick" -#: LIBStick.py:5210 LIBStick.py:5979 +#: LIBStick.py:5372 LIBStick.py:6141 msgid "Borne inf :" msgstr "Limite inf :" -#: LIBStick.py:5211 LIBStick.py:5980 +#: LIBStick.py:5373 LIBStick.py:6142 msgid "Borne sup :" msgstr "Limite sup :" -#: LIBStick.py:5223 +#: LIBStick.py:5385 msgid "Filtre :" msgstr "Filtro :" -#: LIBStick.py:5224 +#: LIBStick.py:5386 msgid "Taille :" msgstr "Dimensione :" -#: LIBStick.py:5225 +#: LIBStick.py:5387 msgid "Ordre :" msgstr "Ordine :" -#: LIBStick.py:5226 +#: LIBStick.py:5388 msgid "Dérivée :" msgstr "Derivata :" -#: LIBStick.py:5238 LIBStick.py:5263 +#: LIBStick.py:5400 LIBStick.py:5425 msgid "Aucun" msgstr "Nessuno" -#: LIBStick.py:5250 +#: LIBStick.py:5412 msgid "Fond :" msgstr "Fondo :" -#: LIBStick.py:5251 +#: LIBStick.py:5413 msgid "Itérations :" msgstr "Iterazioni :" -#: LIBStick.py:5293 +#: LIBStick.py:5455 msgid "Visualisation" msgstr "Visualizzazione" -#: LIBStick.py:5324 +#: LIBStick.py:5486 msgid "" "Appliquer sur\n" "tous les fichiers\n" @@ -273,7 +273,7 @@ msgstr "" "tutti i documenti\n" "della cartella" -#: LIBStick.py:5330 +#: LIBStick.py:5492 msgid "" "Sauvegarde du\n" "fond continu" @@ -281,59 +281,59 @@ msgstr "" "Salvataggio del\n" "fondo continuo" -#: LIBStick.py:5334 +#: LIBStick.py:5496 msgid "Executer" msgstr "Eseguire" -#: LIBStick.py:5338 +#: LIBStick.py:5500 msgid "Spectre : " msgstr "Spettro : " -#: LIBStick.py:5436 +#: LIBStick.py:5598 msgid "Première borne inf (nm)" msgstr "Primo limite inf (nm)" -#: LIBStick.py:5437 +#: LIBStick.py:5599 msgid "Première borne sup (nm)" msgstr "Primo limite sup (nm)" -#: LIBStick.py:5438 +#: LIBStick.py:5600 msgid "Seconde borne inf (nm)" msgstr "Secondo limite inf (nm)" -#: LIBStick.py:5439 +#: LIBStick.py:5601 msgid "Seconde borne sup (nm)" msgstr "Secondo limite sup (nm)" -#: LIBStick.py:5463 +#: LIBStick.py:5625 msgid "Seconde extraction" msgstr "Seconda estrazione" -#: LIBStick.py:5467 LIBStick.py:5749 +#: LIBStick.py:5629 LIBStick.py:5911 msgid "Reset" msgstr "Reset" -#: LIBStick.py:5492 LIBStick.py:5775 +#: LIBStick.py:5654 LIBStick.py:5937 msgid "Exécute" msgstr "Esegui" -#: LIBStick.py:5499 LIBStick.py:5782 +#: LIBStick.py:5661 LIBStick.py:5944 msgid "Sortie 2D" msgstr "Output 2D" -#: LIBStick.py:5505 LIBStick.py:5789 +#: LIBStick.py:5667 LIBStick.py:5951 msgid "Sortie 3D" msgstr "Output 3D" -#: LIBStick.py:5524 LIBStick.py:5527 +#: LIBStick.py:5686 LIBStick.py:5689 msgid "Position x (nm) : " msgstr "Posizione x (nm) : " -#: LIBStick.py:5526 LIBStick.py:5529 +#: LIBStick.py:5688 LIBStick.py:5691 msgid "Position y (n° de spectre) : " msgstr "Posizione y (n° di spettro) : " -#: LIBStick.py:5555 +#: LIBStick.py:5717 msgid "" "Image brute\n" "spectres non\n" @@ -343,7 +343,7 @@ msgstr "" "spettri non\n" "normalizzati" -#: LIBStick.py:5561 +#: LIBStick.py:5723 msgid "" "Spectre inclus\n" "dans spectre\n" @@ -353,15 +353,15 @@ msgstr "" "nello spettro\n" "medio" -#: LIBStick.py:5587 +#: LIBStick.py:5749 msgid "Du spectre n° :" msgstr "Dello spettro n° :" -#: LIBStick.py:5588 +#: LIBStick.py:5750 msgid "Au spectre n° :" msgstr "Allo spettro n° :" -#: LIBStick.py:5609 +#: LIBStick.py:5771 msgid "" "Moyenne des\n" "spectres \n" @@ -371,27 +371,27 @@ msgstr "" "spettri\n" "normalizzati" -#: LIBStick.py:5717 +#: LIBStick.py:5879 msgid "Numérateur borne inf (nm)" msgstr "Numeratore limite inf (nm)" -#: LIBStick.py:5718 +#: LIBStick.py:5880 msgid "Numérateur borne sup (nm)" msgstr "Numeratore limite sup (nm)" -#: LIBStick.py:5719 +#: LIBStick.py:5881 msgid "Dénominateur borne inf (nm)" msgstr "Denominatore limite inf (nm)" -#: LIBStick.py:5720 +#: LIBStick.py:5882 msgid "Dénominateur borne sup( nm)" msgstr "Denominatore limite sup (nm)" -#: LIBStick.py:5744 +#: LIBStick.py:5906 msgid "Dénominateur ?" msgstr "Denominatore ?" -#: LIBStick.py:5830 +#: LIBStick.py:5992 msgid "" "Normalisation\n" "des spectres" @@ -399,11 +399,11 @@ msgstr "" "Normalizzazione\n" "degli spettri" -#: LIBStick.py:5844 +#: LIBStick.py:6006 msgid "Statistiques" msgstr "Statistiche" -#: LIBStick.py:5851 +#: LIBStick.py:6013 msgid "" "\n" "Position x (nm) : " @@ -411,7 +411,7 @@ msgstr "" "\n" "Posizione x (nm) : " -#: LIBStick.py:5852 +#: LIBStick.py:6014 msgid "" "Position y \n" "(n° de spectre) : " @@ -419,63 +419,63 @@ msgstr "" "Posizione y \n" "(n° di spettro) : " -#: LIBStick.py:5876 LIBStick.py:6036 +#: LIBStick.py:6038 LIBStick.py:6198 msgid "n°" msgstr "n°" -#: LIBStick.py:5877 LIBStick.py:6037 +#: LIBStick.py:6039 LIBStick.py:6199 msgid "Nom du spectre" msgstr "Nome dello spettro" -#: LIBStick.py:5878 +#: LIBStick.py:6040 msgid "Rapport zone1/zone2" msgstr "Rapporto zona1/zona2" -#: LIBStick.py:6038 +#: LIBStick.py:6200 msgid "Utlisé pour l'ACP :" msgstr "Utilizzato per il PCA :" -#: LIBStick.py:6039 +#: LIBStick.py:6201 msgid "Label :" msgstr "Etichetta :" -#: LIBStick.py:6050 +#: LIBStick.py:6212 msgid "Spectres normalisés" msgstr "Spettri normalizzati" -#: LIBStick.py:6056 +#: LIBStick.py:6218 msgid "Centré reduit" msgstr "Centrato ridotto" -#: LIBStick.py:6065 +#: LIBStick.py:6227 msgid "+ ind. supp." msgstr "+ ind. supp." -#: LIBStick.py:6069 +#: LIBStick.py:6231 msgid "Ouvre" msgstr "Apri" -#: LIBStick.py:6073 +#: LIBStick.py:6235 msgid "Sauve" msgstr "Salva" -#: LIBStick.py:6077 +#: LIBStick.py:6239 msgid "Dimensions : " msgstr "Dimensioni : " -#: LIBStick.py:6097 +#: LIBStick.py:6259 msgid "Même echelle x et y" msgstr "Stessa scala x e y" -#: LIBStick.py:6101 +#: LIBStick.py:6263 msgid "Diag. éboulis" msgstr "Diag. di scree" -#: LIBStick.py:6120 +#: LIBStick.py:6282 msgid "Diag. plotly" msgstr "Diag. plotly" -#: LIBStick.py:6123 +#: LIBStick.py:6285 msgid "" "Enregistrer \n" "facteurs \n" @@ -485,6 +485,9 @@ msgstr "" "fattori\n" "del PCA" +#~ msgid "Ferme" +#~ msgstr "Chiuso" + #~ msgid "Variance expliquée %" #~ msgstr "Varianza esplicita %" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e6fc87f --- /dev/null +++ b/requirements.txt @@ -0,0 +1,27 @@ +configparser==6.0.1 +contourpy==1.2.0 +cycler==0.12.1 +et-xmlfile==1.1.0 +fonttools==4.49.0 +joblib==1.3.2 +kiwisolver==1.4.5 +matplotlib==3.8.3 +numpy==1.26.4 +openpyxl==3.1.2 +packaging==24.0 +pandas==2.2.1 +pathlib==1.0.1 +pillow==10.2.0 +plotly==5.20.0 +pyparsing==3.1.2 +python-dateutil==2.9.0.post0 +pytz==2024.1 +scikit-learn==1.4.1.post1 +scipy==1.12.0 +six==1.16.0 +tabulate==0.9.0 +tenacity==8.2.3 +threadpoolctl==3.3.0 +tk==0.1.0 +ttkthemes==3.2.2 +tzdata==2024.1