Dark daily chart #152

Emmo213 · 2024-07-23T15:50:18Z

Updated the daily chart to support only the light/dark themes based on the settings file.

…uture

…ark mode.

alexbelgium · 2024-07-25T08:18:31Z

Works nicely! It looks slightly dull though... What do you think of making the species colors shades of red instead of shades of gray? As this might then recall the colors of the logos ?

Emmo213 · 2024-07-25T13:21:26Z

Personally a "dark" theme to me is mostly black, white, and grey, so I don't think having reds and pinks would fit.

…213/BirdNET-Pi into dark_daily_chart_file_based

Nachtzuster · 2024-07-28T13:37:21Z

@alexbelgium , @Hiemstra87 does this match the rest of the dark 'colour' scheme, or are there some tweaks needed?

alexbelgium · 2024-07-30T11:26:49Z

what do you think of a slightly darker background to make it less luminous ?

Emmo213 · 2024-07-30T12:11:50Z

Sure, how does this look?

Current:

Proposed:

alexbelgium · 2024-07-30T12:17:36Z

I very much like the proposed one - I think it highlights in a nice fashion the birds graphs. It is easier in my opinion to read it
It is also a color that seems very aligned with the rest of the theme

Thanks for checking that !

Emmo213 · 2024-07-30T12:28:34Z

Changes pushed. I actually used the "darkgrey" color that you suggested. With the darker background I was also able to make the current hour a different color again.

alexbelgium · 2024-07-30T12:37:03Z

@alexbelgium , @Hiemstra87 does this match the rest of the dark 'colour' scheme, or are there some tweaks needed?

Ready to merge for me! Thanks @Emmo213

Emmo213 · 2024-07-30T12:41:18Z

Not sure what the linter is unhappy about. Let me install it locally to verify.

Nachtzuster

Finally got some time to look into this, thanks for your patience!

Nachtzuster · 2024-08-03T08:29:47Z

.github/workflows/python-ci.yml

@@ -17,7 +17,7 @@ jobs:
      - name: Setup Python
        uses: actions/setup-python@v3
        with:
-          python-version: '3.9.x'
+          python-version: '3.11.x'


This needs to stay on 3.9: people that migrated their installation in place from the original BirdNET-Pi are still on 3.9.

3.9 is about 4 years old. When can we move to a more up to date version? Should updating Python and/or other dependencies be part of the update script.

What Nachtzuster means (I think) is that birdnet pi has an incremental auto update feature. So if we change the dependency to a newer version of python incremental update won't work and it will break functionality for older users - to avoid needing to change the update logic he therefore prefers to avoid breaking changes such as this one

I just think at some point we're going to want to have an update, if not for better Python features than to avoid any potential security issues. It doesn't need to be bleeding edge but generally speaking staying back leveled isn't ideal.

Edit: while my points are still valid I'll back level my code for the sake of back leveling my code.

Nachtzuster · 2024-08-03T08:32:48Z

scripts/daily_plot.py

@@ -43,7 +45,11 @@ def show_values_on_bars(ax, label):
        # Species Count Total
        value = '{:n}'.format(p.get_width())
        bbox = {'facecolor': 'lightgrey', 'edgecolor': 'none', 'pad': 1.0}
-        ax.text(x, y, value, bbox=bbox, ha='center', va='center', size=9, color='darkgreen')
+        match conf['COLOR_SCHEME']:


Match was only introduced with Python 3.10; this was giving the syntax error earlier. Could you change to a if/else?

Correct, which is why I moved the version to 3.11.

If we're not updating the Python version I can change this to an if/else - it's just a less elegant solution.

Nachtzuster · 2024-08-03T08:35:00Z

scripts/update_birdnet_snippets.sh

@@ -180,6 +180,7 @@ fi
 if [ -L /usr/local/bin/analyze.py ];then
  rm -f /usr/local/bin/analyze.py
 fi
+


Please don't do changes in unrelated files

When there is general code cleanup do you want that in a separate PR? In this case it's adding a blank line between two functions that didn't have the blank line and should have.

Nachtzuster · 2024-08-03T08:38:02Z

scripts/daily_plot.py

-    f, axs = plt.subplots(1, 2, figsize=(10, height), gridspec_kw=dict(width_ratios=[3, 6]), facecolor='#77C487')
+    match conf['COLOR_SCHEME']:
+        case "dark":
+            f, axs = plt.subplots(1, 2, figsize=(10, height), gridspec_kw=dict(width_ratios=[3, 6]), facecolor='darkgrey')


Could you move f, axs = ... out the case and only assign facecolor?

scripts/daily_plot.py

Emmo213 · 2024-08-03T16:09:51Z

Back leveled to Python 3.9.

scripts/daily_plot.py

Nachtzuster · 2024-08-05T18:19:41Z

scripts/daily_plot.py

+    if conf['COLOR_SCHEME'] == "dark":
+        f, axs = plt.subplots(1, 2, figsize=(10, height), gridspec_kw=dict(width_ratios=[3, 6]), facecolor='darkgrey')
+    else:
+        f, axs = plt.subplots(1, 2, figsize=(10, height), gridspec_kw=dict(width_ratios=[3, 6]), facecolor='none')


Suggested change

if conf['COLOR_SCHEME'] == "dark":

