plotair 0.1.1__py3-none-any.whl → 0.2.0__py3-none-any.whl

plotair/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.0"

plotair/config.toml

@@ -0,0 +1,66 @@
+[data]
+max_missing_samples = 4
+
+[plot]
+size = [11.0, 8.5]
+font_family = 'Noto Sans'  # Set to '' to use default system font
+font_scale = 1.4
+grid2_opacity = 0.7        # 0 is fully transparent and 1 is fully opaque
+grid1_line_style = '-'     # Options: '-', '--', ':' and '-.'
+grid2_line_style = '--'
+limit_zone_opacity = 0.075
+limit_line_opacity = 0.7
+limit_line_width = 1
+limit_line_style = '--'
+"pm2.5_line_width" = 1.5
+"pm2.5_line_style" = '-'
+"pm10_line_width" = 1.5
+"pm10_line_style" = '-.'
+date_rotation = 30
+
+# Options: 'best', 'upper right', 'upper left', 'lower left', 'lower right',
+# 'center left', 'center right', 'lower center', 'upper center', 'center'
+legend_location = 'best'
+
+[axis_ranges]
+co2 = [0, 2000]
+temp_h = [0, 80]
+tvoc = [0, 500]
+co_form = [0, 50]
+"pm2.5_10" = [0, 70]
+
+[labels]
+co2 = 'CO₂ (ppm)'
+temp = 'Température (°C)'
+humidity = 'Humidité (%)'
+tvoc = 'COVT (ppb)'
+tvoc_limit = 'Limite LEED, WELL et LBC'
+co = 'Monoxyde de carbone (ppm x 10)'
+co_limit = 'Limite anomalie légère BBI'
+form = 'Formaldéhyde (ppb)'
+form_limit = 'Limite anomalie légère BBI'
+"pm2.5" = 'PM2.5 (µg/m³)'
+"pm2.5_limit" = 'Limite concentration moyenne annuelle PM2.5 OMS'
+"pm10" = 'PM10 (µg/m³)'
+"pm10_limit" = 'Limite concentration moyenne annuelle PM10 OMS'
+
+[limits]
+humidity = [40, 60]
+tvoc = 218  # ppb
+co = 4      # ppm
+form = 16   # ppb
+"pm2.5" = 10
+"pm10" = 50
+
+[colors]
+# See Matplotlib documentation for valid colors:
+# https://matplotlib.org/stable/gallery/color/named_colors.html
+co2 = 'tab:blue'
+tvoc = 'tab:purple'
+co = 'tab:cyan'
+form = 'tab:red'
+humidity = 'tab:green'
+temp = 'tab:orange'
+"pm2.5" = 'tab:orange'
+"pm10" = 'tab:green'
+

plotair/main.py

