HEL/circuiteria
4
7 Fork 7
Code Issues 5 Pull Requests 16 Releases 3 Activity

feature: add IEC gates #11

Merged
HEL merged 7 commits from bono/circuiteria:add_iec_gates into dev 2025-06-29 15:19:57 +02:00
Conversation 6 Commits 7 Files Changed 13
+552 -2
bono commented 2025-06-22 19:51:33 +02:00
Contributor
Copy link
Copy source

Hey 👋, here is an initial implementation of the IEC gates I mentioned in #10 .

Feel free to suggest/perform any improvement.

Hey 👋, here is an initial implementation of the IEC gates I mentioned in #10 . Feel free to suggest/perform any improvement.
bono added 2 commits 2025-06-22 19:51:33 +02:00
add iec gates 3ccb79c6c2
add examples 9966656e8b
HEL commented 2025-06-25 00:02:33 +02:00
Owner
Copy link
Copy source

Hey 👋, this looks pretty good, thanks for contributing !
I would just try to simplify the drawing process, since they are basically rectangles (see following comments)

I'll also add examples for the manual in a future PR, or you can copy those for the other gates (see doc/examples.typ)

Hey 👋, this looks pretty good, thanks for contributing ! I would just try to simplify the drawing process, since they are basically rectangles (see following comments) I'll also add examples for the manual in a future PR, or you can copy those for the other gates (see [doc/examples.typ](https://git.kb28.ch/HEL/circuiteria/src/commit/2bb7e3b5a98577297a53d4aefb8732e3dd761f4a/doc/examples.typ#L78-L116))
src/elements/logic/iec_gate.typ
@@ -0,0 +2,4 @@
#import "../ports.typ": add-ports, add-port
#import "../element.typ"
#let default-draw-shape(id, tl, tr, br, bl, fill, stroke, symbol) = {
HEL commented 2025-06-25 00:03:43 +02:00
Owner
Copy link
Copy source

Here you can simplify this function greatly by just drawing a rectangle:

#let draw-shape(id, tl, tr, br, bl, fill, stroke, symbol) = {
  let shapes = draw.rect(
    inset: 0.5em,
    fill: fill,
    stroke: stroke,
    name: id,
    bl, tr
  )
  shapes += draw.content(
    id + ".center",
    [*$ symbol $*]
  )
  return (shapes, tl, tr, br, bl)
}
Here you can simplify this function greatly by just drawing a rectangle: ```typst #let draw-shape(id, tl, tr, br, bl, fill, stroke, symbol) = { let shapes = draw.rect( inset: 0.5em, fill: fill, stroke: stroke, name: id, bl, tr ) shapes += draw.content( id + ".center", [*$ symbol $*] ) return (shapes, tl, tr, br, bl) } ```
bono marked this conversation as resolved
src/elements/logic/iec_gate.typ
@@ -0,0 +112,4 @@
func
let space = 100% / inputs
for i in range(inputs) {
HEL commented 2025-06-25 00:06:28 +02:00
Owner
Copy link
Copy source

This for loop can also be simplified because we don't need to find intersections with the gate's contour (rectangular):

#{  // <- just for syntax highlighting

for i in range(inputs) {
  let pct = (i + 0.5) * space
  let port-pos = (tl, pct, bl)
  let port-name = "in" + str(i)
  if inverted == "all" or port-name in inverted {
    draw.circle(
      port-pos,
      radius: inverted-radius,
      anchor: "east",
      stroke: stroke
    )
    port-pos = (rel: (-2 * inverted-radius, 0), to: port-pos)
  }
  add-port(
    id, "west",
    (id: port-name), port-pos,
    debug: debug.ports
  )
}

}  // <- idem
This for loop can also be simplified because we don't need to find intersections with the gate's contour (rectangular): ```typst #{ // <- just for syntax highlighting for i in range(inputs) { let pct = (i + 0.5) * space let port-pos = (tl, pct, bl) let port-name = "in" + str(i) if inverted == "all" or port-name in inverted { draw.circle( port-pos, radius: inverted-radius, anchor: "east", stroke: stroke ) port-pos = (rel: (-2 * inverted-radius, 0), to: port-pos) } add-port( id, "west", (id: port-name), port-pos, debug: debug.ports ) } } // <- idem ```
bono marked this conversation as resolved
HEL approved these changes 2025-06-25 00:12:53 +02:00
Dismissed
HEL left a comment
Owner
Copy link
Copy source

Typos in documentation refs

