diff options
| author | Omar Rizwan <omar@omar.website> | 2022-10-17 21:40:22 +0000 |
|---|---|---|
| committer | Omar Rizwan <omar@omar.website> | 2022-10-17 21:40:22 +0000 |
| commit | 935d387e86bc5630f402a7f53fc06f862e1d164e (patch) | |
| tree | a5a12410b77213f681ebbc9f7270695d46b0f9d5 /virtual-programs | |
| parent | Start on print docs (diff) | |
| download | folk-935d387e86bc5630f402a7f53fc06f862e1d164e.tar.gz folk-935d387e86bc5630f402a7f53fc06f862e1d164e.zip | |
Better incrementalization of camera/tag/programs
Diffstat (limited to 'virtual-programs')
| -rw-r--r-- | virtual-programs/keyboard-character-log.folk | 1 | ||||
| -rw-r--r-- | virtual-programs/print-test.folk | 2 | ||||
| -rw-r--r-- | virtual-programs/tags-and-calibration.folk | 28 |
3 files changed, 19 insertions, 12 deletions
diff --git a/virtual-programs/keyboard-character-log.folk b/virtual-programs/keyboard-character-log.folk index c96ec227..ee595dbe 100644 --- a/virtual-programs/keyboard-character-log.folk +++ b/virtual-programs/keyboard-character-log.folk @@ -4,6 +4,7 @@ step count: $c steptime: $::stepTime camera: [expr {[info exists ::cameraTime] ? $::cameraTime : {none}}] statement count: [Statements::size] +logsize: $::logsize "] Wish $this is highlighted blue # puts "$::nodename statement count: [Statements::size]" diff --git a/virtual-programs/print-test.folk b/virtual-programs/print-test.folk index f1999115..d58dd88a 100644 --- a/virtual-programs/print-test.folk +++ b/virtual-programs/print-test.folk @@ -3,7 +3,7 @@ if {$::nodename == "folk0"} return set fp [open "test-output.ps" w] puts $fp [programToPs 6 hello] close $fp -puts "output to test-output.ps! $::nodename" +puts "output to test-output.ps! $::nodename " # puts $::livecprocs diff --git a/virtual-programs/tags-and-calibration.folk b/virtual-programs/tags-and-calibration.folk index 1d61419f..a7f98230 100644 --- a/virtual-programs/tags-and-calibration.folk +++ b/virtual-programs/tags-and-calibration.folk @@ -50,20 +50,26 @@ proc cameraToProjector {cameraPoint} { } # Wish $this is highlighted white -When tag /tag/ has center /c/ size /size/ { - lassign [cameraToProjector $c] px py - Claim $tag is a rectangle with x [expr $px-20] y [expr $py-10] width [expr $size*2] height [expr $size*2] - - set fp [open "programs/$tag.folk" r] - set code [read $fp] - close $fp +When tag /tag/ has center /c/ size /size/ with generation /anything/ { + Claim tag $tag is a tag - Wish $tag is highlighted green - Claim $tag has program code $code - # Wish $tag is labelled "tag $tag at $c" + lassign [cameraToProjector $c] px py + Claim $tag is a rectangle with x [expr $px-20] y [expr $py-10] width [expr $size*2] height [expr $size*2] } -When tag /tag/ has corners /corners/ { +When tag /tag/ is a tag { + puts "Added tag $tag" + + set fp [open "programs/$tag.folk" r] + set code [read $fp] + close $fp + + Wish $tag is highlighted green + Claim $tag has program code $code + # Wish $tag is labelled "tag $tag at $c" +} + +When tag /tag/ has corners /corners/ with generation /anything/ { set corners [lmap p $corners {cameraToProjector $p}] # Display::stroke [list {*}$corners [lindex $corners 0]] 2 green foreach corner $corners { |