From b8a7adb58fd29b6a3cd4f9394182ff87bd5611f5 Mon Sep 17 00:00:00 2001 From: LordBaryhobal Date: Sun, 10 Nov 2024 01:40:32 +0100 Subject: [PATCH] fixed wrong capacitor symbol (no comment...) --- src/electrical.typ | 2 + src/elements/electrical/capacitor.typ | 94 +++++++++++++++++++++++++-- src/elements/electrical/resistor.typ | 63 ++++++++++-------- src/lib.typ | 1 + 4 files changed, 130 insertions(+), 30 deletions(-) create mode 100644 src/electrical.typ diff --git a/src/electrical.typ b/src/electrical.typ new file mode 100644 index 0000000..ea5539c --- /dev/null +++ b/src/electrical.typ @@ -0,0 +1,2 @@ +#import "elements/electrical/capacitor.typ": capacitor +#import "elements/electrical/resistor.typ": resistor \ No newline at end of file diff --git a/src/elements/electrical/capacitor.typ b/src/elements/electrical/capacitor.typ index 26a4ea5..083cccf 100644 --- a/src/elements/electrical/capacitor.typ +++ b/src/elements/electrical/capacitor.typ @@ -2,8 +2,79 @@ #import "../element.typ" #import "../ports.typ": add-port -#let draw-shape(id, tl, tr, br, bl, fill, stroke) = { - let f = draw.rect(tl, br, name: id, stroke: stroke, fill: fill) +#let draw-shape( + id, tl, tr, br, bl, + fill, stroke, + vertical: false, + gap: 0.2, + scales: (100%, 100%), + symbols: (none, none) +) = { + let (x0, y0) = tl + let (x1, y1) = br + + let w = x1 - x0 + let h = y1 - y0 + + let (o0, s0) = if vertical {(y0, h)} else {(x0, w)} + let (o1, s1) = if vertical {(x0, w)} else {(y0, h)} + let m1 = o1 + s1 / 2 + + let pt(i, j) = if vertical { + (j, i) + } else { + (i, j) + } + + let size0 = s1 * scales.first() / 100% + let size1 = s1 * scales.last() / 100% + + if type(gap) == ratio { + gap = gap / 100% + } else { + gap = gap / calc.abs(s0) + } + let r0 = 0.5 - gap / 2 + let r1 = 0.5 + gap / 2 + + // Coordinates in (main axis, secondary axis) format + let p0 = pt(o0, m1) + let p1 = pt(o0 + r0 * s0, m1) + let p2 = pt(o0 + r1 * s0, m1) + let p3 = pt(o0 + s0, m1) + + let p4 = pt(o0 + r0 * s0, m1 - size0 / 2) + let p5 = pt(o0 + r0 * s0, m1 + size0 / 2) + + let p6 = pt(o0 + r1 * s0, m1 - size1 / 2) + let p7 = pt(o0 + r1 * s0, m1 + size1 / 2) + + let line = draw.line.with(stroke: stroke) + let f = draw.group(name: id, { + line(p0, p1) + line(p2, p3) + line(p4, p5) + line(p6, p7) + + if symbols.first() != none { + draw.content( + p1, + symbols.first(), + anchor: if vertical {"south-west"} else {"south-east"}, + padding: 2pt + ) + } + + if symbols.last() != none { + draw.content( + p2, + symbols.last(), + anchor: if vertical {"north-west"} else {"south-west"}, + padding: 2pt + ) + } + }) + return (f, tl, tr, br, bl) } @@ -11,7 +82,14 @@ /// /// #examples.capacitor /// For other parameters description, see #doc-ref("element.elmt") -/// - vertical (bool): Whether the element is vertical or horizontal. If false, port 0 is placed on the west side and port 1 on the east. If true, they are on the north, respectively the south sides +/// - vertical (bool): Whether the element is vertical or horizontal. +/// - If false, port 0 is placed on the west side and port 1 on the east.\ +/// - If true, they are on the north, respectively the south sides +/// - gap (number, ratio): The gap between both sides +/// - if it is a number (int or float), it is interpreted as an absolute canvas-unit length +/// - if it is a ratio, it is interpreted as proportional to the capacitor's length (width if horizontal, height if vertical) +/// - scales (array): A pair of ratios, the sizes of the sides relative to the capacitor's height (width if vertical). +/// - symbols (array): A pair of content or strings (or none values) to attach on the sides of the capacitor #let capacitor( x: none, y: none, @@ -20,6 +98,9 @@ name: none, name-anchor: "center", vertical: false, + gap: 0.2, + scales: (100%, 100%), + symbols: (none, none), fill: none, stroke: black + 1pt, id: "", @@ -36,7 +117,12 @@ )} element.elmt( - draw-shape: draw-shape.with(), + draw-shape: draw-shape.with( + vertical: vertical, + gap: gap, + scales: scales, + symbols: symbols + ), x: x, y: y, w: w, diff --git a/src/elements/electrical/resistor.typ b/src/elements/electrical/resistor.typ index f8040f6..4b5228c 100644 --- a/src/elements/electrical/resistor.typ +++ b/src/elements/electrical/resistor.typ @@ -5,39 +5,50 @@ #let draw-shape( id, tl, tr, br, bl, fill, stroke, - zigzags: 7, + zigzags: 6, vertical: false ) = { - let (x, y) = bl - let (width, height) = (tr.at(0) - x, tr.at(1) - y) + let (x0, y0) = tl + let (x1, y1) = br + + let w = x1 - x0 + let h = y1 - y0 + + let (o0, s0) = if vertical {(y0, h)} else {(x0, w)} + let (o1, s1) = if vertical {(x0, w)} else {(y0, h)} + let m1 = o1 + s1 / 2 + + let pt(i, j) = if vertical { + (j, i) + } else { + (i, j) + } + + let p0 = pt(o0, m1) + let p1 = pt(o0 + 0.2 * s0, m1) + let p2 = pt(o0 + 0.8 * s0, m1) + let p3 = pt(o0 + s0, m1) + + if zigzags == none { + let p4 = pt(o0 + 0.2 * s0, o1) + let p5 = pt(o0 + 0.8 * s0, o1 + s1) + let f = draw.group(name: id, { + draw.line(p0, p1) + draw.line(p2, p3) + draw.rect(p4, p5, stroke: stroke, fill: fill) + }) + return (f, tl, tr, br, bl) + } - let pts = if vertical {( - (x + width / 2, y), - (x + width / 2, y + height * 0.2), - )} else {( - (x, y + height / 2), - (x + width * 0.2, y + height / 2), - )} + let pts = (p0, p1) for i in range(zigzags) { let r = ((i+0.5) / zigzags * 0.6 + 0.2) - let pos = if vertical {( - x + width * calc.rem(i, 2), - r * height + y - )} else {( - r * width + x, - y + height * calc.rem(i, 2) - )} + let pos = pt(o0 + r * s0, o1 + s1 * calc.rem(i, 2)) pts.push(pos) } - pts += if vertical {( - (x + width / 2, y + height * 0.8), - (x + width / 2, y + height), - )} else {( - (x + width * 0.8, y + height / 2), - (x + width, y + height / 2), - )} + pts += (p2, p3) let f = draw.group(name: id, { draw.line(..pts, stroke: stroke) @@ -50,7 +61,7 @@ /// #examples.resistor /// For other parameters description, see #doc-ref("element.elmt") /// - vertical (bool): Whether the element is vertical or horizontal. If false, port 0 is placed on the west side and port 1 on the east. If true, they are on the north, respectively the south sides -/// - zigzags (number): Number of zigzags to draw +/// - zigzags (number, none): Number of zigzags to draw. If none, a rectangle is drawn #let resistor( x: none, y: none, @@ -59,7 +70,7 @@ name: none, name-anchor: "center", vertical: false, - zigzags: 7, + zigzags: 6, fill: none, stroke: black + 1pt, id: "", diff --git a/src/lib.typ b/src/lib.typ index a5177a3..c356d27 100644 --- a/src/lib.typ +++ b/src/lib.typ @@ -1,6 +1,7 @@ #let version = version(0, 1, 0) #import "circuit.typ": circuit +#import "electrical.typ" #import "element.typ" #import "gates.typ" #import "util.typ"