Typos in documentation refs
src/elements/logic/iec_buf.typ
@@ -0,0 +2,4 @@
#import "iec_gate.typ" as iec-gate
/// Draws an IEC buffer gate. This function is also available as `element.iec-gate-buf()`
HEL commented 2025-06-25 00:10:02 +02:00
Owner
Copy link
Copy source

Should be element.gate-iec-buf instead of element.iec-gate-buf

Should be `element.gate-iec-buf` instead of `element.iec-gate-buf`
bono marked this conversation as resolved
src/elements/logic/iec_buf.typ
@@ -0,0 +35,4 @@
)
}
/// Draws an IEC NOT gate. This function is also available as `element.iec-gate-not()`
HEL commented 2025-06-25 00:11:04 +02:00
Owner
Copy link
Copy source

Should be element.gate-iec-not instead of element.iec-gate-not

Should be `element.gate-iec-not` instead of `element.iec-gate-not`
bono marked this conversation as resolved
src/elements/logic/iec_or.typ
@@ -0,0 +1,67 @@
#import "@preview/cetz:0.3.2": draw
#import "iec_gate.typ" as iec-gate
/// Draws an IEC-OR gate. This function is also available as `element.iec-gate-or()`
HEL commented 2025-06-25 00:11:32 +02:00
Owner
Copy link
Copy source

Should be element.gate-iec-or instead of element.iec-gate-or

Should be `element.gate-iec-or` instead of `element.iec-gate-or`
bono marked this conversation as resolved
src/elements/logic/iec_or.typ
@@ -0,0 +34,4 @@
)
}
/// Draws an IEC-NOR gate. This function is also available as `element.iec-gate-nor()`
HEL commented 2025-06-25 00:11:44 +02:00
Owner
Copy link
Copy source

Should be element.gate-iec-nor instead of element.iec-gate-nor

Should be `element.gate-iec-nor` instead of `element.iec-gate-nor`
bono marked this conversation as resolved
src/elements/logic/iec_xor.typ
@@ -0,0 +1,67 @@
#import "@preview/cetz:0.3.2": draw
#import "iec_gate.typ" as iec-gate
/// Draws an IEC-XOR gate. This function is also available as `element.iec-gate-xor()`
HEL commented 2025-06-25 00:11:53 +02:00
Owner
Copy link
Copy source

Should be element.gate-iec-xor instead of element.iec-gate-xor

Should be `element.gate-iec-xor` instead of `element.iec-gate-xor`
bono marked this conversation as resolved
src/elements/logic/iec_xor.typ Outdated
@@ -0,0 +34,4 @@
)
}
/// Draws an IEC-NXOR gate. This function is also available as `element.iec-gate-nxor()`
HEL commented 2025-06-25 00:12:06 +02:00
Owner
Copy link
Copy source

Should be element.gate-iec-xnor instead of element.iec-gate-xnor

Should be `element.gate-iec-xnor` instead of `element.iec-gate-xnor`
bono marked this conversation as resolved
HEL requested review from HEL 2025-06-25 00:13:44 +02:00
HEL added the new component label 2025-06-25 00:14:59 +02:00
HEL changed target branch from main to dev 2025-06-25 00:18:19 +02:00
bono added 1 commit 2025-06-28 16:45:40 +02:00
improve default-draw-shape by drawing a rectangle 8c91ccdd54
bono added 2 commits 2025-06-28 18:14:07 +02:00
improve iec-gate c5e4f8039a
rename iec gates to have consistent naming ea8277ee5b
bono added 2 commits 2025-06-28 18:57:15 +02:00
fix typo in xnor gate 71f128f6c9
add examples and add iec gates to manual 94d5d6b854
bono commented 2025-06-28 18:58:14 +02:00
Author
Contributor
Copy link
Copy source

Thanks for your comments, I added all requested changes, so it's ready for review again @HEL

Thanks for your comments, I added all requested changes, so it's ready for review again @HEL
HEL approved these changes 2025-06-29 15:18:45 +02:00
HEL merged commit 693676d61a into dev 2025-06-29 15:19:57 +02:00
bono deleted branch add_iec_gates 2025-06-29 15:22:50 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
HEL
Labels
Clear labels
bug
Something is not working
 documentation
Need to add or update documentation
 duplicate
This issue or pull request already exists
 enhancement
Improvement on existing feature
 feature request
Request for a new feature
 help wanted
Need some help
 invalid
Something is wrong
 new component
Request for a new component
 question
More information is needed
 wontfix
This won't be fixed
No labels new component
Milestone
No items
No Milestone
Assignees
Clear assignees
HEL (Louis Heredero)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: HEL/circuiteria#11