From aa51ee072bd1d8587cc0b38d40c6971bdf5d1c0b Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Sun, 27 Apr 2025 21:47:58 -0400 Subject: load compressors --- main.c | 6 +++++- ui.c | 40 +++++++++++++++++++++++++++++++++++++++- ui.h | 7 ++++++- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 74c4f84..28f8c50 100644 --- a/main.c +++ b/main.c @@ -94,10 +94,14 @@ main(void) { /* Init data structures. */ static UI ui; - init_ui(&ui); + if (init_ui(&ui) != 0) { + return 1; + } main_loop(&ctx, &ui); + free_ui(&ui); + return 0; } diff --git a/ui.c b/ui.c index cb65da7..5fcfdba 100644 --- a/ui.c +++ b/ui.c @@ -1,5 +1,7 @@ #include #include +#include +#include #include #include "microui.h" @@ -8,6 +10,7 @@ #include "widget.h" #include "engine.h" #include "ui.h" +#include "eprintf.h" #define DEFAULT_DISPLACEMENT (litre(1.5)) @@ -36,6 +39,7 @@ static void init_manifold_temperature(UI *ui); static void init_volume_flow_rate(UI *ui); static void init_mass_flow_rate(UI *ui); static void init_mass_flow_rate_corrected(UI *ui); +static int init_comps(UI *ui); static void compute_pressure_ratio(UI *ui, int idx); static void compute_comp_outlet_temperature(UI *ui, int idx); static void compute_manifold_temperature(UI *ui, int idx); @@ -44,7 +48,8 @@ static void compute_mass_flow_rate(UI *ui, int idx); static void compute_mass_flow_rate_corrected(UI *ui, int idx); -void +/* Returns non-zero on error. */ +int init_ui(UI *ui) { ui->npoints = 1; init_engine(&ui->points[0]); @@ -67,7 +72,19 @@ init_ui(UI *ui) { init_mass_flow_rate(ui); init_mass_flow_rate_corrected(ui); + if (init_comps(ui) != 0) { + return 1; + } + compute(ui, 0); + + return 0; +} + +void +free_ui(UI *ui) { + w_free_select_compressor(&ui->comp_select); + free(ui->comps); } static void @@ -207,6 +224,27 @@ init_mass_flow_rate_corrected(UI *ui) { w_init_number(ui->mass_flow_rate_corrected[0]); } +static int +init_comps(UI *ui) { + int i; + + if (load_compressors(&ui->comps, &ui->ncomps) != 0) { + weprintf("failed to load compressors"); + return 1; + } + for (i = 0; i < ui->ncomps; i++) { + printf("%s %s %s\n", ui->comps[i].brand, ui->comps[i].series, ui->comps[i].model); + } + + if (w_init_select_compressor(&ui->comp_select, ui->ncomps, ui->comps) != 0) { + free(ui->comps); + return 1; + } + printf("init'd comp select widget\n"); + + return 0; +} + void set_displacement(UI *ui) { int idx, i; diff --git a/ui.h b/ui.h index aa30b5e..b5c2635 100644 --- a/ui.h +++ b/ui.h @@ -43,9 +43,14 @@ typedef struct { w_Select mass_flow_rate_corrected_unit; w_Number mass_flow_rate_corrected[MAX_POINTS]; + + Compressor *comps; + int ncomps; + w_Select_Compressor comp_select; } UI; -void init_ui(UI *ui); +int init_ui(UI *ui); +void free_ui(UI *ui); void set_displacement(UI *ui); void set_displacement_unit(UI* ui); void set_ambient_temperature(UI *ui); -- cgit v1.2.3