From 1e1687bde3084410eac3decc61f39f576f39fbb2 Mon Sep 17 00:00:00 2001
From: ColsonZhang <784278850@qq.com>
Date: Thu, 1 Apr 2021 13:26:36 +0800
Subject: [PATCH] new macro DEBUG

---
 README.md                                     |   1 +
 handler/__pycache__/auth.cpython-36.pyc       | Bin 2438 -> 2491 bytes
 handler/__pycache__/simulation.cpython-36.pyc | Bin 4675 -> 4726 bytes
 handler/__pycache__/spice.cpython-36.pyc      | Bin 4719 -> 4761 bytes
 handler/auth.py                               |  14 ++++++++++----
 handler/simulation.py                         |  18 ++++++++++++------
 handler/spice.py                              |  14 ++++++++++----
 7 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index f0ea81b..5303358 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ app.py         ----服务器的主程序
   * bug：PIN POUT暂时无作用
   * to do:主页面取消跳转，采用判定是否登录的方法改写login logou
   * fix：当仿真失败时，会提醒用户Fail
+  * new: 代码新增DEBUG宏变量，为False时，关闭print
 * 2021年3月31日，前后端更新
 
   * 新增：在服务器上成功部署；后端代码为适配centos服务器而做了一些修改。
diff --git a/handler/__pycache__/auth.cpython-36.pyc b/handler/__pycache__/auth.cpython-36.pyc
index 9d219e1b3dd5cf9eb5affc963cfd7504a062da5f..b7ae86d2a4a9efcf7d5675a0a8bdf57c50cec751 100644
GIT binary patch
delta 864
zcmah|OKTKC5bo;N^v=v~Mx%LXl8vrOcF`mz9)jXQ#h6R*LCnD*M6d_RDgk>Z2w_43
z8^nu;rE~M*$%6zz!Hc5*K=9&0!Grh*{0UYKIV@hBp^C4ny1Ki*Z{}(5$KKkxayhKt
zN$;_UvEQugk%%v$weEIm6Bn#p(F@Eft9O~zDYV5(fN@|A#-@l3#w8nK92RlOMoX*_
zcXsCBn*XWJcmBKw<6prneD>d=zP+EbCT|K0xoC4>nRJVpDstLF8?5MOZ2*QDW~Eha
zzNK^RcC(;qtj>iEo>N!QELlV6QiN;6TvONM5C2;i+lUsfSFkDa&-e?7{V7pXSLd%R
zFZg-!qz@Tktx<FgVu(e^C9i<=U&RuP`L}97X)Fc)vivn&MdU`&{YW09+3Nib=hF3T
zb)%I!cY<oisitlED9uuL(%({b826iMA{wXa1i8B3SHp)I2*=P`9GwBz@HgaO=S$7^
z>G31SFqbhGXFv=U^K!qa&y<B5#*!N$7trqUEW#FDkl~fz>8b5E2><Q1+#>f|f>=k6
z3CjYj0vBpnU0`I~?d6Ir*AKbd%S0{^%eL4G@&I*_O=Sbr#T2^8rY2Qvbf8NkuyG;G
zYdpZ%vaPHYBdqt~rC#DdJqH7o{7!Hiru?^H`Eb}Z7R~OYzi0-a=5Ly6G);-K<YxS)
z89Gg@&7mDgCc$u&jb5Ihmr%hMF_+*!nW3Xy%+n@ia)qvglL%*MC;A5r809E)y%G9q
gsh$)}6SI!Aa+CNe^!v3^PZDDoLxSf@o{S{%U+&eYApigX

delta 781
zcmah{ziSjh6rS1HnVtP{=b88;=iNomi@6KjC1Oyqvl9z#Vo=h=<Yp09IdFEb+i2jT
zjS4v)*rXE_!CDIi@juWyg`k!ef?#9idrOL7<HGy+zW3e?Z@#zhCm&6=7E7hz<FECb
zj|0ZOvwfe7{31qrW87+=yTpuZ<Q6kB<|DD9P%Go1_6qHx*2YKe7h0QOiOq%Mt@H3x
zUKsy=!xg;dXZSn#!aGM_<t%X$VR$Y^4riHLXbDZHw!E3C#4{=v#(PRNm1w%z1f;Of
z&((-?cJJ-~`b<cDgEF28VC?Mh5PG5o*TwLVPtTf0U_9cH2prcb!#A<SXQ1v+NreRo
zOYYYN>aoWWb}P5yY_&hMHXdZF!!)+`1l4L(QzpI}XR&R<j_U9hJdy426jf&l+VDX(
z4t9{9#7G?k&20zP+$u<QxpD*(88e)w#aTJ5tFCZt1D>f~us}y>6AV77`3Eom={1f)
z2R8(r!~GB^FS(Hgmjzb^M@Q{;E-7+#$FbX)lMCeTNNjkyXE!sExW+@@b>X{6B)M+F
zJ>QjyMolvQIbQ0Sk}2OVMjlMy@CWvW*YLu-#(VI`Tb}T31E;me2<QcN8rJj_+}E|U
z^CanM_B6t-mk#^=I8ALxsRANmGYE?qX&r&VXI+IKx_)?{wV1Xgf?{#iE>gO?a7=UU
iTFP9V^Wlo$32CjC_F%j4(4Q^i56>cA;o7M*D$!qkzn@V6

diff --git a/handler/__pycache__/simulation.cpython-36.pyc b/handler/__pycache__/simulation.cpython-36.pyc
index 966488712aabd55b0fb2055be03d5903f624d438..00d499494a9706c6b1f54d24cc439f42aa279f1f 100644
GIT binary patch
delta 853
zcmYk3O-~a+9LDEAJKYXTTgpp;Hi(9oL(z~Z_>Kt3i}->lF~OQxku8xDkxUm%V9`Up
znn)(`z*jIPCQbYTdeU#e!59q(Z=O7=|0in*o%FZAd7hcs&F;sZ-#y&}$)vYGUwU{X
zFT@XV=;yGH@V~OL)4ka4>q2@;_;tSbQutm~78-q;6Z!g`-DR4rIg}x4wOP4OIr~=*
z4R?|dp(u-xLRppDPCzCXNS{KdDhZ8KR=(unypo|Ps*rrOBFz#vsvNWHPH)C#cjx#7
zzn+`Ve8OfR?OP{59S>C)3*9hYRognyep5Lf>MB)<1h4wU_i2V7>~C3-uW^4e-?+>C
z?^L<YX4KJUHz00X4)3asst=U&_R_QF=~~GI%cV+jcEMCid$I9}vAa{&b9Yn6@NUK#
zLMBMr_im<Fkv<q{nIfJ`S9-Wof?OUca%<n+9jfQIEleM9+&<TBG*f${yVQ%5NKOF*
zjJ#t8;irK!QE(Q14mgiMnG5iXzz}dLN{8W>fe~Po!E49hR{%V?nLsMdBzy`!BF$Ay
zrZG|G8vHtN1GtG)ni=>lxMODFw}CqdTpK2{?PfkI?;$S$_oMP1%7v(WgnSY3qw;Gq
z8#m?1|G?KG?@VQ-*{BVsdMVb=(UN`8@N*zU=@^eMg+%bUR9s(O4vMSmPs}z)CUJly
zY>V;5Zl;&gCot^-aF*G!ztSC@Evyx6(b7}e)&06%mrR_4e3N-*`x^J$Zmf>;>NeZa
V)R1e%Vkg006$4*aJ4$M)<UiO_o*n=I

delta 884
zcmYk5OHUI~7>3VfIz5!O_5zVaQX|x8Q4<yMf{5S^yjQEJ6)cx2(pD~h9bDjG7voA}
zBAJ~FmoD5kF|J%_T=*B*8W;Wn*M2WGhB=vMp7Va^o6O9~{K<aH_V&kOkslw6)35gn
z@l$L&H2Vmjb=v5i>lhP`aoS!Ar_EQzgd+<g7uk4UX&TunWk--vzhqZn>7hX*h44gG
zc+yk8TGy_0q^Er)k*cb86c7DId7`8}=~y*Ivs}?tD|n&zCPVC@0(U#@T>0Y4;Iqz+
z+MeZwJlhNV*1B=SPO55q#+Sa7g72Tk^?zSSO}&+5ao+ha*HshrS-WGQ?Q5Hp)+d>6
z+f3wXd8JHlrCcxNXQ*Bd4%+XAGkEbqhEP!%ktt<lRN7l3&NSObLdBI)wu*4pS`%-^
z!yB@lKd7J_&=>4Urb9if<IS(8$7&o#dIUJi$Z6__9|Hzj!EyKr;3NWzPQmd+bQ&0H
zrDx#7z*%5~!D~n1=YaFT1*D2D!Y{!aipDS*$Hbz`@GHPo;2Kgz*Wowdnr_1Lz%2we
z-G&!{JHTCF0=UQEhWqdbKoNmW58;!*ln@O;kDw)Bn!z12@L6CEflUs)49o+Mfd!z#
z;CdBa1D*hjz!I>`;Q9*uDL_CSaDi3PoQY>;=nzk)gI7C#?|RP0j}YNYG3qXqORGy2
zx3sjnNZ!`Yt#RRd@F6juIKW2ONJ2NQ1>MQ+Op3K0Wf&E)jBWZ%mnl=2gItoH1ry25
NU?8=R|B|WH&cEX@oPhuU

diff --git a/handler/__pycache__/spice.cpython-36.pyc b/handler/__pycache__/spice.cpython-36.pyc
index 0136e305d6d7a10b91477ce853a1eec0614fa15c..5aeae3118158c8bc4170f27040db7d107a5fda78 100644
GIT binary patch
delta 1634
zcmb7EOK%)S5T5RN_0D5=CcE}Nyu@+VD6AbnLM#Q09ULc1q==VzDA9ss6MBd|B3`R!
zA_N-Cpp66^0*VSBBJl?}A;B*|hyypcaM&vcjwlyyNK_4A;}r|ZjQX4Ys%z@2s_vOz
zr|&)5I_vw+{<Uaxv!ZD~YyY?moUh?Xe!JUxb59n!VdVC;?y<|7bfkM*lWxTNdbf<+
zlRk1k=M`C$rQ2F}4DEpo(H`dZapcEj8F@M9Rpb>phI}mNHRR*6ioBZhI`W#VBd;T`
z>)i$#8gc>+6S>2LG+x%)O=z$_dj{_NPr^^E)qDjr&a_zTYr8r=nZ(syBjsu))gk2N
zNh3C;k?GRB!<m*Ev6UH;NsAcz+i;ObOu!fXq<N{c{_17;p1;JVps8Oem#G;=1dR*k
zaD!DiyraK<yoDAubren#^$<e1ukWxTTsI!?e3I&zmdHeGWLBS{poq=P$m~AfEu@yZ
zp4yliGEB^tCV8YHE}%ytw^{1F)P^68$tfpxrGrJdc@a+RWsdYROZs>8ybK>gv;F^G
zU%zIqGEDBCwair&ey|?v)F|;fL4#ldq3x<B%^x8+PB2L@i!dnesNPPb(yb`jNK&PI
zS~(4?cKyN$njW?#?+CSuMzVx}ZR8Han+uaO3uhiP5Cx~F-~jd_oC)g-ZS++myF7!d
zB$IFifg263c;8y2cTU4y(X0&RFpn$G!Z)JI=3%k40%L{G*(`ij=vY;HX90dM%)Ie$
zZ4e{d&=twn&5f<?w|ZUw@7YG2^tROr3OSSjRdNkJa@HT9xO3=x6~~{&F?B9a`FZ!-
z+R+RLmWsAzq}nFTdyS!z2l|aDy#-gjxkJU3qlx7y=3BH(Y6ps3Eu-Q^DEU`ro<eI|
zA8x`>aTNCh==&{_YUMjOQfd`__h7p80-PysE>U=;6VRXMfrLJW?~1w5+<yz5$ABN=
z`0I$ki$MpH(nD1ADg08(g&L!UU?Z%-+0q*92M-Z>9|~a}d1-WH>d6|yX9p#)oa4{$
z-SAZD6q*P2bG_{wy-VwA4!#U8>^*@tHBPWVKz|}dABv*Wujo`M+Gs^vpr}3SX@WI^
x!yP?16$7zyvnOx89i3<BkxV0aEMNj}5AO<ot%hmwAP8oK8#Dvk3q)WC)*l<X85RHl

