From 9c7c31bb7e0ce0a59c1bd37cd64251dadc079a18 Mon Sep 17 00:00:00 2001 From: yexiang yan Date: Fri, 3 Mar 2023 16:46:05 +0800 Subject: [PATCH] fix tcl2py encoding=utf-8 --- .../__pycache__/tcl2py.cpython-39.pyc | Bin 75605 -> 75861 bytes src/opstool/preprocessing/tcl2py.py | 15 +++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/opstool/preprocessing/__pycache__/tcl2py.cpython-39.pyc b/src/opstool/preprocessing/__pycache__/tcl2py.cpython-39.pyc index 416a9a85177af635bd0903adbd88d3ac12de9f32..16127ac7618f316e48eb788e9a163a6f68117be1 100644 GIT binary patch literal 75861 zcmds=2YeGp`u8PSlI3o|1PFvEgak~05J)AY01gQka0rHwI3z;$$hLwkiIq%o#%Yj* z^xi`P>7@6bT(0-tb-f=~a=qp5lK<~n&5lOPjO@Gj?sK;Zzn#?q>mb{5)VC&#HLf zE*}f-s2ajwEChcb9bw_2Dpoxd$osK1J}s-grs}%!LqQ(g8QA3;3a#<6x}Y!U+gj!K zrJE1)<*YeAzy1F#SRUG0#p+qZuE0>p{=1Pi(ck$X4{Y_X4Ge{cs(E-P(sud%KJ3HK znz4^j*vH(V2#@Rx^D0W=)os3WMi154o*FiKoR7R4KEBu9f1~c5)q&-h_(?&~$fP$W ztb8=zor-p6SR$I~iDt5ibS{y|Me`Z?cXo@NJiE3wihr|bNAt<-{Q0&Z$BgKzzGN=i zGm!4iCo}2jrerD=?McP+`9wOpB{N_}*I^Iq>^x>hlj-i%086HOqp1wO$(b^nX!N`R z*4v**=W{co@mwz1n-(H#Wx8iZ6Z!7hGI&O`EfY;=^3j1@LJ5xM^6`Aa-YnXav794F z=dkns{&<=p>)b$hA2yL$MWgH1GGG9E-yp`6;Nb>qDzydQUJ4-ty?x5A@@1z8zR`_IMrRpz5${T-lKCx!q}w?o$xYt{VR3MX z^KV7miuWh-39I-O&XWJ^y_HIZ=zN?Fr7wmKCXEg0B)5a`_0FdAa$S_lkm7MGL^Pg~6js;;ll&CUrIrP;t}XOc#RpP(WQ)rJdCSd`vlFxF zWK8yFGq_qyo6UCq#OVxo*+xryqV1V9j@F9Omrf|6)27X|fs2m`wBib4d+)5r%Jge@ zB|gOr=MxSFiQ-@tSPV|C{1FEOwY3HR?7;(v%^Y#Qg5Mep4di=f9o_0LL=tJ7a40p} z3;y#5tD@&e3;rSe9>VWUt${+2E&!_rC40eN+geTWEVn6{?<)ieQXyz1;;c|@C9cuB^qpf)n!h%-CS$Gd$YP&s@df2GnbcZr zE&s+hL4{iamtnehE%Kh5-2#w>aPd$27`cOCeEZeDPH`06Tc}FI;h+`V|~87Z>N8k?+Smf?+V=aSYR9ObC>%r5A*~W?!((6 zLjj>eEDTj8R5go01%<->4k{!R-J>HzVWApWBUH6eO{^IzBGf208mdO9F{}luR;aOT zAE-K^#mh6=^gbeW7Ml$R7e_YO+wrvE!lk7wQCdB2-kUg=`Vj0YWWiZBSE$ zI*BcTI#8&S*(p#{g<8tq2X&B8r?O>G2Me{FwL?u4>NK_jYPwLTvz1V-LUpiJP&0&D z&CY;2M5s0FOsJVcoy9t#W(jpRTMIQ?sB_r4P=^W?W9y*i2o+~tP=^WC%^1{Np%SbI zYMxNNtPkpNp_1%8s3U}0&r(oF3f0fjP)7-sVOgl7h1$R@sAGi6u{_j#p$6DSsAGlN z#5O}M5NZn>ggQ>B^BIRaUZ^2<0n`aXUC1tiI#H;L*(Fd5h1$xtK`j#MQg#{CVxcZ) z+o9Tox`JH^b&^n5v8$n$2z3p+7V2c7u4C6jog&l?>_(`iLfyn}hI*e+x3F8GP8I4l zc01HEq3&RJLM<2SE_OFmyHGpWJy53!buZfqwL+*}>^`W|g}R?T0JT!62iZeV9YQ_K z9)VgV)Nb}D)M}v~V~<0fA=DG>NvJhKJ;k1eI#Z};*t1Y)3H2O%9;#EQ7ubtXXAAWb zdl_o2P_M98q0SNNHTF8xxkA0c-h_$?^?vpi)H3Q+w*eUp6)DlOEv*>|8aLVcHg4=O9v_t_7iHVE}Y_9G}us2{VRK;?w` zDf<~zUZ_3n=THMe{et}xYNJrUVsArj66)9NH&B~}`Yrn%)E1$B&;9^4DAXU>pPd)*iP+X|LvUi|{g!&u%JJbb2{e!&=b)iu2UGHZ;=!=RP%8#D_JQqt(6+A(BE|H!P zJYjgYN>4RB5qP#qPYpb^@LVcAb@0@~bD8usz|#oN<!%3 z0G^HTye2)H;Mok%>(a9Yoh_Pf>U9$%?v@@2{x4cvMk$^8*yMqfFhyrzmOnmZ_cmKqYM#pQ@<)_(6)gpC7EK z2lzBaJ;LK2$sE7FsMLog~QPgfeQ&ErdS&Dj$&sNmqe2$`?;D;*eNq(53p5k*A z^)#QSsAu@$ih7nGp{VEhk&1erAEl@l_|b}bksqU|m-u`|z08kQ)GK^}qF&|4De5(T zyrN#`Cn)L-exjn@z`e!fUiQdETL@FYr~0 z`XXPgs4wv|6!m4kMp0kkXDaHe{47O%jdv>Q>-=m*eS@!6RDqwPsBiLf74L)y@sGsul6!kN{UQv5^ zN>M-O{fhbpPb=z|Jfo;z@vNfW<{K3CYi=p(H$11P-}1boe#ZwC^?SZiQGei@6!k~G zSy6xDTNL$YKB%a_@beY*SI!mn4j)p~-}nWJ`a8c+QUBl8#)RFuZMIFUoRn*b^HANl6Usu$8{zg%4 z_w@uieAAB&p!c*}Gz{CnsHK>G*5D^c&BV;t;oI$Rx0|nb`wPLi)tj?L(M&=}ArwPT zYwkGO1R45#fx!u-#`M_>Qkm{}DtG*BJ8G}JQIq;O+H@{V9=)(z{X^*CEVe{*UmG-e zw)=Jlw)@fVTE%^L`F7a7o%GpSgY9L_+w=kGb9YddEik>v@|^l1Ke9$fHv~2WJBp3* zIGTo7eoHnH6J1QZ1BJlsIR$^xeSEbGQpsE%9d+5`7bC~tDd)-=dd$Tb~iaJCky-H)kd8nTnD8I%Emvu2aAcVVBG z;g}t;1YQ-{zUJL{h1qgCP@9?lG)$xGON%T>DQ04!7^R=;0;a#3Dbg#vR!UwowO>94 zhiGwCA;C;5h@mE%SGZt}H|@YHtf=U(bZ+68&(y*SQi_>Yh-jU;+J#GhZc(IHc�t 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 TgATk?cX;#ypZ@=hXzl+2_h!l; diff --git a/src/opstool/preprocessing/tcl2py.py b/src/opstool/preprocessing/tcl2py.py index 6ef8981..dd580f2 100644 --- a/src/opstool/preprocessing/tcl2py.py +++ b/src/opstool/preprocessing/tcl2py.py @@ -41,14 +41,14 @@ def tcl2py(input_file: str, import_txt = "from openseespy.opensees import *\n\n" prefix = '' - with open(input_file, 'r') as f: + with open(input_file, 'r', encoding="utf-8") as f: tcl_src = f.read() tcl_src = tcl_src.replace("{", " { ") tcl_src = tcl_src.replace("}", " } ") interp, contents = _TclInterp(prefix) interp.eval(tcl_src) - with open(output_file, mode='w') as fw: + with open(output_file, mode='w', encoding="utf-8") as fw: fw.write(import_txt) for line in contents: fw.write(line + "\n") @@ -208,7 +208,7 @@ def _timeSeries(*args): args = _remove_commit(args) args = [_type_convert(i) for i in args] if args[0] == 'Path': - if '-time' in args or '-values' in args: + if ('-time' in args) or ('-values' in args): time, values = None, None if '-time' in args: idx = args.index('-time') @@ -241,7 +241,14 @@ def _timeSeries(*args): def _pattern(*args): args = _remove_commit(args) args = tuple([_type_convert(i) for i in args]) - contents.append(f"{prefix}pattern{args[:-1]}") + if args[0].lower() == "plain" and isinstance(args[2], str): + contents.append(f"{prefix}timeSeries('{args[2]}', {args[1]})") + args = list(args) + args[2] = args[1] + args = tuple(args) + contents.append(f"{prefix}pattern{args[:-1]}") + else: + contents.append(f"{prefix}pattern{args[:-1]}") txt = args[-1] txt.replace("\\n", '') interp.eval(txt)