aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--color.h8
-rw-r--r--compressor.h10
-rw-r--r--[-rwxr-xr-x]cwalk.c0
-rw-r--r--main.c16
-rw-r--r--renderer.c14
-rw-r--r--ui.c67
-rw-r--r--util.h9
-rw-r--r--widget.c21
-rw-r--r--widget.h4
10 files changed, 125 insertions, 26 deletions
diff --git a/Makefile b/Makefile
index ab9d5ce..5c9c101 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ LDFLAGS = -lSDL2 -lSDL2_ttf -lSDL2_image -lm -fopenmp
SRC = main.c microui.c renderer.c widget.c ui.c unit.c engine.c compressor.c eprintf.c cwalk.c toml.c util.c
OBJ = ${SRC:.c=.o}
-HDR = microui.h renderer.h widget.h ui.h unit.h engine.h eprintf.h util.h cwalk.h toml.h
+HDR = microui.h renderer.h widget.h ui.h unit.h engine.h eprintf.h util.h cwalk.h toml.h color.h
TEST_SRC = test.c test_angular_speed.c test_fraction.c test_pressure.c test_temperature.c test_volume.c test_volume_flow_rate.c test_mass_flow_rate.c test_engine.c unit.c engine.c
TEST_OBJ = ${TEST_SRC:.c=.o}
diff --git a/color.h b/color.h
new file mode 100644
index 0000000..7de787a
--- /dev/null
+++ b/color.h
@@ -0,0 +1,8 @@
+static const mu_Color BLACK = {0, 0, 0, 255};
+static const mu_Color WHITE = {255, 255, 255, 255};
+static const mu_Color LIGHT_GRAY = {222, 222, 222, 255};
+static const mu_Color DARK_GRAY = {128, 128, 128, 255};
+static const mu_Color RED = {255, 0, 0, 255};
+static const mu_Color GREEN = {0, 255, 0, 255};
+static const mu_Color BLUE = {0, 0, 255, 255};
+static const mu_Color TRANSPARENT = {0, 0, 0, 0};
diff --git a/compressor.h b/compressor.h
index 3442545..e394450 100644
--- a/compressor.h
+++ b/compressor.h
@@ -1,12 +1,14 @@
+typedef enum {
+ MASS_FLOW,
+ VOLUME_FLOW,
+} FlowType;
+
typedef struct {
union {
MassFlowRate mfr;
VolumeFlowRate vfr;
} u;
- enum {
- MASS_FLOW,
- VOLUME_FLOW
- } t;
+ FlowType t;
} Flow;
typedef struct {
diff --git a/cwalk.c b/cwalk.c
index e4c9a49..e4c9a49 100755..100644
--- a/cwalk.c
+++ b/cwalk.c
diff --git a/main.c b/main.c
index a869d57..a95a95a 100644
--- a/main.c
+++ b/main.c
@@ -11,6 +11,8 @@
#include "widget.h"
#include "engine.h"
#include "ui.h"
+#include "color.h"
+#include "eprintf.h"
/* Macros. */
@@ -26,11 +28,6 @@ enum window {
};
-static const mu_Color BLACK = {0, 0, 0, 255};
-static const mu_Color WHITE = {255, 255, 255, 255};
-static const mu_Color LIGHT_GRAY = {222, 222, 222, 255};
-static const mu_Color DARK_GRAY = {128, 128, 128, 255};
-
static const mu_Color COLOR_TEXT = BLACK;
static const mu_Color COLOR_BORDER = BLACK;
static const mu_Color COLOR_WINDOWBG = WHITE;
@@ -329,6 +326,7 @@ dup_del_row(mu_Context *ctx, UI *ui) {
}
if (mu_button(ctx, "Del")) {
remove_point(ui, i);
+ compute_all(ui);
}
mu_pop_id(ctx);
}
@@ -390,8 +388,14 @@ mass_flow_rate_corrected_row(mu_Context *ctx, UI *ui) {
static void
comp_select(mu_Context *ctx, UI *ui) {
+ const Compressor *comp;
+
if (w_select_compressor(ctx, &ui->comp_select) & MU_RES_CHANGE) {
- /* TODO */
+ comp = &ui->comps[ui->comp_select.idx];
+ if (w_canvas_set_bg(&ui->comp_img, comp->imgfile) != 0) {
+ weprintf("failed to set compressor image: %s", comp->imgfile);
+ }
+ compute_all(ui);
}
}
diff --git a/renderer.c b/renderer.c
index c40fcf8..7466412 100644
--- a/renderer.c
+++ b/renderer.c
@@ -7,15 +7,8 @@
#include <SDL2/SDL_image.h>
#include "microui.h"
#include "renderer.h"
-
-
-#define expect(x) do { \
- if (!(x)) { \
- fprintf(stderr, "Fatal error: %s:%d: assertion '%s' failed\n", \
- __FILE__, __LINE__, #x); \
- abort(); \
- } \
- } while (0)
+#include "color.h"
+#include "util.h"
#define PIXEL_DEPTH 32
@@ -41,7 +34,7 @@ enum { CIRCLE_RADIUS = 16 };
static const char FONT[] = "font/P052-Roman.ttf";
enum font { FONTSIZE = 14, };
-static const mu_Color bg = {255, 255, 255, 255};
+static const mu_Color bg = WHITE;
static const char button_map[256] = {
[SDL_BUTTON_LEFT & 0xff] = MU_MOUSE_LEFT,
@@ -452,6 +445,7 @@ r_canvas_draw_circle(int id, int x, int y, int r, mu_Color color) {
canvas = &canvas_list.items[id];
+ #pragma omp parallel for
for (dy = -r; dy <= r; dy++) {
for (dx = -r; dx <= r; dx++) {
if (dx*dx + dy*dy <= r*r) {
diff --git a/ui.c b/ui.c
index 77daf2a..55605ad 100644
--- a/ui.c
+++ b/ui.c
@@ -12,6 +12,8 @@
#include "engine.h"
#include "ui.h"
#include "eprintf.h"
+#include "color.h"
+#include "util.h"
#define DEFAULT_DISPLACEMENT (litre(1.5))
@@ -24,6 +26,10 @@
#define DEFAULT_INTERCOOLER_EFFICIENCY (percent(90))
#define DEFAULT_INTERCOOLER_DELTAP (psi(0.2))
+enum { POINT_RADIUS = 6 };
+
+static const mu_Color POINT_COLOR = RED;
+
static void init_displacement(UI *ui);
static void init_ambient_temperature(UI *ui);
@@ -48,6 +54,10 @@ static void compute_manifold_temperature(UI *ui, int idx);
static void compute_volume_flow_rate(UI *ui, int idx);
static void compute_mass_flow_rate(UI *ui, int idx);
static void compute_mass_flow_rate_corrected(UI *ui, int idx);
+static void draw_points(UI *ui);
+static void draw_point(UI *ui, int idx, mu_Color color);
+static void point_coords(UI *ui, int idx, int *x, int *y);
+static const Compressor *selected_compressor(UI *ui);
/* Returns non-zero on error. The renderer must already be initialized. */
@@ -433,6 +443,8 @@ compute(UI *ui, int idx) {
compute_volume_flow_rate(ui, idx);
compute_mass_flow_rate(ui, idx);
compute_mass_flow_rate_corrected(ui, idx);
+
+ draw_points(ui);
}
void
@@ -522,6 +534,61 @@ compute_mass_flow_rate_corrected(UI *ui, int idx) {
w_set_number(ui->mass_flow_rate_corrected[idx], v);
}
+static void
+draw_points(UI *ui) {
+ int i;
+
+ w_clear_canvas(&ui->comp_img);
+ #pragma omp parallel for
+ for (i = 0; i < ui->npoints; i++) {
+ draw_point(ui, i, POINT_COLOR);
+ }
+}
+
+static void
+draw_point(UI *ui, int idx, mu_Color color) {
+ int x, y;
+
+ point_coords(ui, idx, &x, &y);
+ w_canvas_draw_circle(&ui->comp_img, x, y, POINT_RADIUS, color);
+}
+
+static void
+point_coords(UI *ui, int idx, int *x, int *y) {
+ const Compressor *comp;
+ const Engine *engine;
+ double flow, origin_flow, ref_flow, r, pr;
+
+ comp = selected_compressor(ui);
+ engine = &ui->points[idx];
+
+ expect(comp->origin.flow.t == comp->ref.flow.t);
+ switch (comp->origin.flow.t) {
+ case MASS_FLOW:
+ flow = mass_flow_rate_corrected(engine);
+ origin_flow = comp->origin.flow.u.mfr;
+ ref_flow = comp->ref.flow.u.mfr;
+ break; case VOLUME_FLOW:
+ flow = volume_flow_rate(engine);
+ origin_flow = comp->origin.flow.u.vfr;
+ ref_flow = comp->ref.flow.u.vfr;
+ break; default:
+ eprintf("impossible FlowType: %d", comp->origin.flow.t);
+ }
+
+ r = (flow - origin_flow) / (ref_flow - origin_flow);
+ *x = comp->origin.x + r * (comp->ref.x - comp->origin.x);
+
+ pr = pressure_ratio(engine);
+ r = (pr - comp->origin.pr) / (comp->ref.pr - comp->origin.pr);
+ *y = comp->origin.y + r * (comp->ref.y - comp->origin.y);
+}
+
+static const Compressor *
+selected_compressor(UI *ui) {
+ return &ui->comps[ui->comp_select.idx];
+}
+
void
insert_point(UI *ui, int idx) {
int i;
diff --git a/util.h b/util.h
index 501d11e..052a106 100644
--- a/util.h
+++ b/util.h
@@ -2,5 +2,14 @@
#define min(a, b) ((a < b) ? a : b)
#define max(a, b) ((a > b) ? a : b)
+#define expect(x) do { \
+ if (!(x)) { \
+ fprintf(stderr, "Fatal error: %s:%d: assertion '%s' failed\n", \
+ __FILE__, __LINE__, #x); \
+ abort(); \
+ } \
+ } while (0)
+
+
void free_arr(void **arr, int n);
int lsearch(const void *key, const void *base, size_t n, size_t size, int (*cmp)(const void *keyval, const void *datum));
diff --git a/widget.c b/widget.c
index 5c6cb4b..613d834 100644
--- a/widget.c
+++ b/widget.c
@@ -12,12 +12,11 @@
#include "widget.h"
#include "util.h"
#include "eprintf.h"
+#include "color.h"
#define FORMAT "%.5g"
-static const mu_Color RED = {255, 0, 0, 255};
-static const mu_Color WHITE = {255, 255, 255, 255};
static const char *sc_selected_name(w_Select_Compressor *select);
static int select_compressor_active(mu_Context *ctx, w_Select_Compressor *select);
@@ -387,6 +386,20 @@ render_canvas(w_Canvas *canvas) {
}
void
-w_canvas_draw_circle(w_Canvas canvas, int x, int y, int r, mu_Color color) {
- r_canvas_draw_circle(canvas.id, x, y, r, color);
+w_canvas_draw_circle(w_Canvas *canvas, int x, int y, int r, mu_Color color) {
+ r_canvas_draw_circle(canvas->id, x, y, r, color);
+ canvas->dirty = 1;
+}
+
+void
+w_clear_canvas(w_Canvas *canvas) {
+ r_clear_canvas(canvas->id);
+ canvas->dirty = 1;
+}
+
+/* Set the background image of the canvas. Returns non-zero on error. */
+int
+w_canvas_set_bg(w_Canvas *canvas, const char *path) {
+ r_remove_canvas(canvas->id);
+ return w_init_canvas(canvas, path);
}
diff --git a/widget.h b/widget.h
index 87ef504..802e8ba 100644
--- a/widget.h
+++ b/widget.h
@@ -85,4 +85,6 @@ typedef struct {
int w_init_canvas(w_Canvas *c, const char *bg_img_path);
void w_free_canvas(w_Canvas *c);
void w_canvas(mu_Context *ctx, w_Canvas *canvas);
-void w_canvas_draw_circle(w_Canvas canvas, int x, int y, int r, mu_Color color);
+void w_canvas_draw_circle(w_Canvas *canvas, int x, int y, int r, mu_Color color);
+void w_clear_canvas(w_Canvas *canvas);
+int w_canvas_set_bg(w_Canvas *canvas, const char *path);
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-22 09:30:50 +0000