From 59499b0462576702912230a3718661c226f5f2b4 Mon Sep 17 00:00:00 2001 From: rozyczko Date: Thu, 1 May 2025 11:41:50 +0200 Subject: [PATCH] version # update copyright date update --- CHANGELOG.md | 5 +++-- EasyReflectometryApp/Backends/Mock/Home.qml | 4 ++-- .../Backends/Py/logic/helpers.py | 4 ++-- EasyReflectometryApp/Backends/Py/status.py | 4 ++-- EasyReflectometryApp/Backends/Py/summary.py | 4 ++-- .../Gui/Globals/ApplicationInfo.qml | 2 +- .../Pages/Analysis/MainContent/AnalysisView.qml | 4 ++-- .../Sidebar/Advanced/Groups/Calculator.qml | 4 ++-- .../Sidebar/Advanced/Groups/Minimizer.qml | 4 ++-- .../Sidebar/Advanced/Groups/ParamNames.qml | 4 ++-- .../Pages/Analysis/Sidebar/Advanced/Layout.qml | 4 ++-- .../Sidebar/Basic/Groups/Experiments.qml | 4 ++-- .../Analysis/Sidebar/Basic/Groups/Fittables.qml | 4 ++-- .../Analysis/Sidebar/Basic/Groups/Fitting.qml | 4 ++-- .../Gui/Pages/Analysis/Sidebar/Basic/Layout.qml | 4 ++-- .../Sidebar/Basic/Popups/FitStatusDialog.qml | 4 ++-- .../Experiment/MainContent/ExperimentView.qml | 4 ++-- .../Pages/Project/MainContent/Description.qml | 4 ++-- .../Gui/Pages/Sample/MainContent/SampleView.qml | 4 ++-- .../Gui/Pages/Sample/MainContent/SldView.qml | 4 ++-- .../Gui/Pages/Summary/Layout.qml | 4 ++-- .../Gui/Pages/Summary/MainContent/Summary.qml | 4 ++-- .../Summary/Sidebar/Basic/Groups/Export.qml | 4 ++-- .../Gui/Pages/Summary/Sidebar/Basic/Layout.qml | 4 ++-- .../Pages/Summary/Sidebar/Extra/Groups/Empty.qml | 4 ++-- .../Gui/Pages/Summary/Sidebar/Extra/Layout.qml | 4 ++-- EasyReflectometryApp/__version__.py | 2 +- EasyReflectometryApp/main.py | 4 ++-- INSTALLATION.md | 10 +++++----- LICENSE.md | 2 +- docs/src/conf.py | 4 ++-- docs/src/installation.md | 10 +++++----- docs/src/tutorial.md | 2 +- pyproject.toml | 16 +++++++++------- src_qt5/LICENSE.md | 2 +- tools/Scripts/CheckAppExists.py | 4 ++-- tools/Scripts/Config.py | 4 ++-- tools/Scripts/FreezeApp.py | 4 ++-- tools/Scripts/Functions.py | 4 ++-- tools/Scripts/InstallApp.py | 4 ++-- tools/Scripts/InstallerControlScript.js | 4 ++-- tools/Scripts/InstallerInstallScript.js | 4 ++-- tools/Scripts/MakeInstaller.py | 4 ++-- tools/Scripts/RunApp.py | 4 ++-- tools/Scripts/UnzipAppInstaller.py | 4 ++-- tools/Scripts/UploadToFtp.py | 4 ++-- tools/Scripts/ZipAppInstaller.py | 4 ++-- utils.py | 4 ++-- 48 files changed, 105 insertions(+), 102 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed43f35..ee6d9b9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ -# Version 1.0.0 (27 Nov 2024) +# Version 1.1.0 (1 May 2025) -Changed to Qt6 \ No newline at end of file +New, updated documentation. +Updated numpy and Qt6 versions. diff --git a/EasyReflectometryApp/Backends/Mock/Home.qml b/EasyReflectometryApp/Backends/Mock/Home.qml index baf19e0d..7af2fae8 100644 --- a/EasyReflectometryApp/Backends/Mock/Home.qml +++ b/EasyReflectometryApp/Backends/Mock/Home.qml @@ -7,8 +7,8 @@ QtObject { property bool created: false readonly property var version: { - 'number': '1.0.0', - 'date': '1 January 2024', + 'number': '1.1.0', + 'date': '1 May 2025', } readonly property var urls: { diff --git a/EasyReflectometryApp/Backends/Py/logic/helpers.py b/EasyReflectometryApp/Backends/Py/logic/helpers.py index a97866d4..ab82f0ef 100644 --- a/EasyReflectometryApp/Backends/Py/logic/helpers.py +++ b/EasyReflectometryApp/Backends/Py/logic/helpers.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2024 EasyApp contributors +# 5SPDX-FileCopyrightText: 2025 EasyApp contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2024 Contributors to the EasyApp project +# © 2025 Contributors to the EasyApp project class IO: diff --git a/EasyReflectometryApp/Backends/Py/status.py b/EasyReflectometryApp/Backends/Py/status.py index c314f914..a02c9460 100644 --- a/EasyReflectometryApp/Backends/Py/status.py +++ b/EasyReflectometryApp/Backends/Py/status.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2024 EasyApp contributors +# 5SPDX-FileCopyrightText: 2025 EasyApp contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2024 Contributors to the EasyApp project +# © 2025 Contributors to the EasyApp project from easyreflectometry import Project as ProjectLib from PySide6.QtCore import Property diff --git a/EasyReflectometryApp/Backends/Py/summary.py b/EasyReflectometryApp/Backends/Py/summary.py index cee9f4c1..cd44af15 100644 --- a/EasyReflectometryApp/Backends/Py/summary.py +++ b/EasyReflectometryApp/Backends/Py/summary.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2024 EasyApp contributors +# 5SPDX-FileCopyrightText: 2025 EasyApp contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2024 Contributors to the EasyApp project +# © 2025 Contributors to the EasyApp project from easyreflectometry import Project as ProjectLib from PySide6.QtCore import Property diff --git a/EasyReflectometryApp/Gui/Globals/ApplicationInfo.qml b/EasyReflectometryApp/Gui/Globals/ApplicationInfo.qml index 31fc35e1..7c10fa07 100644 --- a/EasyReflectometryApp/Gui/Globals/ApplicationInfo.qml +++ b/EasyReflectometryApp/Gui/Globals/ApplicationInfo.qml @@ -10,7 +10,7 @@ QtObject { 'nameSuffixForLogo': 'reflectometry', 'icon': Qt.resolvedUrl('../Resources/Logo/App.svg'), 'developerYearsFrom': '2019', - 'developerYearsTo': '2024', + 'developerYearsTo': '2025', 'description': 'EasyReflectometry is a scientific software for \nmodelling and analysis of \nneutron and x-ray reflecometry data. \n\nEasyReflectometry is build by ESS DMSC in \nCopenhagen, Denmark.', 'developerIcons': [ { diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/MainContent/AnalysisView.qml b/EasyReflectometryApp/Gui/Pages/Analysis/MainContent/AnalysisView.qml index 42481d5c..2caec343 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/MainContent/AnalysisView.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/MainContent/AnalysisView.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/Calculator.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/Calculator.qml index 43fb39cf..2b1cb1ad 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/Calculator.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/Calculator.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/Minimizer.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/Minimizer.qml index 1ffc6a13..d5fff228 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/Minimizer.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/Minimizer.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/ParamNames.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/ParamNames.qml index 657b2ddb..cca55bf3 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/ParamNames.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Groups/ParamNames.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Layout.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Layout.qml index f43769f5..2571f4d9 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Layout.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Advanced/Layout.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Experiments.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Experiments.qml index 81b3e0d3..93cf779f 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Experiments.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Experiments.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fittables.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fittables.qml index e554935f..8750dd3d 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fittables.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fittables.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fitting.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fitting.qml index e6e55391..f4ccbfe7 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fitting.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Groups/Fitting.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Layout.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Layout.qml index cad9d29f..befb86a8 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Layout.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Layout.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick diff --git a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Popups/FitStatusDialog.qml b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Popups/FitStatusDialog.qml index 0866adb1..9ea84974 100644 --- a/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Popups/FitStatusDialog.qml +++ b/EasyReflectometryApp/Gui/Pages/Analysis/Sidebar/Basic/Popups/FitStatusDialog.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Experiment/MainContent/ExperimentView.qml b/EasyReflectometryApp/Gui/Pages/Experiment/MainContent/ExperimentView.qml index c5be5eb3..105cddf3 100644 --- a/EasyReflectometryApp/Gui/Pages/Experiment/MainContent/ExperimentView.qml +++ b/EasyReflectometryApp/Gui/Pages/Experiment/MainContent/ExperimentView.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Project/MainContent/Description.qml b/EasyReflectometryApp/Gui/Pages/Project/MainContent/Description.qml index 2f00eadc..eab0faa6 100644 --- a/EasyReflectometryApp/Gui/Pages/Project/MainContent/Description.qml +++ b/EasyReflectometryApp/Gui/Pages/Project/MainContent/Description.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2024 EasyApp contributors +// 5SPDX-FileCopyrightText: 2025 EasyApp contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2024 Contributors to the EasyApp project +// © 2025 Contributors to the EasyApp project import QtQuick diff --git a/EasyReflectometryApp/Gui/Pages/Sample/MainContent/SampleView.qml b/EasyReflectometryApp/Gui/Pages/Sample/MainContent/SampleView.qml index 2784801e..c8962b02 100644 --- a/EasyReflectometryApp/Gui/Pages/Sample/MainContent/SampleView.qml +++ b/EasyReflectometryApp/Gui/Pages/Sample/MainContent/SampleView.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Sample/MainContent/SldView.qml b/EasyReflectometryApp/Gui/Pages/Sample/MainContent/SldView.qml index c330a276..6571850a 100644 --- a/EasyReflectometryApp/Gui/Pages/Sample/MainContent/SldView.qml +++ b/EasyReflectometryApp/Gui/Pages/Sample/MainContent/SldView.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2023 Contributors to the EasyReflectometry project +// © 2025 Contributors to the EasyReflectometry project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Summary/Layout.qml b/EasyReflectometryApp/Gui/Pages/Summary/Layout.qml index 223ccffa..cafa75e3 100644 --- a/EasyReflectometryApp/Gui/Pages/Summary/Layout.qml +++ b/EasyReflectometryApp/Gui/Pages/Summary/Layout.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2024 EasyApp contributors +// 5SPDX-FileCopyrightText: 2025 EasyApp contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2024 Contributors to the EasyApp project +// © 2025 Contributors to the EasyApp project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Summary/MainContent/Summary.qml b/EasyReflectometryApp/Gui/Pages/Summary/MainContent/Summary.qml index da96887a..929e4b64 100644 --- a/EasyReflectometryApp/Gui/Pages/Summary/MainContent/Summary.qml +++ b/EasyReflectometryApp/Gui/Pages/Summary/MainContent/Summary.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2024 EasyApp contributors +// 5SPDX-FileCopyrightText: 2025 EasyApp contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2024 Contributors to the EasyApp project +// © 2025 Contributors to the EasyApp project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Basic/Groups/Export.qml b/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Basic/Groups/Export.qml index b8752b24..839686e4 100644 --- a/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Basic/Groups/Export.qml +++ b/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Basic/Groups/Export.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2024 EasyApp contributors +// 5SPDX-FileCopyrightText: 2025 EasyApp contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2024 Contributors to the EasyApp project +// © 2025 Contributors to the EasyApp project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Basic/Layout.qml b/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Basic/Layout.qml index faef3906..b74d7bc6 100644 --- a/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Basic/Layout.qml +++ b/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Basic/Layout.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2024 EasyApp contributors +// 5SPDX-FileCopyrightText: 2025 EasyApp contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2024 Contributors to the EasyApp project +// © 2025 Contributors to the EasyApp project import QtQuick diff --git a/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Extra/Groups/Empty.qml b/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Extra/Groups/Empty.qml index 9f478042..e4a92b86 100644 --- a/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Extra/Groups/Empty.qml +++ b/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Extra/Groups/Empty.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2024 EasyApp contributors +// 5SPDX-FileCopyrightText: 2025 EasyApp contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2024 Contributors to the EasyApp project +// © 2025 Contributors to the EasyApp project import QtQuick diff --git a/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Extra/Layout.qml b/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Extra/Layout.qml index ef2a2edc..b5e18516 100644 --- a/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Extra/Layout.qml +++ b/EasyReflectometryApp/Gui/Pages/Summary/Sidebar/Extra/Layout.qml @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2024 EasyApp contributors +// 5SPDX-FileCopyrightText: 2025 EasyApp contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2024 Contributors to the EasyApp project +// © 2025 Contributors to the EasyApp project import QtQuick import QtQuick.Controls diff --git a/EasyReflectometryApp/__version__.py b/EasyReflectometryApp/__version__.py index 1f356cc5..1a72d32e 100644 --- a/EasyReflectometryApp/__version__.py +++ b/EasyReflectometryApp/__version__.py @@ -1 +1 @@ -__version__ = '1.0.0' +__version__ = '1.1.0' diff --git a/EasyReflectometryApp/main.py b/EasyReflectometryApp/main.py index 40e68828..c4af8f72 100644 --- a/EasyReflectometryApp/main.py +++ b/EasyReflectometryApp/main.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2024 EasyReflectometryApp contributors +# 5SPDX-FileCopyrightText: 2025 EasyReflectometryApp contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2024 Contributors to the EasyReflectometryApp project +# © 2025 Contributors to the EasyReflectometryApp project import argparse import sys from pathlib import Path diff --git a/INSTALLATION.md b/INSTALLATION.md index ee7b9001..b1044273 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -2,11 +2,11 @@ To make the installation of EasyReflectometry as easy as possible, we prepare packaged releases for three major operating systems: -- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_windows-2022.exe) -- [MacOS](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_macos-13-Intel.zip) (Intel) -- [MacOS](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_macos-14-AppleSilicon.zip) (ARM) -- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_ubuntu-22.04) (built on Ubuntu-22.04) -- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_ubuntu-24.04) (built on Ubuntu-22.04) +- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_windows-2022.exe) +- [MacOS](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_macos-13-Intel.zip) (Intel) +- [MacOS](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_macos-14-AppleSilicon.zip) (ARM) +- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_ubuntu-22.04) (built on Ubuntu-22.04) +- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_ubuntu-24.04) (built on Ubuntu-22.04) If the relevant EasyReflectometry installation does not work on your system, then please try installation from source. diff --git a/LICENSE.md b/LICENSE.md index 7304d4d1..d1859c1a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2021-2023, European Spallation Source +Copyright (c) 2021-2025, European Spallation Source All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/src/conf.py b/docs/src/conf.py index 728a2b55..0732ee30 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -78,9 +78,9 @@ # the built documents. # # The short X.Y version. -version = '1.0.0' +version = '1.1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.0' +release = '1.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/src/installation.md b/docs/src/installation.md index d0328ab7..0aabeea6 100644 --- a/docs/src/installation.md +++ b/docs/src/installation.md @@ -1,11 +1,11 @@ # Installation To make the installation of EasyReflectometry as easy as possible, we prepare packaged releases for three major operating systems: -- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_windows-2022.exe) -- [MacOS (Intel)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_macos-13-Intel.zip) -- [MacOS (Silicon)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_macos-14-AppleSilicon.zip) -- [Linux (built on Ubuntu-24.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_ubuntu-22.04) -- [Linux (built on Ubuntu-22.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.0.0/EasyReflectometryApp_v1.0.0_ubuntu-24.04) +- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_windows-2022.exe) +- [MacOS (Intel)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_macos-13-Intel.zip) +- [MacOS (Silicon)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_macos-14-AppleSilicon.zip) +- [Linux (built on Ubuntu-24.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_ubuntu-22.04) +- [Linux (built on Ubuntu-22.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_ubuntu-24.04) If the relevant EasyReflectometry installation does not work on your system, then please try installation from source. diff --git a/docs/src/tutorial.md b/docs/src/tutorial.md index 7e2f6c06..850b66f6 100644 --- a/docs/src/tutorial.md +++ b/docs/src/tutorial.md @@ -1,6 +1,6 @@ # Getting started This is the tutorial for EasyReflectometryApp and how to use it. -Version: 1.0.0 +Version: 1.1.0 ## Home page When opening up the EasyRecletometryApp you are presented with the **Home** page. diff --git a/pyproject.toml b/pyproject.toml index 20870075..424a5a8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,18 +4,20 @@ build-backend = 'hatchling.build' [project] name = 'EasyReflectometryApp' -version = '1.0.0' -release_data = '27 November 2024' +version = '1.1.0' +release_data = '01 May 2025' description = "Making reflectometry data analysis and modelling easy." authors = [ - {name = "Andrew R. McCluskey", email = "andrew.mccluskey@ess.eu"}, - {name = "Andrew Sazonov"}, + {name = "Andrew R. McCluskey"}, + {name = "Andrew Sazonov", email = "andrew.sazonov@ess.eu"}, {name = "Simon Ward"}, - {name = "Andreas Pedersen", email = "andreas.pedersen@ess.eu"} + {name = "Andreas Pedersen"}, + {name = "Piotr Rozyczko", email = "piotr.rozyczko@ess.eu"}, ] maintainers = [ - {name = "Andrew R. McCluskey", email = "andrew.mccluskey@ess.eu"}, - {name = "Andreas Pedersen", email = "andreas.pedersen@ess.eu"} + {name = "Andrew R. McCluskey"}, + {name = "Andreas Pedersen"}, + {name = "Piotr Rozyczko", email = "piotr.rozyczko@ess.eu"}, ] license = {file = 'LICENSE.md'} classifiers = [ diff --git a/src_qt5/LICENSE.md b/src_qt5/LICENSE.md index 7304d4d1..d1859c1a 100644 --- a/src_qt5/LICENSE.md +++ b/src_qt5/LICENSE.md @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2021-2023, European Spallation Source +Copyright (c) 2021-2025, European Spallation Source All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/tools/Scripts/CheckAppExists.py b/tools/Scripts/CheckAppExists.py index d7bfe514..4a0bff01 100644 --- a/tools/Scripts/CheckAppExists.py +++ b/tools/Scripts/CheckAppExists.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project __author__ = 'github.com/AndrewSazonov' __version__ = '0.0.1' diff --git a/tools/Scripts/Config.py b/tools/Scripts/Config.py index 5c59a9a9..6fdce1de 100644 --- a/tools/Scripts/Config.py +++ b/tools/Scripts/Config.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project __author__ = 'github.com/AndrewSazonov' __version__ = '0.0.1' diff --git a/tools/Scripts/FreezeApp.py b/tools/Scripts/FreezeApp.py index 705d4122..5ee717ab 100755 --- a/tools/Scripts/FreezeApp.py +++ b/tools/Scripts/FreezeApp.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project import glob import os diff --git a/tools/Scripts/Functions.py b/tools/Scripts/Functions.py index 7b83f51a..cc0bc216 100755 --- a/tools/Scripts/Functions.py +++ b/tools/Scripts/Functions.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project __author__ = 'github.com/AndrewSazonov' __version__ = '0.0.1' diff --git a/tools/Scripts/InstallApp.py b/tools/Scripts/InstallApp.py index 63cfc86d..bea824e7 100644 --- a/tools/Scripts/InstallApp.py +++ b/tools/Scripts/InstallApp.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project __author__ = 'github.com/AndrewSazonov' __version__ = '0.0.1' diff --git a/tools/Scripts/InstallerControlScript.js b/tools/Scripts/InstallerControlScript.js index 6d992bd8..ad9317f5 100644 --- a/tools/Scripts/InstallerControlScript.js +++ b/tools/Scripts/InstallerControlScript.js @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2021-2022 Contributors to the EasyReflectometry project +// © 2021-2025 Contributors to the EasyReflectometry project function Controller() { } diff --git a/tools/Scripts/InstallerInstallScript.js b/tools/Scripts/InstallerInstallScript.js index 4d36d50f..10f1ce63 100644 --- a/tools/Scripts/InstallerInstallScript.js +++ b/tools/Scripts/InstallerInstallScript.js @@ -1,6 +1,6 @@ -// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +// SPDX-FileCopyrightText: 2025 EasyReflectometry contributors // SPDX-License-Identifier: BSD-3-Clause -// © 2021-2022 Contributors to the EasyReflectometry project +// © 2021-2025 Contributors to the EasyReflectometry project function Component() { //console.log("* isInstaller:", installer.isInstaller()) diff --git a/tools/Scripts/MakeInstaller.py b/tools/Scripts/MakeInstaller.py index afd564aa..8980f09d 100644 --- a/tools/Scripts/MakeInstaller.py +++ b/tools/Scripts/MakeInstaller.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project import os import sys diff --git a/tools/Scripts/RunApp.py b/tools/Scripts/RunApp.py index 77f4908c..a033034d 100644 --- a/tools/Scripts/RunApp.py +++ b/tools/Scripts/RunApp.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project __author__ = 'github.com/AndrewSazonov' __version__ = '0.0.1' diff --git a/tools/Scripts/UnzipAppInstaller.py b/tools/Scripts/UnzipAppInstaller.py index d6775cb7..af2a013b 100644 --- a/tools/Scripts/UnzipAppInstaller.py +++ b/tools/Scripts/UnzipAppInstaller.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project __author__ = 'github.com/AndrewSazonov' __version__ = '0.0.1' diff --git a/tools/Scripts/UploadToFtp.py b/tools/Scripts/UploadToFtp.py index 07924be2..49109ccd 100755 --- a/tools/Scripts/UploadToFtp.py +++ b/tools/Scripts/UploadToFtp.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project __author__ = 'github.com/AndrewSazonov' __version__ = '0.0.1' diff --git a/tools/Scripts/ZipAppInstaller.py b/tools/Scripts/ZipAppInstaller.py index 1f977cc2..ff0f7154 100644 --- a/tools/Scripts/ZipAppInstaller.py +++ b/tools/Scripts/ZipAppInstaller.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project __author__ = 'github.com/AndrewSazonov' __version__ = '0.0.1' diff --git a/utils.py b/utils.py index d0144c4d..e3cc2a05 100755 --- a/utils.py +++ b/utils.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2023 EasyReflectometry contributors +# SPDX-FileCopyrightText: 2025 EasyReflectometry contributors # SPDX-License-Identifier: BSD-3-Clause -# © 2021-2023 Contributors to the EasyReflectometry project +# © 2021-2025 Contributors to the EasyReflectometry project import argparse import datetime