diff --git a/LICENCE.txt b/LICENCE.txt new file mode 100644 index 0000000000000000000000000000000000000000..0a041280bd00a9d068f503b8ee7ce35214bd24a1 --- /dev/null +++ b/LICENCE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser 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 +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/main.c b/main.c index 0668ed55fe3452e2b872a9a2139479533ac75a33..9bd64f1201f30e069d63355b1d8149a9e5ef46c3 100644 --- a/main.c +++ b/main.c @@ -1,3 +1,21 @@ +/* + * relaxisloader + * Copyright (C) Carl Philipp Klemm 2023 <carl@uvos.xyz> + * + * relaxisloader is free software: you can redistribute it and/or modify it + * under the terms of the lesser GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * relaxisloader 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 lesser GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include <stdio.h> #include <relaxisloader.h> #include <stdlib.h> @@ -9,6 +27,7 @@ int main(int argc, char** argv) return 1; } + // Open a RelaxIS3 file and check for errors const char *error; struct rxfile *file = rlx_open_file(argv[1], &error); if(!file) { @@ -16,6 +35,7 @@ int main(int argc, char** argv) return 2; } + // Read all projects from the file just opened size_t projectCount; struct rlx_project** projects = rlx_get_projects(file, &projectCount); if(projectCount < 1) { @@ -23,6 +43,7 @@ int main(int argc, char** argv) return 4; } + // Get the ids of specra associated with the first project in the file size_t idCount; int *ids = rlx_get_spectra_ids(file, projects[0], &idCount); for(int i = 0; i < idCount; ++i) @@ -33,6 +54,8 @@ int main(int argc, char** argv) } printf("%p %d\n", projects[0], projects[0]->id); + + // Grab the first spectrum struct rlx_spectra* spectra = rlx_get_spectra(file, projects[0], ids[0]); if(!spectra) { printf("Could not load spectra for %d %d: %s\n", projects[0]->id, ids[0], rlx_get_errnum_str(rlx_get_errnum(file))); @@ -44,6 +67,7 @@ int main(int argc, char** argv) } size_t paramCount; + // Grab the parameters for the first spectrum struct rlx_fitparam** params = rlx_get_fit_parameters(file, projects[0], ids[0], ¶mCount); if(!params) { printf("Could not get parameters for project %d spectra %d: %s\n", projects[0]->id, ids[0], rlx_get_errnum_str(rlx_get_errnum(file))); @@ -53,10 +77,13 @@ int main(int argc, char** argv) printf("Parameter %d: Name: %s Value: %f Error: %f\n", params[i]->p_index, params[i]->name, params[i]->value, params[i]->error); } + // Free aquired structs rlx_project_free_array(projects); rlx_spectra_free(spectra); rlx_fitparam_free_array(params); free(ids); + + // Close RelaxIS3 file rlx_close_file(file); return 0; } diff --git a/relaxisloader.c b/relaxisloader.c index eb3d6fcc36fb178e4d21558a05733a2dfdf30676..a037e4a1761440f680aa9eab089f72dbaf07a951 100644 --- a/relaxisloader.c +++ b/relaxisloader.c @@ -1,3 +1,21 @@ +/* + * relaxisloader + * Copyright (C) Carl Philipp Klemm 2023 <carl@uvos.xyz> + * + * relaxisloader is free software: you can redistribute it and/or modify it + * under the terms of the lesser GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * relaxisloader 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 lesser GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "relaxisloader.h" #include <stdlib.h> diff --git a/relaxisloader/relaxisloader.h b/relaxisloader/relaxisloader.h index 1e893f75eada7dae40d75e2fa61c1b004ae8099f..118eb49d30df3cc3d8f964421cd0474d17ccb80e 100644 --- a/relaxisloader/relaxisloader.h +++ b/relaxisloader/relaxisloader.h @@ -2,12 +2,12 @@ * relaxisloader.h * Copyright (C) Carl Philipp Klemm 2023 <carl@uvos.xyz> * - * relaxisloader.h is free software: you can redistribute it and/or modify it + * relaxisloader is free software: you can redistribute it and/or modify it * under the terms of the lesser GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * relaxisloader.h is distributed in the hope that it will be useful, but + * relaxisloader 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. diff --git a/utils.c b/utils.c index ea3c0a35637d87f384adc3a25fa791dddf80f8d8..6f816f3c19afe6a1b1798c2cc542e417ad8cfdeb 100644 --- a/utils.c +++ b/utils.c @@ -1,3 +1,21 @@ +/* + * relaxisloader + * Copyright (C) Carl Philipp Klemm 2023 <carl@uvos.xyz> + * + * relaxisloader is free software: you can redistribute it and/or modify it + * under the terms of the lesser GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * relaxisloader 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 lesser GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "utils.h" #include <assert.h> #include <stdlib.h> diff --git a/utils.h b/utils.h index c1f9ddf0d59f6646c528b3466b33df6a1f8ef131..af8154f5a1e7ca8bc82505f6f758b379c97d817c 100644 --- a/utils.h +++ b/utils.h @@ -1,3 +1,21 @@ +/* + * relaxisloader + * Copyright (C) Carl Philipp Klemm 2023 <carl@uvos.xyz> + * + * relaxisloader is free software: you can redistribute it and/or modify it + * under the terms of the lesser GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * relaxisloader 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 lesser GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #pragma once #include <time.h>