From a0ca7ab5421d001f50fabbc6c139ded380f597d8 Mon Sep 17 00:00:00 2001 From: David Vazgenovich Shakaryan Date: Fri, 27 May 2022 16:12:46 -0700 Subject: web: refactor svg drawing and related code --- board.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'board.h') diff --git a/board.h b/board.h index cc60e62..6e06993 100644 --- a/board.h +++ b/board.h @@ -25,17 +25,17 @@ // distance from centre to apex of outer wire // must be ordered outwards from centre #define FOREACH_RING(M) \ - M(BULL, INNER_DIAMETER_BULL/2 + WIRE_WIDTH/2) \ - M(25, INNER_DIAMETER_25/2 + WIRE_WIDTH/2) \ + M(BULL, (INNER_DIAMETER_BULL / 2) + (WIRE_WIDTH / 2)) \ + M(25, (INNER_DIAMETER_25 / 2) + (WIRE_WIDTH / 2)) \ M(SMALL, TREBLE_OUTER_EDGE - WIRE_WIDTH - TREBLE_INSIDE_WIDTH - \ - WIRE_WIDTH/2) \ - M(TREBLE, TREBLE_OUTER_EDGE - WIRE_WIDTH/2) \ + (WIRE_WIDTH / 2)) \ + M(TREBLE, TREBLE_OUTER_EDGE - (WIRE_WIDTH / 2)) \ M(BIG, DOUBLE_OUTER_EDGE - WIRE_WIDTH - DOUBLE_INSIDE_WIDTH - \ - WIRE_WIDTH/2) \ - M(DOUBLE, DOUBLE_OUTER_EDGE - WIRE_WIDTH/2) + (WIRE_WIDTH / 2)) \ + M(DOUBLE, DOUBLE_OUTER_EDGE - (WIRE_WIDTH / 2)) #define GEN_RING_ENUM(X, D) R_ ## X, #define GEN_RING_STR(X, D) #X, -#define GEN_RING_OUTER_DIST(X, D) D, +#define GEN_RING_OUTER_DIST(X, D) (D), extern int SECTORS[]; extern double OUTER_DISTS[]; -- cgit v1.2.3-70-g09d2