f, axs = plt.subplots(1, 2, figsize=(10, height), gridspec_kw=dict(width_ratios=[3, 6]), facecolor='darkgrey')

else:

f, axs = plt.subplots(1, 2, figsize=(10, height), gridspec_kw=dict(width_ratios=[3, 6]), facecolor='none')

if conf['COLOR_SCHEME'] == "dark":

facecolor='darkgrey'

else:

facecolor='none'

f, axs = plt.subplots(1, 2, figsize=(10, height), gridspec_kw=dict(width_ratios=[3, 6]), facecolor='darkgrey')

Change made using variable instead of hardcoded color

Co-authored-by: Nachtzuster <[email protected]>

Emmo213 · 2024-08-05T19:43:35Z

Sweetness. Thank you!

Emmo213 and others added 9 commits July 2, 2024 23:14

Updated daily chart to use the theme selector

596c22b

Added sleep after changing theme so the chart can update

1d80966

Added code for pink theme, made it easier to add more themes in the f…

be1054e

…uture

Added blue chart for future blue theme

0e574b4

Set chart background to none so it's transparent

e18a260

Added back background for dark mode.

f363bbd

Change daily chart based on file based settings. Only support light/d…

66fc3b7

…ark mode.

Cleanup

810e293

Merge branch 'Nachtzuster:main' into dark_daily_chart_file_based

6b8ca14

Emmo213 added 2 commits July 26, 2024 09:10

Added borders around the bars on the bar chart

2bf1c4c

Merge branch 'dark_daily_chart_file_based' of https://github.com/Emmo…

bdfe356

…213/BirdNET-Pi into dark_daily_chart_file_based

Updated background color for dark theme

b0c1aa1

Emmo213 and others added 2 commits July 30, 2024 08:31

Merge branch 'Nachtzuster:main' into dark_daily_chart_file_based

df58b51

Merge from main

08a7568

Emmo213 added 3 commits July 30, 2024 10:40

Fixed some spacing

254734f

Updating Python version for linting

1d09798

Cleanup

76bf800

Nachtzuster requested changes Aug 3, 2024

View reviewed changes

Emmo213 and others added 2 commits August 3, 2024 11:56

Merge branch 'Nachtzuster:main' into dark_daily_chart_file_based

1f3e00c

Back leveled to Python 3.9

b59c646

Emmo213 requested a review from Nachtzuster August 3, 2024 16:09

Nachtzuster reviewed Aug 5, 2024

View reviewed changes

scripts/daily_plot.py Outdated Show resolved Hide resolved

Nachtzuster reviewed Aug 5, 2024

View reviewed changes

Emmo213 and others added 2 commits August 5, 2024 14:20

Update scripts/daily_plot.py

a7a6a72

Co-authored-by: Nachtzuster <[email protected]>

Coding suggestions

577215a

Emmo213 requested a review from Nachtzuster August 5, 2024 18:31

Nachtzuster merged commit 73d2ba5 into Nachtzuster:main Aug 5, 2024
1 check passed

Emmo213 deleted the dark_daily_chart_file_based branch August 5, 2024 19:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dark daily chart #152

Dark daily chart #152

Emmo213 commented Jul 23, 2024

alexbelgium commented Jul 25, 2024

Emmo213 commented Jul 25, 2024

Nachtzuster commented Jul 28, 2024

alexbelgium commented Jul 30, 2024 •

edited

Loading

Emmo213 commented Jul 30, 2024

alexbelgium commented Jul 30, 2024

Emmo213 commented Jul 30, 2024 •

edited

Loading

alexbelgium commented Jul 30, 2024

Emmo213 commented Jul 30, 2024

Nachtzuster left a comment

Nachtzuster Aug 3, 2024

Emmo213 Aug 3, 2024

alexbelgium Aug 3, 2024 •

edited

Loading

Emmo213 Aug 3, 2024 •

edited

Loading

Nachtzuster Aug 3, 2024

Emmo213 Aug 3, 2024

Nachtzuster Aug 3, 2024

Emmo213 Aug 3, 2024

Nachtzuster Aug 3, 2024

Emmo213 Aug 5, 2024

Emmo213 commented Aug 3, 2024

Nachtzuster Aug 5, 2024

Emmo213 Aug 5, 2024

Emmo213 commented Aug 5, 2024

Dark daily chart #152

Dark daily chart #152

Conversation

Emmo213 commented Jul 23, 2024

alexbelgium commented Jul 25, 2024

Emmo213 commented Jul 25, 2024

Nachtzuster commented Jul 28, 2024

alexbelgium commented Jul 30, 2024 • edited Loading

Emmo213 commented Jul 30, 2024

alexbelgium commented Jul 30, 2024

Emmo213 commented Jul 30, 2024 • edited Loading

alexbelgium commented Jul 30, 2024

Emmo213 commented Jul 30, 2024

Nachtzuster left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexbelgium Aug 3, 2024 • edited Loading

Choose a reason for hiding this comment

Emmo213 Aug 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Emmo213 commented Aug 3, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Emmo213 commented Aug 5, 2024

alexbelgium commented Jul 30, 2024 •

edited

Loading

Emmo213 commented Jul 30, 2024 •

edited

Loading

alexbelgium Aug 3, 2024 •

edited

Loading

Emmo213 Aug 3, 2024 •

edited

Loading