diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6d9b9f..3ed9bc3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ -# Version 1.1.0 (1 May 2025) +# Version 1.1.1 (28 May 2025) + +Fixed Apple Silicon installer. +Fixed experimental data file parser. -New, updated documentation. -Updated numpy and Qt6 versions. diff --git a/EasyReflectometryApp/Backends/Mock/Home.qml b/EasyReflectometryApp/Backends/Mock/Home.qml index 7af2fae8..963a0038 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.1.0', - 'date': '1 May 2025', + 'number': '1.1.1', + 'date': '28 May 2025', } readonly property var urls: { diff --git a/EasyReflectometryApp/Backends/Py/logic/layers.py b/EasyReflectometryApp/Backends/Py/logic/layers.py index 2168e4a5..4b37bfc0 100644 --- a/EasyReflectometryApp/Backends/Py/logic/layers.py +++ b/EasyReflectometryApp/Backends/Py/logic/layers.py @@ -3,6 +3,7 @@ from easyreflectometry import Project as ProjectLib from easyreflectometry.sample import LayerAreaPerMolecule from easyreflectometry.sample import LayerCollection +from easyreflectometry.sample import Material class Layers: @@ -42,7 +43,7 @@ def remove_at_index(self, value: str) -> None: def add_new(self) -> None: if 'Si' not in [material.name for material in self._project_lib._materials]: - self._project_lib._materials.add_material('Si', 2.07, 0.0) + self._project_lib._materials.add_material(Material(name='Si', sld=2.07, isld=0.0)) index_si = [material.name for material in self._project_lib._materials].index('Si') self._layers.add_layer() self._layers[-1].material = self._project_lib._materials[index_si] diff --git a/EasyReflectometryApp/Backends/Py/sample.py b/EasyReflectometryApp/Backends/Py/sample.py index 96e6c7a6..1bb3dd2b 100644 --- a/EasyReflectometryApp/Backends/Py/sample.py +++ b/EasyReflectometryApp/Backends/Py/sample.py @@ -145,7 +145,6 @@ def setCurrentModelIndex(self, new_value: int) -> None: self._project_lib.current_model_index = new_value self.modelsIndexChanged.emit() self.assembliesTableChanged.emit() - self._clearCacheAndEmitLayersChanged() self.externalRefreshPlot.emit() @Slot(str) diff --git a/EasyReflectometryApp/__version__.py b/EasyReflectometryApp/__version__.py index 1a72d32e..b3ddbc41 100644 --- a/EasyReflectometryApp/__version__.py +++ b/EasyReflectometryApp/__version__.py @@ -1 +1 @@ -__version__ = '1.1.0' +__version__ = '1.1.1' diff --git a/docs/src/conf.py b/docs/src/conf.py index 0732ee30..da36a2c7 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.1.0' +version = '1.1.1' # The full version, including alpha/beta/rc tags. -release = '1.1.0' +release = '1.1.1' # 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 0aabeea6..d0852aa6 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.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) +- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_windows-2022.exe) +- [MacOS (Intel)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_macos-13-Intel.zip) +- [MacOS (Silicon)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_macos-14-AppleSilicon.zip) +- [Linux (built on Ubuntu-24.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_ubuntu-22.04) +- [Linux (built on Ubuntu-22.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_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 850b66f6..0f942251 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.1.0 +Version: 1.1.1 ## Home page When opening up the EasyRecletometryApp you are presented with the **Home** page. diff --git a/pyproject.toml b/pyproject.toml index 424a5a8e..6be66552 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,8 +4,8 @@ build-backend = 'hatchling.build' [project] name = 'EasyReflectometryApp' -version = '1.1.0' -release_data = '01 May 2025' +version = '1.1.1' +release_data = '28 May 2025' description = "Making reflectometry data analysis and modelling easy." authors = [ {name = "Andrew R. McCluskey"}, @@ -41,7 +41,8 @@ dependencies = [ ci = [ 'pyinstaller', 'licensename', - 'dephell_licenses' + 'dephell_licenses', + 'charset-normalizer<3.2', ] docs = [