From 399267d422cf570806470c1ea663943fa85f52e6 Mon Sep 17 00:00:00 2001 From: alxpl Date: Sun, 24 Sep 2023 00:31:42 +0200 Subject: [PATCH 1/5] Update fityk.appdata.xml Fix all the validator warnings and add some keywords. The more verbose description was assembled from the fityk manual. --- fityk.appdata.xml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fityk.appdata.xml b/fityk.appdata.xml index 00592dab..44b819a7 100644 --- a/fityk.appdata.xml +++ b/fityk.appdata.xml @@ -7,13 +7,11 @@ Non-linear curve fitting and data analysis -

Fityk [fi:tik] is a program for data processing and nonlinear curve fitting.

-

Primarily used:

- -

but it is suitable for fitting any curve to 2D (x,y) data.

+

Fityk [fi:tik] is a program for data processing and nonlinear curve fitting of analytical functions to data (usually experimental data). It is primarily peak fitting software, but can handle other types of functions as well.

+

Apart from the actual fitting, the program helps with data processing and provides an ergonomic graphical interface and also a command line interface and a scripting API

+

Fityk offers various nonlinear fitting methods (such as Gaussian, Voigt, sigmoid, polynomial and dozens of others), simple background subtraction and other manipulations to the dataset, easy placement of peaks and changing of peak parameters, support for analysis of series of datasets, automation of common tasks with scripts, and much more.

+

But the program can also handle quite complex scenarios. You can define your own function types. You can specify sophisticated dependencies between parameters of the functions (say, peak widths given as a function of peak positions). You can fit multiple datasets together using common set of parameters. You can model zero-shift in your instrument or do more complicated refinement of the X scale. And you can automate all this work.

+

Fityk is reportedly used in crystallography, chromatography, photoluminescence and photoelectron spectroscopy, infrared and Raman spectroscopy, to name but a few.

 @@ -26,6 +24,12 @@ fityk.desktop + + curve fitting + XPS + crystallography + + Main window with three plots @@ -75,7 +79,7 @@ - http://fityk.nieto.pl/ + https://fityk.nieto.pl/ fityk From bfaf596824bb2eb8a1797ab33a763d6b7b1ab6bf Mon Sep 17 00:00:00 2001 From: alxpl Date: Sun, 24 Sep 2023 00:34:43 +0200 Subject: [PATCH 2/5] Rename fityk.appdata.xml to fityk.metainfo.xml Adhere to latest AppStream guidelines --- fityk.appdata.xml => fityk.metainfo.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename fityk.appdata.xml => fityk.metainfo.xml (100%) diff --git a/fityk.appdata.xml b/fityk.metainfo.xml similarity index 100% rename from fityk.appdata.xml rename to fityk.metainfo.xml From 72586f25048c68bde2034745527c1a2ba0f88c3c Mon Sep 17 00:00:00 2001 From: alxpl Date: Sun, 24 Sep 2023 00:40:19 +0200 Subject: [PATCH 3/5] Update Makefile.am Adjust AppStream metadata file name and location --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2bd5634b..86f00ade 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,13 +19,13 @@ icon32dir = $(datadir)/icons/hicolor/32x32/apps iconscdir = $(datadir)/icons/hicolor/scalable/apps desktopdir = $(datadir)/applications mimepkgdir = $(datadir)/mime/packages -appdatadir = $(datadir)/appdata +appdatadir = $(datadir)/metainfo dist_icon32_DATA = fityk.png dist_iconsc_DATA = fityk.svg dist_desktop_DATA = fityk.desktop dist_mimepkg_DATA = fityk.xml -dist_appdata_DATA = fityk.appdata.xml +dist_appdata_DATA = fityk.metainfo.xml # --- cli/ --- cli_cfityk_SOURCES = cli/gnuplot.cpp cli/main.cpp cli/gnuplot.h From 346df6ec59aa8705f238e936de82a100b4505374 Mon Sep 17 00:00:00 2001 From: alxpl Date: Sun, 24 Sep 2023 01:49:26 +0200 Subject: [PATCH 4/5] Update and rename fityk.metainfo.xml to pl.nieto.fityk.metainfo.xml Use correct file this time --- fityk.metainfo.xml => pl.nieto.fityk.metainfo.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename fityk.metainfo.xml => pl.nieto.fityk.metainfo.xml (86%) diff --git a/fityk.metainfo.xml b/pl.nieto.fityk.metainfo.xml similarity index 86% rename from fityk.metainfo.xml rename to pl.nieto.fityk.metainfo.xml index 44b819a7..e2d71e87 100644 --- a/fityk.metainfo.xml +++ b/pl.nieto.fityk.metainfo.xml @@ -1,4 +1,5 @@ + pl.nieto.fityk CC0-1.0 @@ -8,9 +9,8 @@

Fityk [fi:tik] is a program for data processing and nonlinear curve fitting of analytical functions to data (usually experimental data). It is primarily peak fitting software, but can handle other types of functions as well.

-

Apart from the actual fitting, the program helps with data processing and provides an ergonomic graphical interface and also a command line interface and a scripting API

+

Apart from the actual fitting, the program helps with data processing and provides an ergonomic graphical interface and also a command line interface and a scripting API.

Fityk offers various nonlinear fitting methods (such as Gaussian, Voigt, sigmoid, polynomial and dozens of others), simple background subtraction and other manipulations to the dataset, easy placement of peaks and changing of peak parameters, support for analysis of series of datasets, automation of common tasks with scripts, and much more.

-

But the program can also handle quite complex scenarios. You can define your own function types. You can specify sophisticated dependencies between parameters of the functions (say, peak widths given as a function of peak positions). You can fit multiple datasets together using common set of parameters. You can model zero-shift in your instrument or do more complicated refinement of the X scale. And you can automate all this work.

Fityk is reportedly used in crystallography, chromatography, photoluminescence and photoelectron spectroscopy, infrared and Raman spectroscopy, to name but a few.

 @@ -56,7 +56,7 @@ https://alexpl.fedorapeople.org/AppData/fityk/screens/Screen05.png - Fitting functions can be edited and custom ones added + Fitting functions can be created/edited https://alexpl.fedorapeople.org/AppData/fityk/screens/Screen06.png From da0482a5c88f1380223d1f55a1efa182b50b18ed Mon Sep 17 00:00:00 2001 From: alxpl Date: Sun, 24 Sep 2023 01:50:42 +0200 Subject: [PATCH 5/5] Update Makefile.am Use correct file name --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 86f00ade..8264fa06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ dist_icon32_DATA = fityk.png dist_iconsc_DATA = fityk.svg dist_desktop_DATA = fityk.desktop dist_mimepkg_DATA = fityk.xml -dist_appdata_DATA = fityk.metainfo.xml +dist_appdata_DATA = pl.nieto.fityk.metainfo.xml # --- cli/ --- cli_cfityk_SOURCES = cli/gnuplot.cpp cli/main.cpp cli/gnuplot.h