Skip to content

Commit 28bd546

Browse files
authored
v1.1.1 release (#245)
* copyright date update * Fixes for crashes in the app (#243) * fixed adding a new Material * fixed setting Model Index * Macos installer fix (#244) * Version number update (#246)
1 parent 4aed414 commit 28bd546

9 files changed

Lines changed: 21 additions & 19 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Version 1.1.0 (1 May 2025)
1+
# Version 1.1.1 (28 May 2025)
2+
3+
Fixed Apple Silicon installer.
4+
Fixed experimental data file parser.
25

3-
New, updated documentation.
4-
Updated numpy and Qt6 versions.

EasyReflectometryApp/Backends/Mock/Home.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ QtObject {
77
property bool created: false
88

99
readonly property var version: {
10-
'number': '1.1.0',
11-
'date': '1 May 2025',
10+
'number': '1.1.1',
11+
'date': '28 May 2025',
1212
}
1313

1414
readonly property var urls: {

EasyReflectometryApp/Backends/Py/logic/layers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from easyreflectometry import Project as ProjectLib
44
from easyreflectometry.sample import LayerAreaPerMolecule
55
from easyreflectometry.sample import LayerCollection
6+
from easyreflectometry.sample import Material
67

78

89
class Layers:
@@ -42,7 +43,7 @@ def remove_at_index(self, value: str) -> None:
4243

4344
def add_new(self) -> None:
4445
if 'Si' not in [material.name for material in self._project_lib._materials]:
45-
self._project_lib._materials.add_material('Si', 2.07, 0.0)
46+
self._project_lib._materials.add_material(Material(name='Si', sld=2.07, isld=0.0))
4647
index_si = [material.name for material in self._project_lib._materials].index('Si')
4748
self._layers.add_layer()
4849
self._layers[-1].material = self._project_lib._materials[index_si]

EasyReflectometryApp/Backends/Py/sample.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ def setCurrentModelIndex(self, new_value: int) -> None:
145145
self._project_lib.current_model_index = new_value
146146
self.modelsIndexChanged.emit()
147147
self.assembliesTableChanged.emit()
148-
self._clearCacheAndEmitLayersChanged()
149148
self.externalRefreshPlot.emit()
150149

151150
@Slot(str)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.1.0'
1+
__version__ = '1.1.1'

docs/src/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@
7878
# the built documents.
7979
#
8080
# The short X.Y version.
81-
version = '1.1.0'
81+
version = '1.1.1'
8282
# The full version, including alpha/beta/rc tags.
83-
release = '1.1.0'
83+
release = '1.1.1'
8484

8585
# The language for content autogenerated by Sphinx. Refer to documentation
8686
# for a list of supported languages.

docs/src/installation.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Installation
22

33
To make the installation of EasyReflectometry as easy as possible, we prepare packaged releases for three major operating systems:
4-
- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_windows-2022.exe)
5-
- [MacOS (Intel)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_macos-13-Intel.zip)
6-
- [MacOS (Silicon)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_macos-14-AppleSilicon.zip)
7-
- [Linux (built on Ubuntu-24.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_ubuntu-22.04)
8-
- [Linux (built on Ubuntu-22.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.0/EasyReflectometryApp_v1.1.0_ubuntu-24.04)
4+
- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_windows-2022.exe)
5+
- [MacOS (Intel)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_macos-13-Intel.zip)
6+
- [MacOS (Silicon)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_macos-14-AppleSilicon.zip)
7+
- [Linux (built on Ubuntu-24.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_ubuntu-22.04)
8+
- [Linux (built on Ubuntu-22.04)](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_ubuntu-24.04)
99

1010
If the relevant EasyReflectometry installation does not work on your system, then please try installation from source.
1111

docs/src/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Getting started
22
This is the tutorial for EasyReflectometryApp and how to use it.
3-
Version: 1.1.0
3+
Version: 1.1.1
44

55
## Home page
66
When opening up the EasyRecletometryApp you are presented with the **Home** page.

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ build-backend = 'hatchling.build'
44

55
[project]
66
name = 'EasyReflectometryApp'
7-
version = '1.1.0'
8-
release_data = '01 May 2025'
7+
version = '1.1.1'
8+
release_data = '28 May 2025'
99
description = "Making reflectometry data analysis and modelling easy."
1010
authors = [
1111
{name = "Andrew R. McCluskey"},
@@ -41,7 +41,8 @@ dependencies = [
4141
ci = [
4242
'pyinstaller',
4343
'licensename',
44-
'dephell_licenses'
44+
'dephell_licenses',
45+
'charset-normalizer<3.2',
4546
]
4647

4748
docs = [

0 commit comments

Comments
 (0)