Skip to content

diffraction to reflectometry #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andped10 merged 2 commits into from
Nov 27, 2024
Merged

diffraction to reflectometry #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8801c4b
diffraction to reflectometry
andped10 Nov 27, 2024
5e78e6d
minor corrections
andped10 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/installer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Install Python dependences
run: |
python -m pip install flit
flit install --only-deps # Install the dependencies, but not the EasyDiffractionApp package itself
flit install --only-deps # Install the dependencies, but not the EasyReflectometryApp package itself

- name: Add extra info to pyproject.toml
run: python utils.py --update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapcraft.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
echo "DISPLAY=:0" >> $GITHUB_ENV
- name: Run snap
run: |
snap run easydiffraction &
snap run easyreflectometry &
sleep 60

upload_snap:
Expand Down
4 changes: 2 additions & 2 deletions EasyReflectometryApp/Gui/Pages/Analysis/MainContent/AnalysisView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-FileCopyrightText: 2023 EasyDiffraction contributors <support@easydiffraction.org>
// SPDX-FileCopyrightText: 2023 EasyReflectometry contributors <support@easyreflectometry.org>
// SPDX-License-Identifier: BSD-3-Clause
// © 2023 Contributors to the EasyDiffraction project <https://github.com/easyscience/EasyDiffraction>
// © 2023 Contributors to the EasyReflectometry project <https://github.com/easyscience/EasyReflectometry>

import QtQuick
import QtQuick.Controls
Expand Down
Loading