delta 1624
zcmb7ETWb?R6yBNLY&M(SbkinH8f}cmOOsv{6}8%WuZ4P7@F58GGOIM$MrYFpbwMQ}
z_CZ7s2!d~dKKN!qeAa&;_!1v|5flXffSxnj){4QJa6aZcdv?w@-^}deHD6a3H@U9;
z=9GWtONXX?)PDOJINpsBe0xwlf5VSAv`TVR6ER`m)`ab|hF)n$9v2RBNAV8fio|WL
zlEQqO@G$SGd>VODv?Fg<yc2ncNFh%to<W`#oya>C&mzx=Eb^@4U88ADbcq}$aw?G%
z#!0QT4Dzf2->pITz>4e`d}o=Bf`@uW6Bwb9(He|tb-ii`Bh*FY9#<?98iEOvSg2J^
zIK+Jxg_nF4eBj4e0s8c@WIHX~LD0CxY@T8;qn|FXLM{u7VI@(j^e_UBU~%a{GBE@P
zjUH~Yhdc!{MmM_y&y9Q@l|&n)!xRyvE?TuhBaHpb!DnN|%2?GFHtLNly|HRMw1pFz
z!o8;}#SZjFO8>5!osJAM=EAJG9ln`sMlvKcOVCA-Lny`NG8!)@=qAV$lo6VV%d&Ra
zm-Puh7!T@Fy7Z(MPDi_jSJ1F956S_uhEl->1T>A?4FBAUaAxAj!LYc)EC#Ql8;l~>
zz>#FGwWB4hATe`}mSDiTd1O6iWG_O~K3lKLiF4C+KWG{>t{8P+PW~yYA8QZLGzkQa
z87K*bpqLbs{c4l8#h$P-ypN5Tome3UpkSBJ{>>|^rB@Xzn3x=&n7UA_xO1cNYEYY!
zt(-amFYLWbaA6BdI*#$v1tzyB$yefUyB8~Ln$n*VzAQzQNEo-%sRAuW0c}uIzv$O%
zaLwsoXuD&+LY2+e%0YZEi7{vXAhz8H8{M(;cFdOaKb=r-Do|&E=DiNj+~N{i4Pot7
zjJZ}r*y`zKY9n<5`U)+nVFNxT78>STu5B16yakcOQFzq$AM2R`+gq5vr{(lJar(O$
zzjh3cw~fGS?>`#dhrZ-Oqx4@J!5J^h@$>g2xvp(3Hfu%?*QPGk_V1N_@GiOM##YS9
z0Rs9kNxDmtZi1xqq;^-5?~=Tbq*(4EC@cnbY^<TlnwY-i?_~Hepj+-R4{wl#SK7f_
VWSJ)S5?+rL_m+E(XL(W2`~m%x6IlQN

diff --git a/handler/auth.py b/handler/auth.py
index 4f59e4d..a7d2877 100644
--- a/handler/auth.py
+++ b/handler/auth.py
@@ -2,6 +2,8 @@ from .main import AuthBaseHandler
 from .account import authenticate, add_user
 from .MongoDB import *
 
+DEBUG = False
+
 class LoginHandler(AuthBaseHandler):
     def get(self,*args,**kwargs):
         self.render('auth/login.html')
@@ -16,7 +18,8 @@ class LoginHandler(AuthBaseHandler):
         if passed:
             # 保存cookie信息到redis数据库
             self.session.set('username',username) #将前面设置的cookie设置为username，保存用户登录信息
-            print(self.session.get('username')+' login success !!!')
+            if DEBUG:
+                print(self.session.get('username')+' login success !!!')
             next_url = self.get_argument('next', '')  # 获取之前页面的路由
             if next_url:
                 Mongo.connect(DataBase='example',Collection=username)
@@ -45,11 +48,13 @@ class LogoutHandler(AuthBaseHandler):
 
 class RegisterHandler(AuthBaseHandler):
     def get(self, *args, **kwargs):
-        print('register')
+        if DEBUG:
+            print('register')
         self.render('auth/register.html')
 
     def post(self, *args, **kwargs):
-        print('registerpost')
+        if DEBUG:
+            print('registerpost')
 
         username = self.get_argument('username','')
         email = self.get_argument('email','')
@@ -65,5 +70,6 @@ class RegisterHandler(AuthBaseHandler):
             else:
                 self.write({'msg':'register fail'})
         else:
-            print('register again')
+            if DEBUG:
+                print('register again')
             self.render('auth/register.html')
\ No newline at end of file
diff --git a/handler/simulation.py b/handler/simulation.py
index d89ea54..61f4542 100644
--- a/handler/simulation.py
+++ b/handler/simulation.py
@@ -15,6 +15,8 @@ libraries_path = 'D:\\Project_2020\\SPICE\\Pyspice\\libraries'
 #libraries_path = find_libraries()
 spice_library = SpiceLibrary(libraries_path)
 
+DEBUG = False
+
 class Simulator_CZ :
     
     def __init__( self, title='simulation' ):
@@ -30,7 +32,8 @@ class Simulator_CZ :
     def Sim(self, sim_type,properties):
 
         parameter = self.Properties_Parse(sim_type,properties)
-        print("parameter:\n",parameter)
+        if DEBUG:
+            print("parameter:\n",parameter)
         self.simulator = self.circuit.simulator(temperature=25, nominal_temperature=25)
         # print('simulator:\n',self.simulator)
         if(sim_type == 'transient'):
@@ -41,7 +44,8 @@ class Simulator_CZ :
                                                      use_initial_condition = parameter['use_initial_condition'])
             return self.analysis
         elif(sim_type == 'dc' ):
-            print("doing the dc simulation !!!")
+            if DEBUG:
+                print("doing the dc simulation !!!")
             src_name = parameter['src_name']
             vstart = parameter['start']
             vstop = parameter['stop']
@@ -49,18 +53,20 @@ class Simulator_CZ :
             the_args = "{} = slice({},{},{})".format(src_name, vstart, vstop, vstep)
 
             exec("self.analysis = self.simulator.dc( {} )".format(the_args))
-
-            print("dc simulation finished !!!")
+            if DEBUG:
+                print("dc simulation finished !!!")
 
             return self.analysis
 
         elif(sim_type == 'ac' ):
-            print("doing the ac simulation !!!")
+            if DEBUG:
+                print("doing the ac simulation !!!")
             self.analysis = self.simulator.ac(  start_frequency = parameter['start_frequency'],
                                                 stop_frequency = parameter['stop_frequency'],
                                                 number_of_points = parameter['number_of_points'],
                                                 variation = parameter['variation'])
-            print("dc simulation finished !!!")
+            if DEBUG:
+                print("dc simulation finished !!!")
             return self.analysis
 
             
diff --git a/handler/spice.py b/handler/spice.py
index 3a379a6..f1054e6 100644
--- a/handler/spice.py
+++ b/handler/spice.py
@@ -7,6 +7,7 @@ from .sim_data_container import Sim_Data_Container
 from tornado.escape import json_decode, json_encode, utf8
 import json
 
+DEBUG = False
 
 # from bokeh.embed import server_document
 # from jinja2 import Environment, FileSystemLoader
@@ -20,7 +21,9 @@ class SpiceHandler(AuthBaseHandler):
         username = self.get_current_user()
         message = self.get_argument('spice')
 
-        print('SpiceHandler: '+username+' \n'+message)
+        if DEBUG:
+            print('SpiceHandler: '+username+' \n'+message)
+
         Mongo.connect(DataBase='example',Collection=username)
         Mongo.update(behavior=message,tags='spice')
 
@@ -46,11 +49,14 @@ class SimulationHandler(AuthBaseHandler):
             simulator = Simulator_CZ()
             simulator.Get_Spice(spice)
             analysis = simulator.Sim(sim_type,properties)
-            print('properties:\n',properties)
-            print('simulation finished !')         
+            if DEBUG:
+                print('properties:\n',properties)
+                print('simulation finished !')         
 
             Container_SimResult.load_analysis(sim_type,analysis)
-            print('data container load data successfully!! ')
+            if DEBUG:
+                print('data container load data successfully!! ')
+                
             message = "Simulation: Success \n"
             message += "Sim_Type="+ sim_type + "\n Properties=" +properties_str 
             Mongo.connect(DataBase='example',Collection=username)