Skip to content

Commit

Permalink
Merge pull request #23 from OpenVoiceOS/release-0.2.4a1
Browse files Browse the repository at this point in the history
Release 0.2.4a1
  • Loading branch information
JarbasAl authored Nov 16, 2024
2 parents f64f700 + 9428f37 commit 320db85
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Changelog

## [0.2.3a1](https://github.com/OpenVoiceOS/ovos-skill-iss-location/tree/0.2.3a1) (2024-11-16)
## [0.2.4a1](https://github.com/OpenVoiceOS/ovos-skill-iss-location/tree/0.2.4a1) (2024-11-16)

[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-iss-location/compare/V0.2.2...0.2.3a1)
[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-iss-location/compare/V0.2.3...0.2.4a1)

**Merged pull requests:**

- fix: only register resting\_screen if GUI [\#20](https://github.com/OpenVoiceOS/ovos-skill-iss-location/pull/20) ([JarbasAl](https://github.com/JarbasAl))
- fix: gui images [\#22](https://github.com/OpenVoiceOS/ovos-skill-iss-location/pull/22) ([JarbasAl](https://github.com/JarbasAl))

## [V0.2.2](https://github.com/OpenVoiceOS/ovos-skill-iss-location/tree/V0.2.2) (2024-11-15)
## [V0.2.3](https://github.com/OpenVoiceOS/ovos-skill-iss-location/tree/V0.2.3) (2024-11-16)

[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-iss-location/compare/0.2.2...V0.2.2)
[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-iss-location/compare/0.2.3...V0.2.3)



Expand Down
8 changes: 2 additions & 6 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ def __init__(self, *args, **kwargs):
self.settings["center_location"] = False
if "iss_size" not in self.settings:
self.settings["iss_size"] = 0.5
if "iss_icon" not in self.settings:
self.settings["iss_icon"] = f"{self.root_dir}/ui/iss3.png"
if "iss_bg" not in self.settings:
self.settings["iss_bg"] = f"{self.root_dir}/ui/iss.png"
if "dpi" not in self.settings:
self.settings["dpi"] = 500

Expand Down Expand Up @@ -133,7 +129,7 @@ def generate_map(self, lat, lon):
m.bluemarble()
x, y = m(lon, lat)

iss = plt.imread(self.settings["iss_icon"])
iss = plt.imread(self.settings.get("iss_icon", f"{self.root_dir}/gui/all/iss3.png"))
im = OffsetImage(iss, zoom=self.settings["iss_size"])
ab = AnnotationBbox(im, (x, y), xycoords='data', frameon=False)

Expand All @@ -150,7 +146,7 @@ def generate_map(self, lat, lon):
@intent_handler("about.intent")
def handle_about_iss_intent(self, message):
utterance = self.dialog_renderer.render("about", {})
self.gui.show_image(self.settings["iss_bg"],
self.gui.show_image(self.settings.get("iss_bg", "iss.png"),
override_idle=True,
fill='PreserveAspectFit',
caption=utterance)
Expand Down
4 changes: 2 additions & 2 deletions version.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# START_VERSION_BLOCK
VERSION_MAJOR = 0
VERSION_MINOR = 2
VERSION_BUILD = 3
VERSION_ALPHA = 0
VERSION_BUILD = 4
VERSION_ALPHA = 1
# END_VERSION_BLOCK

0 comments on commit 320db85

Please sign in to comment.