aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2011-02-11 18:37:00 +0100
committerPřemysl Janouch <p.janouch@gmail.com>2011-02-11 18:37:00 +0100
commit299ce010bd8f2f5a65e4fa5a033a122b318b8c83 (patch)
tree3ceb61879650472395d20342a8007306182f03b2 /share
parent2c5f2f5b3f4782b25b35f1afc3ab63dd19b48a28 (diff)
downloadlogdiag-299ce010bd8f2f5a65e4fa5a033a122b318b8c83.tar.gz
logdiag-299ce010bd8f2f5a65e4fa5a033a122b318b8c83.tar.xz
logdiag-299ce010bd8f2f5a65e4fa5a033a122b318b8c83.zip
Update the symbol library.
* Add bipolar, IGFET and JFET transistors. * Add more variants to some symbols. * Add a symbol for a simple terminal. * Avoid unneccessary stroke() calls. * Fix comments.
Diffstat (limited to 'share')
-rw-r--r--share/library/Active/bipolar.lua73
-rw-r--r--share/library/Active/category.json5
-rw-r--r--share/library/Active/icon.svg53
-rw-r--r--share/library/Active/igfet.lua73
-rw-r--r--share/library/Active/jfet.lua63
-rw-r--r--share/library/Logical/and.lua8
-rw-r--r--share/library/Logical/not.lua8
-rw-r--r--share/library/Logical/or.lua7
-rw-r--r--share/library/Misc/ground.lua2
-rw-r--r--share/library/Misc/lamp.lua7
-rw-r--r--share/library/Misc/power-source.lua4
-rw-r--r--share/library/Misc/switch.lua8
-rw-r--r--share/library/Misc/terminal.lua29
-rw-r--r--share/library/Passive/capacitor.lua34
-rw-r--r--share/library/Passive/diode.lua98
-rw-r--r--share/library/Passive/inductor.lua14
-rw-r--r--share/library/Passive/resistor.lua76
17 files changed, 507 insertions, 55 deletions
diff --git a/share/library/Active/bipolar.lua b/share/library/Active/bipolar.lua
new file mode 100644
index 0000000..f08983f
--- /dev/null
+++ b/share/library/Active/bipolar.lua
@@ -0,0 +1,73 @@
+-- Symbol names
+local names_npn =
+{
+ en = "NPN transistor",
+ cs = "Tranzistor NPN"
+}
+
+local names_pnp =
+{
+ en = "PNP transistor",
+ cs = "Tranzistor PNP"
+}
+
+-- Render area in base units (X1, Y1, X2, Y2)
+local area = {-2, -2, 2, 2}
+
+-- Terminal points
+local terminals = {{-2, 0}, {2, 2}, {2, -2}}
+
+-- Rendering
+local render = function (cr)
+ -- The terminals
+ cr.move_to (-2, 0)
+ cr.line_to (0, 0)
+
+ cr.move_to (0, 0.5)
+ cr.line_to (2, 2)
+
+ cr.move_to (0, -0.5)
+ cr.line_to (2, -2)
+
+ -- The ohmic connection
+ cr.move_to (0, -1)
+ cr.line_to (0, 1)
+
+ cr.stroke ()
+end
+
+local render_npn = function (cr)
+ render (cr)
+
+ cr.save ()
+ cr.translate (0, -0.5)
+ cr.rotate (math.atan2 (-2, -1.5))
+
+ cr.move_to (-0.4, 0.8)
+ cr.line_to (0, 1.4)
+ cr.line_to (0.4, 0.8)
+
+ cr.stroke ()
+ cr.restore ()
+end
+
+local render_pnp = function (cr)
+ render (cr)
+
+ cr.save ()
+ cr.translate (2, -2)
+ cr.rotate (math.atan2 (2, 1.5))
+
+ cr.move_to (-0.4, 1.3)
+ cr.line_to (0, 1.9)
+ cr.line_to (0.4, 1.3)
+
+ cr.stroke ()
+ cr.restore ()
+end
+
+-- Register the symbols
+logdiag.register ("NPN", names_npn, area, terminals, render_npn)
+logdiag.register ("PNP", names_pnp, area, terminals, render_pnp)
+
+
diff --git a/share/library/Active/category.json b/share/library/Active/category.json
new file mode 100644
index 0000000..1f8cd4a
--- /dev/null
+++ b/share/library/Active/category.json
@@ -0,0 +1,5 @@
+{
+ "en": "Active",
+ "cs": "Aktivní"
+}
+
diff --git a/share/library/Active/icon.svg b/share/library/Active/icon.svg
new file mode 100644
index 0000000..66f74ec
--- /dev/null
+++ b/share/library/Active/icon.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ width="128"
+ height="128"
+ id="svg2">
+ <defs
+ id="defs4" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(-3,-1)"
+ id="g3774"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+ <path
+ d="m 20,63 45,0"
+ id="path3764"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 65,38 0,50"
+ id="path3766"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="M 65,53 110,23"
+ id="path3768"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 65,73 45,30"
+ id="path3770"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 82,31 15,0 -5,15"
+ id="path3772"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ </g>
+</svg>
diff --git a/share/library/Active/igfet.lua b/share/library/Active/igfet.lua
new file mode 100644
index 0000000..4479269
--- /dev/null
+++ b/share/library/Active/igfet.lua
@@ -0,0 +1,73 @@
+-- Symbol names
+local names_igfet_n =
+{
+ en = "N-channel IGFET transistor",
+ cs = "Tranzistor IGFET s kanálem N"
+}
+
+local names_igfet_p =
+{
+ en = "P-channel IGFET transistor",
+ cs = "Tranzistor IGFET s kanálem P"
+}
+
+-- Render area in base units (X1, Y1, X2, Y2)
+local area = {-2, -1.5, 2, 1.5}
+
+-- Terminal points
+local terminals = {{-2, 1}, {2, 1}, {2, 0}, {2, -1}}
+
+-- Rendering
+local render = function (cr)
+ -- The terminals
+ cr.move_to (-2, 1)
+ cr.line_to (-0.3, 1)
+ cr.line_to (-0.3, -1)
+
+ cr.move_to (0, 1)
+ cr.line_to (2, 1)
+
+ cr.move_to (0, 0)
+ cr.line_to (2, 0)
+
+ cr.move_to (0, -1)
+ cr.line_to (2, -1)
+
+ -- Source, gate, drain
+ cr.move_to (0, -1.5)
+ cr.line_to (0, -0.5)
+
+ cr.move_to (0, -0.3)
+ cr.line_to (0, 0.3)
+
+ cr.move_to (0, 0.5)
+ cr.line_to (0, 1.5)
+
+ cr.stroke ()
+end
+
+local render_igfet_n = function (cr)
+ render (cr)
+
+ cr.move_to (0.9, -0.4)
+ cr.line_to (0.4, 0)
+ cr.line_to (0.9, 0.4)
+
+ cr.stroke ()
+end
+
+local render_igfet_p = function (cr)
+ render (cr)
+
+ cr.move_to (0.4, -0.4)
+ cr.line_to (0.9, 0)
+ cr.line_to (0.4, 0.4)
+
+ cr.stroke ()
+end
+
+-- Register the symbols
+logdiag.register ("IGFET-N", names_igfet_n, area, terminals, render_igfet_n)
+logdiag.register ("IGFET-P", names_igfet_p, area, terminals, render_igfet_p)
+
+
diff --git a/share/library/Active/jfet.lua b/share/library/Active/jfet.lua
new file mode 100644
index 0000000..30c0eb9
--- /dev/null
+++ b/share/library/Active/jfet.lua
@@ -0,0 +1,63 @@
+-- Symbol names
+local names_jfet_n =
+{
+ en = "N-channel JFET transistor",
+ cs = "Tranzistor JFET s kanálem N"
+}
+
+local names_jfet_p =
+{
+ en = "P-channel JFET transistor",
+ cs = "Tranzistor JFET s kanálem P"
+}
+
+-- Render area in base units (X1, Y1, X2, Y2)
+local area = {-2, -1.5, 2, 1.5}
+
+-- Terminal points
+local terminals = {{-2, 1}, {2, 1}, {2, -1}}
+
+-- Rendering
+local render = function (cr)
+ -- The terminals
+ cr.move_to (-2, 1)
+ cr.line_to (0, 1)
+
+ cr.move_to (0, 1)
+ cr.line_to (2, 1)
+
+ cr.move_to (0, -1)
+ cr.line_to (2, -1)
+
+ -- The ohmic connection
+ cr.move_to (0, -1.5)
+ cr.line_to (0, 1.5)
+
+ cr.stroke ()
+end
+
+local render_jfet_n = function (cr)
+ render (cr)
+
+ cr.move_to (-1, 0.6)
+ cr.line_to (-0.5, 1)
+ cr.line_to (-1, 1.4)
+
+ cr.stroke ()
+end
+
+local render_jfet_p = function (cr)
+ render (cr)
+
+ cr.move_to (-0.4, 0.6)
+ cr.line_to (-1, 1)
+ cr.line_to (-0.4, 1.4)
+
+ cr.stroke ()
+end
+
+-- Register the symbols
+logdiag.register ("JFET-N", names_jfet_n, area, terminals, render_jfet_n)
+logdiag.register ("JFET-P", names_jfet_p, area, terminals, render_jfet_p)
+
+
diff --git a/share/library/Logical/and.lua b/share/library/Logical/and.lua
index c169075..4da8aad 100644
--- a/share/library/Logical/and.lua
+++ b/share/library/Logical/and.lua
@@ -8,7 +8,7 @@ local names =
-- Render area in base units (X1, Y1, X2, Y2)
local area = {-4, -2, 5, 2}
--- Terminals
+-- Terminal points
local terminals = {{-4, -1}, {-4, 1}, {5, 0}}
-- Rendering
@@ -19,19 +19,17 @@ local render = function (cr)
cr.arc (1, 0, 2, math.pi * 1.5, math.pi * 0.5)
cr.line_to (-2, 2)
cr.close_path ()
- cr.stroke ()
- -- The contacts
+ -- The terminals
cr.move_to (-4, -1)
cr.line_to (-2, -1)
- cr.stroke ()
cr.move_to (-4, 1)
cr.line_to (-2, 1)
- cr.stroke ()
cr.move_to (3, 0)
cr.line_to (5, 0)
+
cr.stroke ()
end
diff --git a/share/library/Logical/not.lua b/share/library/Logical/not.lua
index e37880e..89d2a2a 100644
--- a/share/library/Logical/not.lua
+++ b/share/library/Logical/not.lua
@@ -8,7 +8,7 @@ local names =
-- Render area in base units (X1, Y1, X2, Y2)
local area = {-4, -2, 4, 2}
--- Terminals
+-- Terminal points
local terminals = {{-4, 0}, {4, 0}}
-- Rendering
@@ -18,20 +18,18 @@ local render = function (cr)
cr.line_to (2, 0)
cr.line_to (-2, 2)
cr.close_path ()
- cr.stroke ()
-- The circle
cr.new_sub_path ()
cr.arc (2.25, 0, 0.25, 0, 2 * math.pi)
- cr.stroke ()
- -- The contacts
+ -- The terminals
cr.move_to (-4, 0)
cr.line_to (-2, 0)
- cr.stroke ()
cr.move_to (2.5, 0)
cr.line_to (4, 0)
+
cr.stroke ()
end
diff --git a/share/library/Logical/or.lua b/share/library/Logical/or.lua
index 49ccd6c..96d4f76 100644
--- a/share/library/Logical/or.lua
+++ b/share/library/Logical/or.lua
@@ -8,7 +8,7 @@ local names =
-- Render area in base units (X1, Y1, X2, Y2)
local area = {-4, -2, 5, 2}
--- Terminals
+-- Terminal points
local terminals = {{-4, -1}, {-4, 1}, {5, 0}}
-- Rendering
@@ -22,7 +22,7 @@ local render = function (cr)
cr.curve_to (-1, 1, -1, -1, -2, -2)
cr.stroke ()
- -- The contacts
+ -- The terminals
cr.save ()
-- Crop the contacts according to
@@ -36,12 +36,11 @@ local render = function (cr)
cr.move_to (-4, -1)
cr.line_to (-1, -1)
- cr.stroke ()
cr.move_to (-4, 1)
cr.line_to (-1, 1)
- cr.stroke ()
+ cr.stroke ()
cr.restore ()
cr.move_to (3, 0)
diff --git a/share/library/Misc/ground.lua b/share/library/Misc/ground.lua
index 0c36240..0cd352a 100644
--- a/share/library/Misc/ground.lua
+++ b/share/library/Misc/ground.lua
@@ -8,7 +8,7 @@ local names =
-- Render area in base units (X1, Y1, X2, Y2)
local area = {-1, -1, 1, 2}
--- Terminals
+-- Terminal points
local terminals = {{0, -1}}
-- Rendering
diff --git a/share/library/Misc/lamp.lua b/share/library/Misc/lamp.lua
index 9ecf9ea..e80683f 100644
--- a/share/library/Misc/lamp.lua
+++ b/share/library/Misc/lamp.lua
@@ -8,7 +8,7 @@ local names =
-- Render area in base units (X1, Y1, X2, Y2)
local area = {-2, -1, 2, 1}
--- Terminals
+-- Terminal points
local terminals = {{-2, 0}, {2, 0}}
-- Rendering
@@ -25,16 +25,17 @@ local render = function (cr)
cr.move_to (1, -1)
cr.line_to (-1, 1)
- cr.stroke ()
+ cr.stroke ()
cr.restore ()
- -- The contacts
+ -- The terminals
cr.move_to (-2, 0)
cr.line_to (-1, 0)
cr.move_to (1, 0)
cr.line_to (2, 0)
+
cr.stroke ()
end
diff --git a/share/library/Misc/power-source.lua b/share/library/Misc/power-source.lua
index 00a8498..c79b0ac 100644
--- a/share/library/Misc/power-source.lua
+++ b/share/library/Misc/power-source.lua
@@ -8,7 +8,7 @@ local names =
-- Render area in base units (X1, Y1, X2, Y2)
local area = {-1, -2, 1, 2}
--- Terminals
+-- Terminal points
local terminals = {{-1, 0}, {1, 0}}
-- Rendering
@@ -20,7 +20,7 @@ local render = function (cr)
cr.move_to (0.2, -2)
cr.line_to (0.2, 2)
- -- The contacts
+ -- The terminals
cr.move_to (-1, 0)
cr.line_to (-0.2, 0)
diff --git a/share/library/Misc/switch.lua b/share/library/Misc/switch.lua
index c4d031e..06ca771 100644
--- a/share/library/Misc/switch.lua
+++ b/share/library/Misc/switch.lua
@@ -8,16 +8,16 @@ local names =
-- Render area in base units (X1, Y1, X2, Y2)
local area = {-2, -1.5, 2, 0}
--- Terminals
+-- Terminal points
local terminals = {{-2, 0}, {2, 0}}
-- Rendering
-local render_normal = function (cr)
+local render = function (cr)
-- The switch contact
cr.move_to (1.3, -1.3)
cr.line_to (-1, 0)
- -- The contacts
+ -- The terminals
cr.move_to (-2, 0)
cr.line_to (-1, 0)
@@ -28,6 +28,6 @@ local render_normal = function (cr)
end
-- Register the symbol
-logdiag.register ("Switch", names, area, terminals, render_normal)
+logdiag.register ("Switch", names, area, terminals, render)
diff --git a/share/library/Misc/terminal.lua b/share/library/Misc/terminal.lua
new file mode 100644
index 0000000..fe21f83
--- /dev/null
+++ b/share/library/Misc/terminal.lua
@@ -0,0 +1,29 @@
+-- Symbol name
+local names =
+{
+ en = "Terminal",
+ cs = "Terminál"
+}
+
+-- Render area in base units (X1, Y1, X2, Y2)
+local area = {-1, -0.5, 0.5, 0.5}
+
+-- Terminal points
+local terminals = {{-1, 0}}
+
+-- Rendering
+local render = function (cr)
+ -- The circle
+ cr.arc (0, 0, 0.3, 0, math.pi * 2)
+
+ -- The contact
+ cr.move_to (-1, 0)
+ cr.line_to (-0.3, 0)
+
+ cr.stroke ()
+end
+
+-- Register the symbol
+logdiag.register ("Terminal", names, area, terminals, render)
+
+
diff --git a/share/library/Passive/capacitor.lua b/share/library/Passive/capacitor.lua
index c6abc28..02cf0ce 100644
--- a/share/library/Passive/capacitor.lua
+++ b/share/library/Passive/capacitor.lua
@@ -5,10 +5,17 @@ local names =
cs = "Kondenzátor"
}
+local names_polar =
+{
+ en = "Polarized capacitor",
+ cs = "Polarizovaný kondenzátor"
+}
+
-- Render area in base units (X1, Y1, X2, Y2)
-local area = {-2, -1, 2, 1}
+local area = {-2, -1, 2, 1}
+local area_polar = {-2, -1.5, 2, 1}
--- Terminals
+-- Terminal points
local terminals = {{-2, 0}, {2, 0}}
-- Rendering
@@ -16,23 +23,36 @@ local render = function (cr)
-- The vertical lines
cr.move_to (-0.2, -1)
cr.line_to (-0.2, 1)
- cr.stroke ()
cr.move_to (0.2, -1)
cr.line_to (0.2, 1)
- cr.stroke ()
- -- The contacts
+ -- The terminals
cr.move_to (-2, 0)
cr.line_to (-0.2, 0)
- cr.stroke ()
cr.move_to (0.2, 0)
cr.line_to (2, 0)
+
+ cr.stroke ()
+end
+
+local render_polar = function (cr)
+ render (cr)
+
+ cr.move_to (0.6, -1)
+ cr.line_to (1.4, -1)
+
+ cr.move_to (1, -1.4)
+ cr.line_to (1, -0.6)
+
cr.stroke ()
end
-- Register the symbol
-logdiag.register ("Capacitor", names, area, terminals, render)
+logdiag.register ("Capacitor",
+ names, area, terminals, render)
+logdiag.register ("CapacitorPolarized",
+ names_polar, area_polar, terminals, render_polar)
diff --git a/share/library/Passive/diode.lua b/share/library/Passive/diode.lua
index 06e9b16..4d155f7 100644
--- a/share/library/Passive/diode.lua
+++ b/share/library/Passive/diode.lua
@@ -1,41 +1,117 @@
--- Symbol name
+-- Symbol names
local names =
{
en = "Diode",
cs = "Dioda"
}
+local names_zener =
+{
+ en = "Zener diode",
+ cs = "Zenerova dioda"
+}
+
+local names_led =
+{
+ en = "Light-emitting diode",
+ cs = "Svítivá dioda"
+}
+
+local names_photo =
+{
+ en = "Photodiode",
+ cs = "Fotodioda"
+}
+
-- Render area in base units (X1, Y1, X2, Y2)
-local area = {-2, -1, 2, 1}
+local area = {-2, -1, 2, 1}
+local area_rad = {-2, -2.5, 2, 1}
--- Terminals
+-- Terminal points
local terminals = {{-2, 0}, {2, 0}}
-- Rendering
-local render_normal = function (cr)
+local render = function (cr)
-- The triangle
cr.move_to (-1, -1)
cr.line_to (1, 0)
cr.line_to (-1, 1)
cr.line_to (-1, -1)
- cr.stroke ()
-- The vertical line
cr.move_to (1, 1)
cr.line_to (1, -1)
- cr.stroke ()
- -- The contacts
+ -- The terminals
cr.move_to (-2, 0)
- cr.line_to (-1, 0)
+ cr.line_to (2, 0)
+
cr.stroke ()
+end
+
+local render_zener = function (cr)
+ render (cr)
+
+ cr.move_to (1, 1)
+ cr.line_to (0.5, 1)
- cr.move_to (1, 0)
- cr.line_to (2, 0)
cr.stroke ()
end
+local render_arrow = function (cr)
+ cr.move_to (0, 0)
+ cr.line_to (0, -1.5)
+
+ cr.stroke ()
+
+ cr.move_to (-0.3, -0.7)
+ cr.line_to (0, -1.5)
+ cr.line_to (0.3, -0.7)
+ cr.close_path ()
+
+ cr.fill ()
+end
+
+local render_radiation = function (cr)
+ cr.save ()
+ cr.translate (-0.4, 0)
+ render_arrow (cr)
+ cr.restore ()
+
+ cr.save ()
+ cr.translate (0.4, 0)
+ render_arrow (cr)
+ cr.restore ()
+end
+
+local render_led = function (cr)
+ render (cr)
+
+ cr.save ()
+ cr.translate (-0.3, -1.0)
+ cr.rotate (math.atan2 (1, 1))
+
+ render_radiation (cr)
+
+ cr.restore ()
+end
+
+local render_photo = function (cr)
+ render (cr)
+
+ cr.save ()
+ cr.translate (0.75, -2.05)
+ cr.rotate (math.atan2 (-1, -1))
+
+ render_radiation (cr)
+
+ cr.restore ()
+end
+
-- Register the symbol
-logdiag.register ("Diode", names, area, terminals, render)
+logdiag.register ("Diode", names, area, terminals, render)
+logdiag.register ("DiodeZener", names_zener, area, terminals, render_zener)
+logdiag.register ("DiodeLED", names_led, area_rad, terminals, render_led)
+logdiag.register ("DiodePhoto", names_photo, area_rad, terminals, render_photo)
diff --git a/share/library/Passive/inductor.lua b/share/library/Passive/inductor.lua
index b94f357..b7b64dd 100644
--- a/share/library/Passive/inductor.lua
+++ b/share/library/Passive/inductor.lua
@@ -1,5 +1,5 @@
-- Symbol names
-local names_normal =
+local names =
{
en = "Inductor",
cs = "Cívka"
@@ -14,30 +14,32 @@ local names_core =
-- Render area in base units (X1, Y1, X2, Y2)
local area = {-2, -1, 2, 0}
--- Terminals
+-- Terminal points
local terminals = {{-2, 0}, {2, 0}}
-- Rendering
-local render_normal = function (cr)
+local render = function (cr)
-- The arcs
cr.arc (-1.5, 0, 0.5, math.pi, 0)
cr.arc (-0.5, 0, 0.5, math.pi, 0)
cr.arc (0.5, 0, 0.5, math.pi, 0)
cr.arc (1.5, 0, 0.5, math.pi, 0)
+
cr.stroke ()
end
local render_core = function (cr)
- render_normal (cr)
+ render (cr)
-- The core
cr.move_to (-2, -1)
cr.line_to (2, -1)
+
cr.stroke ()
end
-- Register the symbols
-logdiag.register ("Inductor", names_normal, area, terminals, render_normal)
-logdiag.register ("InductorWithCore", names_core, area, terminals, render_core)
+logdiag.register ("Inductor", names, area, terminals, render)
+logdiag.register ("InductorWithCore", names_core, area, terminals, render_core)
diff --git a/share/library/Passive/resistor.lua b/share/library/Passive/resistor.lua
index 262969b..f59f20e 100644
--- a/share/library/Passive/resistor.lua
+++ b/share/library/Passive/resistor.lua
@@ -5,11 +5,26 @@ local names =
cs = "Rezistor"
}
+local names_adj =
+{
+ en = "Adjustable resistor",
+ cs = "Nastavitelný rezistor"
+}
+
+local names_pot =
+{
+ en = "Potentiometer",
+ cs = "Potenciometr"
+}
+
-- Render area in base units (X1, Y1, X2, Y2)
-local area = {-2, -0.5, 2, 0.5}
+local area = {-2, -0.5, 2, 0.5}
+local area_adj = {-2, -1.5, 2, 1}
+local area_pot = {-2, -2, 2, 0.5}
--- Terminals
-local terminals = {{-2, 0}, {2, 0}}
+-- Terminal points
+local terminals = {{-2, 0}, {2, 0}}
+local terminals_pot = {{-2, 0}, {2, 0}, {2, -2}}
-- Rendering
local render = function (cr)
@@ -19,19 +34,66 @@ local render = function (cr)
cr.line_to (1.5, 0.5)
cr.line_to (-1.5, 0.5)
cr.line_to (-1.5, -0.5)
- cr.stroke ()
- -- The contacts
+ -- The terminals
cr.move_to (-2, 0)
cr.line_to (-1.5, 0)
- cr.stroke ()
cr.move_to (1.5, 0)
cr.line_to (2, 0)
+
cr.stroke ()
end
+local render_adj = function (cr)
+ render (cr)
+
+ -- The arrow
+ cr.move_to (-1, 1)
+ cr.line_to (1, -1)
+
+ cr.stroke ()
+
+ cr.save ()
+ cr.translate (1.5, -1.5)
+ cr.rotate (math.atan2 (1, 1))
+
+ cr.move_to (0, 0)
+ cr.line_to (0.3, 0.8)
+ cr.line_to (-0.3, 0.8)
+ cr.close_path ()
+
+ cr.fill ()
+ cr.restore ()
+end
+
+local render_pot = function (cr)
+ render (cr)
+
+ -- The contact
+ cr.move_to (0, -2)
+ cr.line_to (2, -2)
+
+ -- The arrow
+ cr.move_to (0, -2)
+ cr.line_to (0, -1)
+
+ cr.stroke ()
+
+ cr.move_to (0, -0.5)
+ cr.line_to (0.3, -1.3)
+ cr.line_to (-0.3, -1.3)
+ cr.close_path ()
+
+ cr.fill ()
+end
+
-- Register the symbol
-logdiag.register ("Resistor", names, area, terminals, render)
+logdiag.register ("Resistor",
+ names, area, terminals, render)
+logdiag.register ("ResistorAdjustable",
+ names_adj, area_adj, terminals, render_adj)
+logdiag.register ("Potentiometer",
+ names_pot, area_pot, terminals_pot, render_pot)