fix conflitti parte 2 (lasciamo cucinare andre)

This commit is contained in:
2025-06-23 12:13:59 +02:00
parent e410ab053b
commit d9aff0b4b9

View File

@@ -83,7 +83,6 @@ path_export_hourly = path_export.replace('.csv', '_hourly.csv')
# Esporta il file orario # Esporta il file orario
df_hourly = export_hourly_pv_productivity(result_ac_energies_to_csv_df, path_export_hourly) df_hourly = export_hourly_pv_productivity(result_ac_energies_to_csv_df, path_export_hourly)
<<<<<<< HEAD
import pandas as pd import pandas as pd
import plotly.express as px import plotly.express as px
@@ -174,11 +173,6 @@ fig.update_layout(
) )
fig.show() fig.show()
=======
# GENERAZIONE GRAFICI
generate_grafico_torri_df(result_ac_energies_to_csv_df, 'Produttività Fotovoltaica nel Tempo')
generate_grafico_torri_df(df_hourly, 'Produttività Fotovoltaica a Base Oraria')
>>>>>>> 0d40d3730f0ffa115039b3330b8c5cd8e4a090f8
if joePlaying: if joePlaying:
joe.terminate() joe.terminate()