Skip to content
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

Jump to bottom

Dark daily chart #152

Merged
merged 21 commits into from
Aug 5, 2024
Merged

Dark daily chart #152

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
596c22b
Updated daily chart to use the theme selector
Emmo213 Jul 3, 2024
1d80966
Added sleep after changing theme so the chart can update
Emmo213 Jul 3, 2024
be1054e
Added code for pink theme, made it easier to add more themes in the f…
Emmo213 Jul 3, 2024
0e574b4
Added blue chart for future blue theme
Emmo213 Jul 3, 2024
e18a260
Set chart background to none so it's transparent
Emmo213 Jul 3, 2024
f363bbd
Added back background for dark mode.
Emmo213 Jul 3, 2024
66fc3b7
Change daily chart based on file based settings. Only support light/d…
Emmo213 Jul 23, 2024
810e293
Cleanup
Emmo213 Jul 23, 2024
6b8ca14
Merge branch 'Nachtzuster:main' into dark_daily_chart_file_based
Emmo213 Jul 23, 2024
2bf1c4c
Added borders around the bars on the bar chart
Emmo213 Jul 26, 2024
bdfe356
Merge branch 'dark_daily_chart_file_based' of https://github.com/Emmo…
Emmo213 Jul 26, 2024
b0c1aa1
Updated background color for dark theme
Emmo213 Jul 30, 2024
df58b51
Merge branch 'Nachtzuster:main' into dark_daily_chart_file_based
Emmo213 Jul 30, 2024
08a7568
Merge from main
Emmo213 Jul 30, 2024
254734f
Fixed some spacing
Emmo213 Jul 30, 2024
1d09798
Updating Python version for linting
Emmo213 Jul 30, 2024
76bf800
Cleanup
Emmo213 Jul 30, 2024
1f3e00c
Merge branch 'Nachtzuster:main' into dark_daily_chart_file_based
Emmo213 Aug 3, 2024
b59c646
Back leveled to Python 3.9
Emmo213 Aug 3, 2024
a7a6a72
Update scripts/daily_plot.py
Emmo213 Aug 5, 2024
577215a
Coding suggestions
Emmo213 Aug 5, 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/python-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v3
with:
python-version: '3.9.x'
python-version: '3.11.x'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link

@alexbelgium alexbelgium Aug 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

@Emmo213 Emmo213 Aug 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

cache: 'pip'
architecture: 'x64'

Expand Down
6 changes: 5 additions & 1 deletion scripts/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ function() {
}
}


$contents = file_get_contents("/etc/birdnet/birdnet.conf");
$contents = preg_replace("/SITE_NAME=.*/", "SITE_NAME=\"$site_name\"", $contents);
$contents = preg_replace("/LATITUDE=.*/", "LATITUDE=$latitude", $contents);
Expand Down Expand Up @@ -176,6 +175,10 @@ function() {
function() {
window.parent.document.location.reload();
}, 1000);</script>";

shell_exec("sudo systemctl restart chart_viewer.service");
// the sleep allows for the service to restart and image to be generated
sleep(5);
}

$fh = fopen("/etc/birdnet/birdnet.conf", "w");
Expand Down Expand Up @@ -649,6 +652,7 @@ function runProcess() {

<table class="settingstable"><tr><td>
<h2>Color scheme </h2>
Note: when changing themes the daily chart may need a page refresh before updating.<br><br>
<label for="color_scheme">Color scheme for the site : </label>
<select name="color_scheme" class="testbtn">
<?php
Expand Down
33 changes: 27 additions & 6 deletions scripts/daily_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ def get_data(now=None):

# Function to show value on bars - from https://stackoverflow.com/questions/43214978/seaborn-barplot-displaying-values
def show_values_on_bars(ax, label):
conf = get_settings()

for i, p in enumerate(ax.patches):
x = p.get_x() + p.get_width() * 0.9
y = p.get_y() + p.get_height() / 2
Expand All @@ -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']:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

case "dark":
ax.text(x, y, value, bbox=bbox, ha='center', va='center', size=9, color='black')
case _:
ax.text(x, y, value, bbox=bbox, ha='center', va='center', size=9, color='darkgreen')


def wrap_width(txt):
Expand All @@ -70,9 +76,15 @@ def create_plot(df_plt_today, now, is_top=None):

df_plt_selection_today = df_plt_today[df_plt_today.Com_Name.isin(plt_selection_today.index)]

conf = get_settings()

# Set up plot axes and titles
height = max(readings / 3, 0) + 1.06
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')
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

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

# generate y-axis order for all figures based on frequency
freq_order = df_plt_selection_today['Com_Name'].value_counts().index
Expand All @@ -86,8 +98,13 @@ def create_plot(df_plt_today, now, is_top=None):
norm = plt.Normalize(confmax.values.min(), confmax.values.max())
if is_top or is_top is None:
# Set Palette for graphics
pal = "Greens"
colors = plt.cm.Greens(norm(confmax)).tolist()
match conf['COLOR_SCHEME']:
case "dark":
pal = "Greys"
colors = plt.cm.Greys(norm(confmax)).tolist()
case _:
pal = "Greens"
colors = plt.cm.Greens(norm(confmax)).tolist()
if is_top:
plot_type = "Top"
else:
Expand All @@ -102,7 +119,7 @@ def create_plot(df_plt_today, now, is_top=None):

# Generate frequency plot
plot = sns.countplot(y='Com_Name', hue='Com_Name', legend=False, data=df_plt_selection_today,
palette=colors, order=freq_order, ax=axs[0])
palette=colors, order=freq_order, ax=axs[0], edgecolor='lightgrey')
Nachtzuster marked this conversation as resolved.
Show resolved Hide resolved

# Prints Max Confidence on bars
show_values_on_bars(axs[0], confmax)
Expand Down Expand Up @@ -136,7 +153,11 @@ def create_plot(df_plt_today, now, is_top=None):
# Set color and weight of tick label for current hour
for label in plot.get_xticklabels():
if int(label.get_text()) == now.hour:
label.set_color('yellow')
match conf['COLOR_SCHEME']:
case "dark":
label.set_color('white')
case _:
label.set_color('yellow')

plot.set_xticklabels(plot.get_xticklabels(), rotation=0, size=8)

Expand Down
1 change: 1 addition & 0 deletions scripts/update_birdnet_snippets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ fi
if [ -L /usr/local/bin/analyze.py ];then
rm -f /usr/local/bin/analyze.py
fi

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't do changes in unrelated files

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

image

if [ -L /usr/local/bin/birdnet_analysis.sh ];then
rm -f /usr/local/bin/birdnet_analysis.sh
fi
Expand Down
Loading