From 299ce010bd8f2f5a65e4fa5a033a122b318b8c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Fri, 11 Feb 2011 18:37:00 +0100 Subject: 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. --- share/library/Passive/capacitor.lua | 34 ++++++++++--- share/library/Passive/diode.lua | 98 ++++++++++++++++++++++++++++++++----- share/library/Passive/inductor.lua | 14 +++--- share/library/Passive/resistor.lua | 76 +++++++++++++++++++++++++--- 4 files changed, 191 insertions(+), 31 deletions(-) (limited to 'share/library/Passive') 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) -- cgit v1.2.3