Skip to content

Commit

Permalink
Merge pull request #62 from AresValley/develop
Browse files Browse the repository at this point in the history
Updated to 4.1.0
  • Loading branch information
AresValley authored Oct 20, 2024
2 parents ff91da3 + 2513f5d commit 7c6fc17
Show file tree
Hide file tree
Showing 28 changed files with 880 additions and 301 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
artemis_version:
description: 'Version'
required: true
default: '4.0.0'
default: '4.1.0'
type: string

jobs:
Expand All @@ -19,7 +19,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- name: Build and package
run: sh ./building/Linux/build_linux.sh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ on:
artemis_version:
description: 'Version'
required: true
default: '4.0.0'
default: '4.1.0'
type: string

jobs:
build-macos-x86_64:
runs-on: macos-11
runs-on: macos-12
steps:
- name: Check out code
uses: actions/checkout@v4

- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- name: Build and package
run: sh ./building/macOS/build_macos.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
artemis_version:
description: 'Version'
required: true
default: '4.0.0'
default: '4.1.0'
type: string

jobs:
Expand All @@ -19,7 +19,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- name: Build and package
run: ./building/Windows/build_windows.ps1
Expand Down
18 changes: 17 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@
## [Unreleased]

## [4.1.0] - 2024-10-20

### Added
- Created a setting panel for the audio player
- Selection of the audio output device. Closes [#4](https://github.com/AresValley/Artemis/issues/4)
- Added the following (advanced) products to the space weather module. Closes [#53](https://github.com/AresValley/Artemis/issues/53):
- Sun Synoptic Analysis (SAS)
- GOES Solar Ultraviolet Imager (SUVI), all wavelenght (94 Å, 131 Å, 171 Å, 195 Å, 284 Å, 304 Å)
- GOES Thematic Map (from SUVI)
- Large Angle and Spectrometric Coronagraph (LASCO), both C2/C3 range for optical imaging of the Sun’s corona
- Helioseismic and Magnetic Imager (HMI): Magnetogram, Intensitygram, Dopplergram

### Fixed
- Fixed margins for downloader window

## [4.0.5] - 2024-06-15

### Added
Expand Down Expand Up @@ -120,7 +135,8 @@ First release.


<!-- Links definitions -->
[Unreleased]: https://github.com/AresValley/Artemis/compare/v4.0.5...HEAD
[Unreleased]: https://github.com/AresValley/Artemis/compare/v4.1.0...HEAD
[4.1.0]: https://github.com/AresValley/Artemis/compare/v4.0.5...v4.1.0
[4.0.5]: https://github.com/AresValley/Artemis/compare/v4.0.3...v4.0.5
[4.0.3]: https://github.com/AresValley/Artemis/compare/v4.0.1...v4.0.3
[4.0.1]: https://github.com/AresValley/Artemis/compare/v3.2.4...v4.0.1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
![GitHub Release](https://img.shields.io/github/v/release/AresValley/Artemis-DB?label=DB%20version)
![GitHub repo file or directory count (in path)](https://img.shields.io/github/directory-file-count/aresvalley/artemis-db/static?type=dir&label=DB%20signals)

![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/aresvalley/artemis/windows.yml?logo=windows&logoColor=white)
![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/aresvalley/artemis/windows.yml?logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHNoYXBlLXJlbmRlcmluZz0iZ2VvbWV0cmljUHJlY2lzaW9uIiB0ZXh0LXJlbmRlcmluZz0iZ2VvbWV0cmljUHJlY2lzaW9uIiBpbWFnZS1yZW5kZXJpbmc9Im9wdGltaXplUXVhbGl0eSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIHZpZXdCb3g9IjAgMCA1MTIgNTEyLjAyNiI+PHBhdGggZmlsbD0iI2ZmZiIgZmlsbC1ydWxlPSJub256ZXJvIiBkPSJNMjY5LjMxMiA1MTIuMDI1SDUxMlYyNjkuMzM3SDI2OS4zMTJ2MjQyLjY4OHpNMCA1MTIuMDI1aDI0Mi42ODhWMjY5LjMzN0gwdjI0Mi42ODh6bTI2OS4zMTItMjY5LjMzN0g1MTJWMEgyNjkuMzEydjI0Mi42ODh6TTAgMjQyLjY4OGgyNDIuNjg4VjBIMHYyNDIuNjg4eiIvPjwvc3ZnPg==)
![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/aresvalley/artemis/linux.yml?logo=linux&logoColor=white)
![Static Badge](https://img.shields.io/badge/build-soon%E2%84%A2-yellow?logo=apple)
![Static Badge](https://img.shields.io/badge/build-soon%E2%84%A2-yellow?logo=raspberrypi)
Expand Down
4 changes: 3 additions & 1 deletion artemis.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<file>images/icons/player_play.svg</file>
<file>images/icons/player_stop.svg</file>
<file>images/icons/player_loop.svg</file>
<file>images/icons/player_mute.svg</file>
<file>images/icons/save.svg</file>
<file>images/icons/delete.svg</file>
<file>images/icons/add.svg</file>
Expand All @@ -22,6 +21,7 @@
<file>images/icons/browser.svg</file>
<file>images/icons/documents.svg</file>
<file>images/icons/abort.svg</file>
<file>images/icons/settings.svg</file>
<file>images/spectrum_not_available.svg</file>
<file>images/artemis_not_available.svg</file>

Expand All @@ -41,6 +41,8 @@
<file>ui/SpaceWeatherForecastPage.qml</file>
<file>ui/SpaceWeatherDRAPPage.qml</file>
<file>ui/SpaceWeatherAuroraPage.qml</file>
<file>ui/SpaceWeatherSSA.qml</file>
<file>ui/SpaceWeatherSunImagers.qml</file>

<file>ui/About.qml</file>

Expand Down
Loading

0 comments on commit 7c6fc17

Please sign in to comment.