From b581e494b06da36825cd3b9618838bfe9e4d28b6 Mon Sep 17 00:00:00 2001 From: Naveen Michaud-Agrawal Date: Mon, 25 Sep 2023 21:17:54 -0400 Subject: Add filled circles --- virtual-programs/display.folk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'virtual-programs') diff --git a/virtual-programs/display.folk b/virtual-programs/display.folk index 674cf1f7..b07ec644 100644 --- a/virtual-programs/display.folk +++ b/virtual-programs/display.folk @@ -16,8 +16,8 @@ namespace eval ::Display { uplevel [list Wish display runs [list Display::stroke $points $width $color] on layer $::Display::LAYER] } - proc circle {x y radius thickness color} { - uplevel [list Wish display runs [list Display::circle $x $y $radius $thickness $color] on layer $::Display::LAYER] + proc circle {x y radius thickness color {filled false}} { + uplevel [list Wish display runs [list Display::circle $x $y $radius $thickness $color $filled] on layer $::Display::LAYER] } proc text args { -- cgit v1.2.3 From d01e2422a574842cc086b8167c5240eb9f500f74 Mon Sep 17 00:00:00 2001 From: Naveen Michaud-Agrawal Date: Mon, 25 Sep 2023 23:25:58 -0400 Subject: Send a list of commands to display --- virtual-programs/display.folk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'virtual-programs') diff --git a/virtual-programs/display.folk b/virtual-programs/display.folk index b07ec644..b1610742 100644 --- a/virtual-programs/display.folk +++ b/virtual-programs/display.folk @@ -54,6 +54,8 @@ On process { [list /someone/ wishes display runs /command/ on layer /layer/] Wish $::thisProcess receives statements like \ [list /someone/ wishes display runs /command/] + Wish $::thisProcess receives statements like \ + [list /someone/ wishes display runs list /commands/] Wish $::thisProcess shares statements like \ [list /someone/ claims the display time is /displayTime/] @@ -65,6 +67,11 @@ On process { foreach match [Statements::findMatches {/someone/ wishes display runs /command/}] { lappend displayList [list 0 [dict get $match command]] } + foreach match [Statements::findMatches {/someone/ wishes display runs list /commands/}] { + foreach command [dict get $match commands] { + lappend displayList [list 0 $command] + } + } proc lcomp {a b} { set layerA [lindex $a 0] -- cgit v1.2.3 From e065cc16657118014dcf43d9f49146e9cc99f534 Mon Sep 17 00:00:00 2001 From: Omar Rizwan Date: Tue, 26 Sep 2023 16:16:19 -0400 Subject: display: Revert display list stuff for now --- virtual-programs/display.folk | 7 ------- 1 file changed, 7 deletions(-) (limited to 'virtual-programs') diff --git a/virtual-programs/display.folk b/virtual-programs/display.folk index b1610742..b07ec644 100644 --- a/virtual-programs/display.folk +++ b/virtual-programs/display.folk @@ -54,8 +54,6 @@ On process { [list /someone/ wishes display runs /command/ on layer /layer/] Wish $::thisProcess receives statements like \ [list /someone/ wishes display runs /command/] - Wish $::thisProcess receives statements like \ - [list /someone/ wishes display runs list /commands/] Wish $::thisProcess shares statements like \ [list /someone/ claims the display time is /displayTime/] @@ -67,11 +65,6 @@ On process { foreach match [Statements::findMatches {/someone/ wishes display runs /command/}] { lappend displayList [list 0 [dict get $match command]] } - foreach match [Statements::findMatches {/someone/ wishes display runs list /commands/}] { - foreach command [dict get $match commands] { - lappend displayList [list 0 $command] - } - } proc lcomp {a b} { set layerA [lindex $a 0] -- cgit v1.2.3