diff -urN rt_v53/Makefile rt_v54/Makefile --- rt_v53/Makefile 2018-06-21 22:05:56.000000000 +0900 +++ rt_v54/Makefile 2018-06-23 11:36:50.000000000 +0900 @@ -16,5 +16,5 @@ rm -f *.o *~ *.pyc rm -rf __pycache__ find . -type d -name 'out*' | xargs rm -rf - rm -f blk_balls.yaml blk_bars.yaml dots.yaml + rm -f blk_balls.yaml blk_bars.yaml dots.yaml mons.yaml # EOF diff -urN rt_v53/blk.yaml rt_v54/blk.yaml --- rt_v53/blk.yaml 2018-06-21 22:12:07.000000000 +0900 +++ rt_v54/blk.yaml 2018-06-22 23:27:10.000000000 +0900 @@ -4,7 +4,7 @@ - kind: ball rtd: '*rtd_a' m2g: - - ax.zoom_all(0.5) + - '@ax.zoom_all( blk_r )' @include blk_balls.yaml @@ -13,7 +13,7 @@ rtd: '*rtd_a' m2g: - ax.slide_z(1) - - 'ax.zoom([0.5,0.5,0.5])' + - '@ax.zoom([ blk_r , blk_r , 0.5 ])' - ax.rot_y(90) blk_v: @@ -21,7 +21,7 @@ rtd: '*rtd_a' m2g: - ax.slide_z(1) - - 'ax.zoom([0.5,0.5,0.5])' + - '@ax.zoom([ blk_r , blk_r , 0.5 ])' - ax.rot_x(-90) @include blk_bars.yaml diff -urN rt_v53/defs.yaml rt_v54/defs.yaml --- rt_v53/defs.yaml 2018-06-21 21:25:38.000000000 +0900 +++ rt_v54/defs.yaml 2018-06-23 01:45:17.000000000 +0900 @@ -9,6 +9,8 @@ dark: [50,50,50] white: [200,200,200] red: [50,50,200] + cyan: [200,200,50] + magenta: [200,50,200] yellow: [50,200,200] blue: [200,50,50] @@ -17,4 +19,6 @@ sec10: '(lambda v: (v-int(v))*10.0)(sec/10.0)' + blk_r: 0.2 + # EOF diff -urN rt_v53/dot.yaml rt_v54/dot.yaml --- rt_v53/dot.yaml 2018-06-21 22:13:44.000000000 +0900 +++ rt_v54/dot.yaml 2018-06-23 01:47:42.000000000 +0900 @@ -12,7 +12,7 @@ rtd: '*rtd_a' def_col: '*[50,int(way.get([(50,1),(200,1)],sec)),200]' m2g: - - ax.zoom_all(0.5) + - ax.zoom_all(0.35) @include dots.yaml diff -urN rt_v53/mon.yaml rt_v54/mon.yaml --- rt_v53/mon.yaml 1970-01-01 09:00:00.000000000 +0900 +++ rt_v54/mon.yaml 2018-06-23 01:43:03.000000000 +0900 @@ -0,0 +1,34 @@ +@include defs.yaml + +mon1: +- kind: or + args: + - kind: ball + - kind: pipe + m2g: + - ax.zoom_z(0.5) + - ax.slide_z(-0.5) + rtd: '*rtd_a' + m2g: + - ax.zoom_all(0.5) + +@include mons.yaml + +mon: +- kind: export + export: mon_R + def_col: '*red' + +- kind: export + export: mon_C + def_col: '*cyan' + +- kind: export + export: mon_M + def_col: '*magenta' + +- kind: export + export: mon_Y + def_col: '*yellow' + +# EOF diff -urN rt_v53/pac.sh rt_v54/pac.sh --- rt_v53/pac.sh 2018-06-21 21:25:38.000000000 +0900 +++ rt_v54/pac.sh 2018-06-22 23:15:48.000000000 +0900 @@ -5,7 +5,7 @@ cd pac P=http://kondoh.html.xdomain.jp/pac -LST="pac.py kon.py pac_data.tgz v2.patch v3.patch v4.patch v5.patch v6.patch" +LST="pac.py kon.py pac_data.tgz v2.patch v3.patch v4.patch v5.patch v6.patch v7.patch" for F in $LST; do wget $P/$F diff -urN rt_v53/pac.yaml rt_v54/pac.yaml --- rt_v53/pac.yaml 2018-06-21 21:25:38.000000000 +0900 +++ rt_v54/pac.yaml 2018-06-23 00:42:21.000000000 +0900 @@ -2,10 +2,11 @@ @include big_ball.yaml @include blk.yaml @include dot.yaml +@include mon.yaml pac: - kind: exports - exports: [ blk, dot ] + exports: [ blk, dot, mon ] m2g: - 'ax.slide([-21.0/2,-23.0/2,0])' - ax.zoom_y(-1) diff -urN rt_v53/pac_dat.py rt_v54/pac_dat.py --- rt_v53/pac_dat.py 2018-06-21 22:04:34.000000000 +0900 +++ rt_v54/pac_dat.py 2018-06-23 01:33:52.000000000 +0900 @@ -113,14 +113,45 @@ ut.yaml_save( 'dots.yaml', d ) +def mon_dat(mon_log): + s = ut.file_read_inc(mon_log) + lines = s.strip().split('\n') + d = {} + for k in 'CMYR': + lst = ut.filter_lst( lambda s: s.startswith(k), lines ) + def f(s): + (x, y, t) = s.split(' ')[1:] + return [ int(x), int(y), float(t) ] + lst = ut.map_lst( f, lst ) + for i in range( len(lst)-1 ): + lst[i][2] = lst[i+1][2] - lst[i][2] + lst[-1][2] = None + + xs = ut.map_up_lst( lambda x, y, t: (x, t), lst ) + ys = ut.map_up_lst( lambda x, y, t: (y, t), lst ) + defs = { 'xs': str(xs), 'ys': str(ys) } + m2g = [ '@ax.slide([ way.get( xs , sec ), way.get( ys , sec ), 0 ])' ] + mon_d = { 'kind': 'export', 'export': 'mon1', 'defs': defs, 'm2g': m2g } + d[ 'mon_' + k ] = [ mon_d ] + + ut.yaml_save( 'mons.yaml', d ) + if __name__ == "__main__": pac_txt = 'pac/pac.txt' if not ut.exists(pac_txt): ut.cmd_exec('sh pac.sh') + cmd = 'cat pac_mon_pos_out.patch | ( cd pac ; patch -p1 -N ; rm -f *.rej )' + ut.cmd_exec(cmd) + lst_xy = ut.txt_to_lst_xy(pac_txt) (w, h) = ut.lst_xy_wh(lst_xy) blk_dat(lst_xy, w, h) dot_dat(lst_xy, w, h) + + mon_log = 'pac/mon_pos.log' + if ut.exists(mon_log): + mon_dat(mon_log) + # EOF diff -urN rt_v53/pac_mon_pos_out.patch rt_v54/pac_mon_pos_out.patch --- rt_v53/pac_mon_pos_out.patch 1970-01-01 09:00:00.000000000 +0900 +++ rt_v54/pac_mon_pos_out.patch 2018-06-23 00:02:00.000000000 +0900 @@ -0,0 +1,21 @@ +--- pac-/pac.py 2018-06-22 23:16:20.000000000 +0900 ++++ pac/pac.py 2018-06-22 23:57:37.000000000 +0900 +@@ -3,6 +3,7 @@ + import sys + import os + import threading ++import time + import kon + from kon import dbg, DIRS, U, D, L, R, flush, has, set, get, mk_slst + +@@ -384,7 +385,10 @@ + (px, py) = arr.pos(c) + ds = next_ds(px, py, c) + ++ pd = arr.get_dir(c) + d = sel_mon_way(c, px, py, ds) ++ if d != pd: ++ print( '{} {} {} {}'.format( c, px, py, time.time() ) ) + + (nx, ny) = step_to(px, py, d) + hz = get_hz(c, nx, ny, d)