From a1b79a55d2d70660aa156da460ee2e55ebc99183 Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Sun, 12 Aug 2012 06:10:27 +0200 Subject: Change how Cairo is presented to Lua scripts. Makes the whole thing a bit more stable and less weird. --- share/library/Active/bipolar.lua | 50 ++++++++++++++++++------------------- share/library/Active/igfet.lua | 54 ++++++++++++++++++++-------------------- share/library/Active/jfet.lua | 38 ++++++++++++++-------------- 3 files changed, 71 insertions(+), 71 deletions(-) (limited to 'share/library/Active') diff --git a/share/library/Active/bipolar.lua b/share/library/Active/bipolar.lua index 921772c..bac8786 100644 --- a/share/library/Active/bipolar.lua +++ b/share/library/Active/bipolar.lua @@ -26,50 +26,50 @@ 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 (-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) - 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:move_to (0, -1) + cr:line_to (0, 1) - cr.stroke () + 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: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:move_to (-0.4, 0.8) + cr:line_to (0, 1.4) + cr:line_to (0.4, 0.8) - cr.stroke () - cr.restore () + 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: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:move_to (-0.4, 1.3) + cr:line_to (0, 1.9) + cr:line_to (0.4, 1.3) - cr.stroke () - cr.restore () + cr:stroke () + cr:restore () end -- Register the symbols diff --git a/share/library/Active/igfet.lua b/share/library/Active/igfet.lua index 8b5796d..3e17183 100644 --- a/share/library/Active/igfet.lua +++ b/share/library/Active/igfet.lua @@ -27,59 +27,59 @@ local terminals_p = {{-2, -1}, {2, 1}, {2, 0}, {2, -1}} -- Rendering local render = function (cr) -- The terminals - cr.move_to (-0.3, 1) - cr.line_to (-0.3, -1) + cr:move_to (-0.3, 1) + cr:line_to (-0.3, -1) - cr.move_to (0, 1) - cr.line_to (2, 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, 0) + cr:line_to (2, 0) - cr.move_to (0, -1) - cr.line_to (2, -1) + 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, -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.3) + cr:line_to (0, 0.3) - cr.move_to (0, 0.5) - cr.line_to (0, 1.5) + cr:move_to (0, 0.5) + cr:line_to (0, 1.5) - cr.stroke () + cr:stroke () end local render_n = function (cr) render (cr) -- The left-side terminal - cr.move_to (-2, 1) - cr.line_to (-0.3, 1) + cr:move_to (-2, 1) + cr:line_to (-0.3, 1) -- The arrow - cr.move_to (0.9, -0.4) - cr.line_to (0.4, 0) - cr.line_to (0.9, 0.4) + cr:move_to (0.9, -0.4) + cr:line_to (0.4, 0) + cr:line_to (0.9, 0.4) - cr.stroke () + cr:stroke () end local render_p = function (cr) render (cr) -- The left-side terminal - cr.move_to (-2, -1) - cr.line_to (-0.3, -1) + cr:move_to (-2, -1) + cr:line_to (-0.3, -1) -- The arrow - cr.move_to (0.4, -0.4) - cr.line_to (0.9, 0) - cr.line_to (0.4, 0.4) + cr:move_to (0.4, -0.4) + cr:line_to (0.9, 0) + cr:line_to (0.4, 0.4) - cr.stroke () + cr:stroke () end -- Register the symbols diff --git a/share/library/Active/jfet.lua b/share/library/Active/jfet.lua index ebe917a..5fb9d47 100644 --- a/share/library/Active/jfet.lua +++ b/share/library/Active/jfet.lua @@ -27,47 +27,47 @@ local terminals_p = {{-2, -1}, {2, 1}, {2, -1}} -- Rendering local render = function (cr) -- The terminals - cr.move_to (0, 1) - cr.line_to (2, 1) + cr:move_to (0, 1) + cr:line_to (2, 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:move_to (0, -1.5) + cr:line_to (0, 1.5) - cr.stroke () + cr:stroke () end local render_n = function (cr) render (cr) -- The left-side terminal - cr.move_to (-2, 1) - cr.line_to (0, 1) + cr:move_to (-2, 1) + cr:line_to (0, 1) -- The arrow - cr.move_to (-1, 0.6) - cr.line_to (-0.5, 1) - cr.line_to (-1, 1.4) + cr:move_to (-1, 0.6) + cr:line_to (-0.5, 1) + cr:line_to (-1, 1.4) - cr.stroke () + cr:stroke () end local render_p = function (cr) render (cr) -- The left-side terminal - cr.move_to (-2, -1) - cr.line_to (0, -1) + cr:move_to (-2, -1) + cr:line_to (0, -1) -- The arrow - cr.move_to (-0.4, -0.6) - cr.line_to (-1, -1) - cr.line_to (-0.4, -1.4) + cr:move_to (-0.4, -0.6) + cr:line_to (-1, -1) + cr:line_to (-0.4, -1.4) - cr.stroke () + cr:stroke () end -- Register the symbols -- cgit v1.2.3-70-g09d2