@@ -14,12 +14,17 @@ Licensed under the MIT License. See the LICENSE file for details.
 """
 
 # Standard library imports
-from datetime import datetime
+import argparse
+import csv
+import glob
 import logging
 import os
 import re
 import shutil
 import sys
+import tomllib
+from datetime import datetime
+from pathlib import Path
 
 # Third-party library imports
 import matplotlib.pyplot as plt
@@ -27,63 +32,174 @@ import numpy as np
 import pandas as pd
 import seaborn as sns
 
-# Configuration constants
-MIN_CSV_COLUMNS = 5  # Most rows have 5 columns
-MAX_CSV_COLUMNS = 6  # Some rows have 6 columns
-MAX_MISSING_SAMPLES = 4
-PLOT_FONT_SCALE = 1.4
-PLOT_WIDTH = 11
-PLOT_HEIGHT = 8.5
-CO2_LABEL = 'CO₂ (ppm)'
-HUMIDITY_LABEL = 'Humidité (%)'
-TEMP_LABEL = 'Température (°C)'
-Y1_AXIS_LABEL = 'CO₂ (ppm)'
-Y2_AXIS_LABEL_1 = 'Température (°C)' + '  '  # Spaces separate from humidity
-Y2_AXIS_LABEL_2 = '  ' + 'Humidité (%)'      # Spaces separate from temperature
-X_AXIS_ROTATION = 30
-HUMIDITY_ZONE_MIN = 40
-HUMIDITY_ZONE_MAX = 60
-HUMIDITY_ZONE_ALPHA = 0.075
-
-# 8000/4000/2000/1600 span for y1 axis work well with 80 span for y2 axis
-# 6000/3000/    /1200 span for y1 axis work well with 60 span for y2 axis
-Y1_AXIS_MIN_VALUE = 0
-Y1_AXIS_MAX_VALUE = 1200
-Y2_AXIS_MIN_VALUE = 10
-Y2_AXIS_MAX_VALUE = 70
-
-# See Matplotlib documentation for valid colors:
-# https://matplotlib.org/stable/gallery/color/named_colors.html
-CO2_COLOR = 'tab:blue'
-HUMIDITY_COLOR = 'tab:green'
-TEMP_COLOR = 'tab:orange'
+# Add project root to sys.path so script can be called directly w/o 'python3 -m'
+PROJECT_ROOT = Path(__file__).resolve().parent.parent
+if str(PROJECT_ROOT) not in sys.path:
+    sys.path.insert(0, str(PROJECT_ROOT))
+
+# Local imports
+from plotair import __version__
+
+CONFIG = {}
 
 # Get a logger for this script
 logger = logging.getLogger(__name__)
 
 
 def main():
-    # sys.argv[0] is the script name, so arguments start from index 1
-    if len(sys.argv) < 2:
-        logger.error("No files were provided")
-        print(f"Usage: [python] {sys.argv[0]} <file1> <file2> ...")
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('filenames', nargs='+', metavar='FILE',
+                        help='sensor data file to process')
+    parser.add_argument('-a', '--all-dates', action='store_true',
+                        help='plot all dates (otherwise only latest sequence)')
+    parser.add_argument('-m', '--merge', metavar='FIELD',
+                        help='merge field from file1 to file2, and output to file3')
+    parser.add_argument('-r', '--reset-config', action='store_true',
+                        help='reset configuration file to default')
+    parser.add_argument('-s', '--start-date', metavar='DATE',
+                        help='date at which to start the plot (YYYY-MM-DD)')
+    parser.add_argument('-S', '--stop-date', metavar='DATE',
+                        help='date at which to stop the plot (YYYY-MM-DD)')
+    parser.add_argument('-t', '--title',
+                        help='set the plot title')
+    parser.add_argument('-v', '--version', action='version', 
+                        version=f'%(prog)s {__version__}')
+
+    args = parser.parse_args()
+
+    try:
+        load_config(args.reset_config)
+    except FileNotFoundError as e:
+        logger.error(f'Failed to load config: {e}')
+        return
+
+    if args.merge:
+        field = args.merge
+        num_files = len(args.filenames)
+
+        if num_files != 3:
+            logger.error('argument -m/--merge requires three file arguments')
+            return
+
+        file_format, df1, num_valid_rows1, num_invalid_rows = read_data(args.filenames[0])
+        file_format, df2, num_valid_rows2, num_invalid_rows = read_data(args.filenames[1])
+
+        if num_valid_rows1 <= 0 or num_valid_rows2 <= 0:
+            logger.error('At least one of the input files is unsupported')
+            return
+
+        temp_df = df1[['co2']]
+        df2 = pd.concat([df2, temp_df]).sort_index()
+        df2.to_csv(args.filenames[2], index=True)
+
     else:
-        for filename in sys.argv[1:]:
-            logger.info(f"Processing {filename}")
+        # Create a list containing all files from all patterns like '*.csv',
+        # because under Windows the terminal doesn't expand wildcard arguments.
+        all_files = []
+        for pattern in args.filenames:
+            all_files.extend(glob.glob(pattern))
+
+        for filename in all_files:
+            logger.info(f'Processing {filename}')
             try:
-                df, valid, invalid = read_csv_data(filename)
-                if invalid > 0:
-                    logger.info(f"{invalid} invalid row(s) ignored")
-                df = delete_old_data(df)
-                generate_plot(df, filename)
+                file_format, df, num_valid_rows, num_invalid_rows = read_data(filename)
+
+                if num_valid_rows > 0:
+                    logger.debug(f'{num_valid_rows} row(s) read')
+                else:
+                    logger.error('Unsupported file format')
+                    return
+
+                if num_invalid_rows > 0:
+                    logger.info(f'{num_invalid_rows} invalid row(s) ignored')
+
+                if not args.all_dates:
+                    df = delete_old_data(df, args.start_date, args.stop_date)
+
+                generate_stats(df, filename)
+
+                if file_format == 'plotair':
+                    generate_plot_co2_hum_tmp(df, filename, args.title)
+                elif file_format == 'visiblair_d':
+                    generate_plot_co2_hum_tmp(df, filename, args.title)
+                elif file_format == 'visiblair_e':
+                    generate_plot_co2_hum_tmp(df, filename, args.title)
+                    generate_plot_pm(df, filename, args.title)
+                elif file_format == 'graywolf_ds':
+                    generate_plot_hum_tmp(df, filename, args.title)
+                    generate_plot_voc_co_form(df, filename, args.title)
             except Exception as e:
-                logger.exception(f"Unexpected error: {e}")
+                logger.exception(f'Unexpected error: {e}')
 
 
-def read_csv_data(filename):
-    valid_rows = []
+def detect_file_format(filename):
+    file_format = None
+    visiblair_d_num_col = (5, 6)  # Most rows have 5 columns but some have 6
+    visiblair_e_num_col = (21, 21)
+    graywolf_ds_num_col = (7, 7)
+
+    with open(filename, 'r', newline='', encoding='utf-8') as file:
+        reader = csv.reader(file)
+        first_line = next(reader)
+        num_fields = len(first_line)
+        
+        if first_line[0] == 'date':
+            file_format = 'plotair'
+        elif visiblair_d_num_col[0] <= num_fields <= visiblair_d_num_col[1]:
+            file_format = 'visiblair_d'
+        elif (visiblair_e_num_col[0] <= num_fields <= visiblair_e_num_col[1] and
+              first_line[1] == 'Timestamp'):
+            file_format = 'visiblair_e'
+        elif (graywolf_ds_num_col[0] <= num_fields <= graywolf_ds_num_col[1] and
+              first_line[0] == 'Date Time'):
+            file_format = 'graywolf_ds'
+        
+    logger.debug(f'File format: {file_format}')
+    
+    return file_format
+
+
+def read_data(filename):
+    file_format = detect_file_format(filename)
+    df = pd.DataFrame()
+    num_valid_rows = 0
+    num_invalid_rows = 0
+
+    if file_format == 'plotair':
+        df, num_valid_rows, num_invalid_rows = read_data_plotair(filename)
+    elif file_format == 'visiblair_d':
+        df, num_valid_rows, num_invalid_rows = read_data_visiblair_d(filename)
+    elif file_format == 'visiblair_e':
+        df, num_valid_rows, num_invalid_rows = read_data_visiblair_e(filename)
+    elif file_format == 'graywolf_ds':
+        df, num_valid_rows, num_invalid_rows = read_data_graywolf_ds(filename)
+
+    return file_format, df, num_valid_rows, num_invalid_rows
+
+
+def read_data_plotair(filename):
+    num_valid_rows = 0
+    num_invalid_rows = 0
+
+    # Read the CSV file into a DataFrame
+    df = pd.read_csv(filename)
+
+    # Convert the 'date' column to pandas datetime objects
+    df['date'] = pd.to_datetime(df['date'], format='%Y-%m-%d %H:%M:%S')
+
+    df = df.set_index('date')
+    df = df.sort_index()  # Sort in case some dates are not in order
+    num_valid_rows = len(df)
+
+    return df, num_valid_rows, num_invalid_rows
+
+
+def read_data_visiblair_d(filename):
+    df = pd.DataFrame()
     num_valid_rows = 0
     num_invalid_rows = 0
+    valid_rows = []
 
     # Read the file line by line instead of using pandas read_csv function.
     # This is less concise but allows for more control over data validation.
@@ -92,9 +208,9 @@ def read_csv_data(filename):
             line = line.strip()
             fields = line.split(',')
             
-            if len(fields) < MIN_CSV_COLUMNS or len(fields) > MAX_CSV_COLUMNS:
+            if not (5 <= len(fields) <= 6):
                 # Skip lines with an invalid number of columns
-                logger.debug(f"Skipping line (number of columns): {line}")
+                logger.debug(f'Skipping line (number of columns): {line}')
                 num_invalid_rows += 1
                 continue
                 
@@ -107,12 +223,11 @@ def read_csv_data(filename):
                     'humidity': np.uint8(fields[3])        # 0 to 100% RH
                 }
                 # If conversion succeeds, add the parsed row to the list
-                num_valid_rows += 1
                 valid_rows.append(parsed_row)
                 
             except (ValueError, TypeError) as e:
                 # Skip lines with conversion errors
-                logger.debug(f"Skipping line (conversion error): {line}")
+                logger.debug(f'Skipping line (conversion error): {line}')
                 num_invalid_rows += 1
                 continue
 
@@ -120,113 +235,551 @@ def read_csv_data(filename):
         df = pd.DataFrame(valid_rows)
         df = df.set_index('date')
         df = df.sort_index()  # Sort in case some dates are not in order
+        num_valid_rows = len(df)
 
     return df, num_valid_rows, num_invalid_rows
 
 
-def delete_old_data(df):
-    """
-    Iterate backwards through the samples to find the first time gap larger
-    than the sampling interval. Then return only the latest data sequence.
-    """
-    sampling_interval = None
-    next_date = df.index[-1]
+def read_data_visiblair_e(filename):
+    num_valid_rows = 0
+    num_invalid_rows = 0
 
-    for date in reversed(list(df.index)):
-        current_date = date
+    # Read the CSV file into a DataFrame
+    df = pd.read_csv(filename)
 
-        if current_date != next_date:
-            if sampling_interval is None:
-                sampling_interval = next_date - current_date
-            else:
-                current_interval = next_date - current_date
+    # Rename the columns
+    df.columns = ['uuid', 'date', 'co2', 'humidity', 'temperature', 'pm0.1',
+                  'pm0.3', 'pm0.5', 'pm1', 'pm2.5', 'pm5', 'pm10', 'pressure',
+                  'voc_index', 'firmware', 'model', 'pcb', 'display_rate',
+                  'is_charging', 'is_ac_in', 'batt_voltage']
+
+    # Convert the 'date' column to pandas datetime objects
+    df['date'] = pd.to_datetime(df['date'], format='%Y-%m-%d %H:%M:%S')
+
+    df = df.set_index('date')
+    df = df.sort_index()  # Sort in case some dates are not in order
+    num_valid_rows = len(df)
+
+    return df, num_valid_rows, num_invalid_rows
+
+
+def read_data_graywolf_ds(filename):
+    num_valid_rows = 0
+    num_invalid_rows = 0
+
+    # Read the CSV file into a DataFrame
+    df = pd.read_csv(filename)
+
+    # Rename the columns
+    df.columns = ['date', 'tvoc', 'co', 'form', 'humidity', 'temperature', 'filename']
+
+    # Convert the 'date' column to pandas datetime objects
+    df['date'] = pd.to_datetime(df['date'], format='%d-%b-%y %I:%M:%S %p')
+
+    # Convert 'form' column to string, replace '< LOD' with '0', and then convert to integer
+    df['form'] = df['form'].astype(str).str.replace('< LOD', '0').astype(int)
+
+    df = df.set_index('date')
+    df = df.sort_index()  # Sort in case some dates are not in order
+    num_valid_rows = len(df)
+
+    return df, num_valid_rows, num_invalid_rows
+
+
+def delete_old_data(df, start_date = None, stop_date = None):
+    if not start_date and not stop_date:
+        # Iterate backwards through the samples to find the first time gap larger
+        # than the sampling interval. Then return only the latest data sequence.
+        sampling_interval = None
+        next_date = df.index[-1]
+
+        for date in reversed(list(df.index)):
+            current_date = date
+
+            if current_date != next_date:
+                if sampling_interval is None:
+                    sampling_interval = next_date - current_date
+                else:
+                    current_interval = next_date - current_date
+
+                    if (current_interval / sampling_interval) > CONFIG['data']['max_missing_samples']:
+                        # This sample is from older sequence, keep only more recent
+                        df = df[df.index >= next_date]
+                        break
+
+            next_date = current_date
+
+    else:
+        # Keep only the data range to be plotted (use pandas dates types)
+        if start_date:
+            sd = pd.Timestamp(start_date)
+            df = df[df.index >= sd]
+        if stop_date:
+            sd = pd.Timestamp(stop_date)
+            df = df[df.index <= sd]
 
-                if (current_interval / sampling_interval) > MAX_MISSING_SAMPLES:
-                    # This sample is from older sequence, keep only more recent
-                    df = df[df.index >= next_date]
-                    break
-        
-        next_date = current_date
-        
     return df
     
 
-def generate_plot(df, filename):
+def generate_plot_co2_hum_tmp(df, filename, title):
+    # The dates must be in a non-index column
+    df = df.reset_index()
+
+    # Set a theme and scale all fonts
+    sns.set_theme(style='whitegrid', font_scale=CONFIG['plot']['font_scale'])
+
+    ff = CONFIG['plot']['font_family']
+    if ff != '': plt.rcParams['font.family'] = ff
+
+    # Set up the matplotlib figure and axes
+    fig, ax1 = plt.subplots(figsize=CONFIG['plot']['size'])
+    ax2 = ax1.twinx()  # Secondary y axis
+
+    # Plot the data series
+    sns.lineplot(data=df, x='date', y='co2', ax=ax1, color=CONFIG['colors']['co2'],
+                 label=CONFIG['labels']['co2'], legend=False)
+    sns.lineplot(data=df, x='date', y='humidity', ax=ax2, color=CONFIG['colors']['humidity'],
+                 label=CONFIG['labels']['humidity'], legend=False)
+    sns.lineplot(data=df, x='date', y='temperature', ax=ax2, color=CONFIG['colors']['temp'],
+                 label=CONFIG['labels']['temp'], legend=False)
+
+    # Set the ranges for both y axes
+    cmin, cmax = CONFIG['axis_ranges']['co2']
+    tmin, tmax = CONFIG['axis_ranges']['temp_h']
+    ax1.set_ylim(cmin, cmax)  # df['co2'].max() * 1.05
+    ax2.set_ylim(tmin, tmax)
+
+    # Add a grid for the x axis and the y axes
+    # This is already done if using the whitegrid theme
+    #ax1.grid(axis='x', alpha=CONFIG['plot']['grid_opacity'])
+    #ax1.grid(axis='y', alpha=CONFIG['plot']['grid_opacity'])
+    ax2.grid(axis='y', alpha=CONFIG['plot']['grid2_opacity'], linestyle=CONFIG['plot']['grid2_line_style'])
+
+    # Set the background color of the humidity comfort zone
+    hmin, hmax = CONFIG['limits']['humidity']
+    ax2.axhspan(ymin=hmin, ymax=hmax,
+                facecolor=CONFIG['colors']['humidity'], alpha=CONFIG['plot']['limit_zone_opacity'])
+
+    # Customize the plot title, labels and ticks
+    ax1.set_title(get_plot_title(title, filename))
+    ax1.tick_params(axis='x', rotation=CONFIG['plot']['date_rotation'])
+    ax1.tick_params(axis='y', labelcolor=CONFIG['colors']['co2'])
+    ax1.set_xlabel('')
+    ax1.set_ylabel(CONFIG['labels']['co2'], color=CONFIG['colors']['co2'])
+    ax2.set_ylabel('')  # We will manually place the 2 parts in different colors
+
+    # Define the position for the center of the right y axis label
+    bottom_label = CONFIG['labels']['temp'] + '  '
+    top_label = '  ' + CONFIG['labels']['humidity']
+    x = 1.07  # Slightly to the right of the axis
+    y = get_label_center(bottom_label, top_label)   # Vertically centered
+
+    # Place the first (bottom) part of the label
+    ax2.text(x, y, bottom_label, transform=ax2.transAxes,
+             color=CONFIG['colors']['temp'], rotation='vertical',
+             ha='center', va='top')
+
+    # Place the second (top) part of the label
+    ax2.text(x, y, top_label, transform=ax2.transAxes,
+            color=CONFIG['colors']['humidity'], rotation='vertical',
+            ha='center', va='bottom')
+
+    # Create a combined legend
+    lines1, labels1 = ax1.get_legend_handles_labels()
+    lines2, labels2 = ax2.get_legend_handles_labels()
+    ax1.legend(lines1 + lines2, labels1 + labels2,
+               loc=CONFIG['plot']['legend_location'])
+
+    # Adjust the plot margins to make room for the labels
+    plt.tight_layout()
+
+    # Save the plot as a PNG image
+    plt.savefig(get_plot_filename(filename, '-cht'))
+    plt.close()
+
+
+def generate_plot_hum_tmp(df, filename, title):
     # The dates must be in a non-index column
     df = df.reset_index()
 
     # Set a theme and scale all fonts
-    sns.set_theme(style='whitegrid', font_scale=PLOT_FONT_SCALE)
+    sns.set_theme(style='whitegrid', font_scale=CONFIG['plot']['font_scale'])
+
+    ff = CONFIG['plot']['font_family']
+    if ff != '': plt.rcParams['font.family'] = ff
 
     # Set up the matplotlib figure and axes
-    fig, ax1 = plt.subplots(figsize=(PLOT_WIDTH, PLOT_HEIGHT))
+    fig, ax1 = plt.subplots(figsize=CONFIG['plot']['size'])
     ax2 = ax1.twinx()  # Secondary y axis
 
     # Plot the data series
-    sns.lineplot(data=df, x='date', y='co2', ax=ax1, color=CO2_COLOR,
-                 label=CO2_LABEL, legend=False)
-    sns.lineplot(data=df, x='date', y='humidity', ax=ax2, color=HUMIDITY_COLOR,
-                 label=HUMIDITY_LABEL, legend=False)
-    sns.lineplot(data=df, x='date', y='temperature', ax=ax2, color=TEMP_COLOR,
-                 label=TEMP_LABEL, legend=False)
+    #sns.lineplot(data=df, x='date', y='co2', ax=ax1, color=CONFIG['colors']['co2'],
+    #             label=CONFIG['labels']['co2'], legend=False)
+    sns.lineplot(data=df, x='date', y='humidity', ax=ax2, color=CONFIG['colors']['humidity'],
+                 label=CONFIG['labels']['humidity'], legend=False)
+    sns.lineplot(data=df, x='date', y='temperature', ax=ax2, color=CONFIG['colors']['temp'],
+                 label=CONFIG['labels']['temp'], legend=False)
 
     # Set the ranges for both y axes
-    ax1.set_ylim(Y1_AXIS_MIN_VALUE, Y1_AXIS_MAX_VALUE)  # df['co2'].max() * 1.05
-    ax2.set_ylim(Y2_AXIS_MIN_VALUE, Y2_AXIS_MAX_VALUE)
+    cmin, cmax = CONFIG['axis_ranges']['co2']
+    tmin, tmax = CONFIG['axis_ranges']['temp_h']
+    ax1.set_ylim(cmin, cmax)  # df['co2'].max() * 1.05
+    ax2.set_ylim(tmin, tmax)
 
     # Add a grid for the x axis and the y axes
     # This is already done if using the whitegrid theme
-    #ax1.grid(axis='x', alpha=0.7)  
-    #ax1.grid(axis='y', alpha=0.7)
-    ax2.grid(axis='y', alpha=0.7, linestyle='dashed')
+    #ax1.grid(axis='x', alpha=CONFIG['plot']['grid_opacity'])
+    #ax1.grid(axis='y', alpha=CONFIG['plot']['grid_opacity'])
+    ax2.grid(axis='y', alpha=CONFIG['plot']['grid2_opacity'], linestyle=CONFIG['plot']['grid2_line_style'])
 
     # Set the background color of the humidity comfort zone
-    ax2.axhspan(ymin=HUMIDITY_ZONE_MIN, ymax=HUMIDITY_ZONE_MAX,
-                facecolor=HUMIDITY_COLOR, alpha=HUMIDITY_ZONE_ALPHA)
+    hmin, hmax = CONFIG['limits']['humidity']
+    ax2.axhspan(ymin=hmin, ymax=hmax,
+                facecolor=CONFIG['colors']['humidity'], alpha=CONFIG['plot']['limit_zone_opacity'])
 
     # Customize the plot title, labels and ticks
-    ax1.set_title(get_plot_title(filename))
-    ax1.tick_params(axis='x', rotation=X_AXIS_ROTATION)
-    ax1.tick_params(axis='y', labelcolor=CO2_COLOR)
+    ax1.set_title(get_plot_title(title, filename))
+    ax1.tick_params(axis='x', rotation=CONFIG['plot']['date_rotation'])
+    #ax1.tick_params(axis='y', labelcolor=CONFIG['colors']['co2'])
     ax1.set_xlabel('')
-    ax1.set_ylabel(Y1_AXIS_LABEL, color=CO2_COLOR)
+    #ax1.set_ylabel(CONFIG['labels']['co2'], color=CONFIG['colors']['co2'])
     ax2.set_ylabel('')  # We will manually place the 2 parts in different colors
 
     # Define the position for the center of the right y axis label
+    bottom_label = CONFIG['labels']['temp'] + '  '
+    top_label = '  ' + CONFIG['labels']['humidity']
     x = 1.07  # Slightly to the right of the axis
-    y = 0.5   # Vertically centered
+    y = get_label_center(bottom_label, top_label)   # Vertically centered
 
     # Place the first (bottom) part of the label
-    ax2.text(x, y, Y2_AXIS_LABEL_1, transform=ax2.transAxes,
-             color=TEMP_COLOR, rotation='vertical', ha='center', va='top')
+    ax2.text(x, y, bottom_label, transform=ax2.transAxes,
+             color=CONFIG['colors']['temp'], rotation='vertical',
+             ha='center', va='top')
 
     # Place the second (top) part of the label
-    ax2.text(x, y, Y2_AXIS_LABEL_2, transform=ax2.transAxes,
-            color=HUMIDITY_COLOR, rotation='vertical', ha='center', va='bottom')
+    ax2.text(x, y, top_label, transform=ax2.transAxes,
+            color=CONFIG['colors']['humidity'], rotation='vertical',
+            ha='center', va='bottom')
 
     # Create a combined legend
     lines1, labels1 = ax1.get_legend_handles_labels()
     lines2, labels2 = ax2.get_legend_handles_labels()
-    ax1.legend(lines1 + lines2, labels1 + labels2, loc='upper left')
+    ax1.legend(lines1 + lines2, labels1 + labels2,
+               loc=CONFIG['plot']['legend_location'])
+
+    # Remove the left y-axis elements from ax1
+    ax1.grid(axis='y', visible=False)
+    ax1.spines['left'].set_visible(False)
+    ax1.tick_params(axis='y', left=False, labelleft=False)
 
     # Adjust the plot margins to make room for the labels
     plt.tight_layout()
 
     # Save the plot as a PNG image
-    plt.savefig(get_png_filename(filename))
+    plt.savefig(get_plot_filename(filename, '-ht'))
     plt.close()
 
 
-def get_plot_title(filename):
-    match = re.search(r'^(\d+\s*-\s*)?(.*)\.[a-zA-Z]+$', filename)
-    plot_title = match.group(2) if match else filename
-    plot_title = plot_title.capitalize()
+def generate_plot_voc_co_form(df, filename, title):
+    # The dates must be in a non-index column
+    df = df.reset_index()
+    
+    # Set a theme and scale all fonts
+    sns.set_theme(style='whitegrid', font_scale=CONFIG['plot']['font_scale'])
+
+    ff = CONFIG['plot']['font_family']
+    if ff != '': plt.rcParams['font.family'] = ff
+
+    # Set up the matplotlib figure and axes
+    fig, ax1 = plt.subplots(figsize=CONFIG['plot']['size'])
+    ax2 = ax1.twinx()  # Secondary y axis
+
+    # Plot the TVOC main line
+    sns.lineplot(data=df, x='date', y='tvoc', ax=ax1, legend=False,
+                 color=CONFIG['colors']['tvoc'], label=CONFIG['labels']['tvoc'])
+
+    # Plot the TVOC limit line
+    line = ax1.axhline(y=CONFIG['limits']['tvoc'], color=CONFIG['colors']['tvoc'],
+                linestyle=CONFIG['plot']['limit_line_style'], linewidth=CONFIG['plot']['limit_line_width'],
+                label=CONFIG['labels']['tvoc_limit'])
+    line.set_alpha(CONFIG['plot']['limit_line_opacity'])
+
+    # Plot the formaldehyde main line
+    df_filtered = df[df['form'] != 0]  # Filter out rows where 'form' is zero
+    sns.lineplot(data=df_filtered, x='date', y='form', ax=ax2, legend=False,
+                 color=CONFIG['colors']['form'], label=CONFIG['labels']['form'])
+
+    # Plot the formaldehyde limit line
+    line = ax2.axhline(y=CONFIG['limits']['form'], color=CONFIG['colors']['form'],
+                linestyle=CONFIG['plot']['limit_line_style'], linewidth=CONFIG['plot']['limit_line_width'],
+                label=CONFIG['labels']['form_limit'])
+    line.set_alpha(CONFIG['plot']['limit_line_opacity'])
+
+    # Plot the CO main line
+    co_scale = 10
+    df['co_scaled'] = df['co'] * co_scale
+    sns.lineplot(data=df, x='date', y='co_scaled', ax=ax2, legend=False,
+                 color=CONFIG['colors']['co'], label=CONFIG['labels']['co'])
+
+    # Plot the CO limit line
+    line = ax2.axhline(y=CONFIG['limits']['co'] * co_scale, color=CONFIG['colors']['co'],
+                linestyle=CONFIG['plot']['limit_line_style'], linewidth=CONFIG['plot']['limit_line_width'],
+                label=CONFIG['labels']['co_limit'])
+    line.set_alpha(CONFIG['plot']['limit_line_opacity'])
+
+    # Set the ranges for both y axes
+    tmin, tmax = CONFIG['axis_ranges']['tvoc']
+    cmin, cmax = CONFIG['axis_ranges']['co_form']
+    ax1.set_ylim(tmin, tmax)
+    ax2.set_ylim(cmin, cmax)
+
+    # Add a grid for the x axis and the y axes
+    # This is already done if using the whitegrid theme
+    #ax1.grid(axis='x', alpha=CONFIG['plot']['grid_opacity'])
+    #ax1.grid(axis='y', alpha=CONFIG['plot']['grid_opacity'])
+    ax2.grid(axis='y', alpha=CONFIG['plot']['grid2_opacity'], linestyle=CONFIG['plot']['grid2_line_style'])
+
+    # Customize the plot title, labels and ticks
+    ax1.set_title(get_plot_title(title, filename))
+    ax1.tick_params(axis='x', rotation=CONFIG['plot']['date_rotation'])
+    ax1.tick_params(axis='y', labelcolor=CONFIG['colors']['tvoc'])
+    ax1.set_xlabel('')
+    ax1.set_ylabel(CONFIG['labels']['tvoc'], color=CONFIG['colors']['tvoc'])
+    ax2.set_ylabel('')  # We will manually place the 2 parts in different colors
+
+    # Define the position for the center of the right y axis label
+    bottom_label = CONFIG['labels']['co'] + '  '
+    top_label = '  ' + CONFIG['labels']['form']
+    x = 1.07  # Slightly to the right of the axis
+    y = get_label_center(bottom_label, top_label)   # Vertically centered
+
+    # Place the first (bottom) part of the label
+    ax2.text(x, y, bottom_label, transform=ax2.transAxes,
+             color=CONFIG['colors']['co'], rotation='vertical',
+             ha='center', va='top')
+
+    # Place the second (top) part of the label
+    ax2.text(x, y, top_label, transform=ax2.transAxes,
+             color=CONFIG['colors']['form'], rotation='vertical',
+             ha='center', va='bottom')
+
+    # Create a combined legend
+    lines1, labels1 = ax1.get_legend_handles_labels()
+    lines2, labels2 = ax2.get_legend_handles_labels()
+    ax1.legend(lines1 + lines2, labels1 + labels2,
+               loc=CONFIG['plot']['legend_location'])
+
+    # Adjust the plot margins to make room for the labels
+    plt.tight_layout()
+
+    # Save the plot as a PNG image
+    plt.savefig(get_plot_filename(filename, '-vcf'))
+    plt.close()
+
+
+def generate_plot_pm(df, filename, title):
+    # The dates must be in a non-index column
+    df = df.reset_index()
+
+    # Set a theme and scale all fonts
+    sns.set_theme(style='whitegrid', font_scale=CONFIG['plot']['font_scale'])
+
+    ff = CONFIG['plot']['font_family']
+    if ff != '': plt.rcParams['font.family'] = ff
+
+    # Set up the matplotlib figure and axes
+    fig, ax1 = plt.subplots(figsize=CONFIG['plot']['size'])
+    ax2 = ax1.twinx()  # Secondary y axis
+
+    #sns.lineplot(data=df, x='date', y='pm0.1', ax=ax1, color=CONFIG['colors']['pm0.1'],
+    #             label=CONFIG['labels']['pm0.1'], legend=False)
+
+    # Plot the PM2.5 main line
+    sns.lineplot(data=df, x='date', y='pm2.5', ax=ax2, legend=False,
+                 color=CONFIG['colors']['pm2.5'],
+                 label=CONFIG['labels']['pm2.5'],
+                 linewidth=CONFIG['plot']['pm2.5_line_width'],
+                 linestyle=CONFIG['plot']['pm2.5_line_style'])
+
+    # Plot the PM2.5 limit line
+    line = ax2.axhline(y=CONFIG['limits']['pm2.5'],
+                 color=CONFIG['colors']['pm2.5'],
+                 label=CONFIG['labels']['pm2.5_limit'],
+                 linewidth=CONFIG['plot']['limit_line_width'],
+                 linestyle=CONFIG['plot']['limit_line_style'])
+    line.set_alpha(CONFIG['plot']['limit_line_opacity'])
+
+    # Plot the PM10 main line
+    sns.lineplot(data=df, x='date', y='pm10', ax=ax2, legend=False,
+                 color=CONFIG['colors']['pm10'],
+                 label=CONFIG['labels']['pm10'],
+                 linewidth=CONFIG['plot']['pm10_line_width'],
+                 linestyle=CONFIG['plot']['pm10_line_style'])
+
+    # Plot the PM10 limit line
+    line = ax2.axhline(y=CONFIG['limits']['pm10'],
+                 color=CONFIG['colors']['pm10'],
+                 label=CONFIG['labels']['pm10_limit'],
+                 linewidth=CONFIG['plot']['limit_line_width'],
+                 linestyle=CONFIG['plot']['limit_line_style'])
+    line.set_alpha(CONFIG['plot']['limit_line_opacity'])
+
+    # Set the ranges for both y axes
+    #min1, max1 = CONFIG['axis_ranges']['pm0.1']
+    min2, max2 = CONFIG['axis_ranges']['pm2.5_10']
+    #ax1.set_ylim(min1, max1)  # df['co2'].max() * 1.05
+    ax2.set_ylim(min2, max2)
+
+    # Add a grid for the x axis and the y axes
+    # This is already done if using the whitegrid theme
+    #ax1.grid(axis='x', alpha=CONFIG['plot']['grid_opacity'])
+    #ax1.grid(axis='y', alpha=CONFIG['plot']['grid_opacity'])
+    ax2.grid(axis='y', alpha=CONFIG['plot']['grid2_opacity'], linestyle=CONFIG['plot']['grid1_line_style'])
+
+    # Customize the plot title, labels and ticks
+    ax1.set_title(get_plot_title(title, filename))
+    ax1.tick_params(axis='x', rotation=CONFIG['plot']['date_rotation'])
+    #ax1.tick_params(axis='y', labelcolor=CONFIG['colors']['pm0.1'])
+    ax1.set_xlabel('')
+    #ax1.set_ylabel(CONFIG['labels']['pm0.1'], color=CONFIG['colors']['pm0.1'])
+    ax2.set_ylabel('')  # We will manually place the 2 parts in different colors
+
+    # Define the position for the center of the right y axis label
+    bottom_label = CONFIG['labels']['pm2.5'] + '  '
+    top_label = '  ' + CONFIG['labels']['pm10']
+    x = 1.07  # Slightly to the right of the axis
+    y = get_label_center(bottom_label, top_label)   # Vertically centered
+
+    # Place the first (bottom) part of the label
+    ax2.text(x, y, bottom_label, transform=ax2.transAxes,
+             color=CONFIG['colors']['pm2.5'], rotation='vertical',
+             ha='center', va='top')
+
+    # Place the second (top) part of the label
+    ax2.text(x, y, top_label, transform=ax2.transAxes,
+            color=CONFIG['colors']['pm10'], rotation='vertical',
+            ha='center', va='bottom')
+
+    # Create a combined legend
+    lines1, labels1 = ax1.get_legend_handles_labels()
+    lines2, labels2 = ax2.get_legend_handles_labels()
+    ax1.legend(lines1 + lines2, labels1 + labels2,
+               loc=CONFIG['plot']['legend_location'])
+
+    # Remove the left y-axis elements from ax1
+    ax1.grid(axis='y', visible=False)
+    ax1.spines['left'].set_visible(False)
+    ax1.tick_params(axis='y', left=False, labelleft=False)
+
+    # Adjust the plot margins to make room for the labels
+    plt.tight_layout()
+
+    # Save the plot as a PNG image
+    plt.savefig(get_plot_filename(filename, '-pm'))
+    plt.close()
+
+
+def get_label_center(bottom_label, top_label):
+    # Return a value between 0 and 1 to estimate where to center the label
+    fs = CONFIG['plot']['font_scale']
+    divider = 72 * fs**2 - 316 * fs + 414  # Tested for fs between 0.8 and 2
+    center = 0.5 + ((len(bottom_label) - len(top_label)) / divider)
+    return center
+
+
+def generate_stats(df, filename):
+    summary = df.describe()
+
+    with open(get_stats_filename(filename), 'w') as file:
+        file.write(summary.to_string())
+
+    #for column in summary.columns.tolist():
+    #    box = sns.boxplot(data=df, y=column)
+    #    plt.savefig(get_boxplot_filename(filename, f'-{column}'))
+    #    plt.close()
+
+
+def load_config(reset_config = False):
+    global CONFIG
+
+    app_name = 'plotair'
+    config_file = 'config.toml'
+
+    config_dir = get_config_dir(app_name)
+    user_config_file = config_dir / config_file
+    default_config_file = PROJECT_ROOT / app_name / config_file
+
+    if not user_config_file.exists() or reset_config:
+        if default_config_file.exists():
+            shutil.copy2(default_config_file, user_config_file)
+            logger.debug(f'Config initialized at {user_config_file}')
+        else:
+            raise FileNotFoundError(f'Default config missing at {default_config_file}')
+    else:
+        logger.debug(f'Found config file at {user_config_file}')
+
+    with open(user_config_file, 'rb') as f:
+        CONFIG = tomllib.load(f)
+
+
+def get_config_dir(app_name):
+    if sys.platform == "win32":
+        # Windows: Use %APPDATA% (%USERPROFILE%\AppData\Roaming)
+        config_dir = Path(os.environ.get("APPDATA", "")) / app_name
+    elif sys.platform == "darwin":
+        # macOS: Use ~/Library/Preferences
+        config_dir = Path.home() / "Library" / "Preferences" / app_name
+    else:
+        # Linux and other Unix-like: Use ~/.config or XDG_CONFIG_HOME if set
+        config_home = os.environ.get("XDG_CONFIG_HOME", "")
+        if config_home:
+            config_dir = Path(config_home) / app_name
+        else:
+            config_dir = Path.home() / ".config" / app_name
+    
+    # Create the directory if it doesn't exist
+    config_dir.mkdir(parents=True, exist_ok=True)
+    
+    return config_dir
+
+
+def get_plot_title(title, filename):
+    if title:
+        plot_title = title
+    else:
+        stem = Path(filename).stem
+        match = re.search(r'^(\d+\s*-\s*)?(.*)$', stem)
+        plot_title = match.group(2) if match else stem
+
+    # Capitalize only the first character
+    if plot_title: plot_title = plot_title[0].upper() + plot_title[1:]
+
     return plot_title
 
 
-def get_png_filename(filename):
-    root, ext = os.path.splitext(filename)
-    return f"{root}.png"
+def get_plot_filename(filename, suffix = ''):
+    p = Path(filename)
+    return f'{p.parent}/{p.stem}{suffix}.png'
+
+
+#def get_boxplot_filename(filename, suffix = ''):
+#    p = Path(filename)
+#    return f'{p.parent}/{p.stem}-boxplot{suffix}.png'
+
+
+def get_stats_filename(filename):
+    p = Path(filename)
+    return f'{p.parent}/{p.stem}-stats.txt'
+
+
+def log_data_frame(df, description = ''):
+    """ This function is used only for debugging. """
+    logger.debug(f'DataFrame {description}\n{df}')
+    #logger.debug(f'DataFrame index data type: {df.index.dtype}')
+    #logger.debug(f'DataFrame index class: {type(df.index)}')
+    #logger.debug(f'DataFrame columns data types\n{df.dtypes}')
+    #logger.debug(f'DataFrame statistics\n{df.describe()}')  # Mean, min, max...
+    #sys.exit()
 
 
 if __name__ == '__main__':
@@ -235,6 +788,6 @@ if __name__ == '__main__':
                         format='%(levelname)s - %(message)s')
     
     # Configure this script's logger
-    logger.setLevel(logging.INFO)
+    logger.setLevel(logging.DEBUG)
 
     main()

{plotair-0.1.1.dist-info → plotair-0.2.0.dist-info}/METADATA

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: plotair
-Version: 0.1.1
+Version: 0.2.0
 Summary: Generate CO₂, humidity and temperature plots from VisiblAir sensor CSV files.
 Project-URL: Repository, https://github.com/monsieurlinux/plotair
 Author-email: Monsieur Linux <info@mlinux.ca>
 License-Expression: MIT
 License-File: LICENSE
-Keywords: cli,command-line,python,terminal,tui
+Keywords: cli,data-analysis,data-science,iot,monitoring,python,terminal,visualization
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Requires-Dist: pandas<3.0.0,>=2.0.0
 Requires-Dist: seaborn>=0.13.2
 Description-Content-Type: text/markdown
@@ -42,21 +42,24 @@ It is recommended to install PlotAir within a [virtual environment](https://docs
 *   **Linux (Debian / Ubuntu / Mint):**
     
     ```bash
-    sudo apt update && sudo apt install pipx
+    sudo apt install pipx
+    pipx ensurepath
     ```
 *   **Linux (Other) / macOS:**
     
     ```bash
     python3 -m pip install --user pipx
     python3 -m pipx ensurepath
-    # Note: Close and restart your terminal after running ensurepath
     ```
 *   **Windows:**
     
     ```bash
     python -m pip install --user pipx
+    python -m pipx ensurepath
     ```
 
+You may need to close and restart your terminal for the PATH changes to take effect.
+
 **2. Install PlotAir:**
 
 ```bash
@@ -76,7 +79,7 @@ pip install plotair
 ### Basic Usage
 
 ```bash
-plotair <file1> <file2> ...
+plotair [arguments] FILE [FILE ...]
 ```
 
 ### Command-Line Arguments

plotair-0.2.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+plotair/__init__.py,sha256=Zn1KFblwuFHiDRdRAiRnDBRkbPttWh44jKa5zG2ov0E,22
+plotair/config.toml,sha256=WYKZgfmpHNwERI3ua6X9aO4X1yv95JfOLOjKF3NT-SU,1668
+plotair/main.py,sha256=G3QZSDMiX4mQUBpbMDVbw-juQ1eQa-15fetX1qt00QU,30631
+plotair-0.2.0.dist-info/METADATA,sha256=Wtn1lbOmmRlnsuPc61GG4PaE3R81-thGtGQik6giDlE,3331
+plotair-0.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+plotair-0.2.0.dist-info/entry_points.txt,sha256=ekJAavHU_JAF9a66br_T4-Vni_OAyd7QX-tnVlsH8pY,46
+plotair-0.2.0.dist-info/licenses/LICENSE,sha256=Lb4o6Virnt4fVuYjZ_QO4qrvRUJqHe0MCkqVr_lncJo,1071
+plotair-0.2.0.dist-info/RECORD,,

plotair-0.1.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-plotair/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plotair/main.py,sha256=_jrgIkSfo0P-9i6ZaozXqfkqrMzgUwDo84mtUB4guoI,8378
-plotair-0.1.1.dist-info/METADATA,sha256=STPe0wm4Ngqa6bv4yWjE_ooHtiaSEkBxw2cHjb1Etmo,3235
-plotair-0.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-plotair-0.1.1.dist-info/entry_points.txt,sha256=ekJAavHU_JAF9a66br_T4-Vni_OAyd7QX-tnVlsH8pY,46
-plotair-0.1.1.dist-info/licenses/LICENSE,sha256=Lb4o6Virnt4fVuYjZ_QO4qrvRUJqHe0MCkqVr_lncJo,1071
-plotair-0.1.1.dist-info/RECORD,,