From e73355a509d6ee5a3ed6ba8c0860719201f22336 Mon Sep 17 00:00:00 2001
From: ColsonZhang <784278850@qq.com>
Date: Thu, 1 Apr 2021 13:10:17 +0800
Subject: [PATCH] fix some bugs

---
 README.md                                |   9 +++++++++
 handler/__pycache__/spice.cpython-36.pyc | Bin 4499 -> 4580 bytes
 handler/spice.py                         |  21 ++++++++++++---------
 template/schematic/schematic.html        |   6 +++---
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index b921ef9..51db2f3 100644
--- a/README.md
+++ b/README.md
@@ -60,10 +60,19 @@ app.py         ----服务器的主程序
 
 ## 更新日志
 
+* 2021年4月1日
+
+  * bug：系统运行一天后mysql异常
+  * ~~bug：schematic中能够进行绘图的区域有限~~
+  * bug：移动整体电路时，电路连线无法一起移动
+  * bug：PIN POUT暂时无作用
+  * to do:主页面取消跳转，采用判定是否登录的方法改写login logou
 * 2021年3月31日，前后端更新
 
   * 新增：在服务器上成功部署；后端代码为适配centos服务器而做了一些修改。
   * 新增：对schematic的Help弹窗做了修改，对login和register界面做了修改。
+  * bug:处理注册信息时需要对用户名和邮箱是否重复进行判定。
+  * bug:Datetime非北京时间
 * 2021年3月30日，前后端更新
 
   * 新增：index界面
diff --git a/handler/__pycache__/spice.cpython-36.pyc b/handler/__pycache__/spice.cpython-36.pyc
index 9886514f7c8e92fb7c27808a6c79b3314636bf27..0d0a42dfa5c8ddf409556d4e19e7cf47dfc41b1d 100644
GIT binary patch
delta 320
zcmYk0y-EW?6ov1d>~3afcFo`qX+#1+Gyw~-5Ns6@3nOe{Y!+iCV3su&NyMMsAc!_5
z)qMgh8ynd-NRh%9u$Nf)3RaGtd>pvvaJU>QPs{Fx?~9M1b@Ke?)+`|bpk~y4r&DX4
zUGEcFJM~l?K}R9{p?NBfp~LEs2<;|T5ws{mVi#c(QqglGp=FZO-iRR>Cr!&w96dA2
zAtVrax^R!?3j|P6G-t=vg`j=jj~l)AMQ5uN^qb9Aw_6f7v;X7WMmsKvY+zS#W!20B
z#+g6^<2FObT%HkU9&&^6Y(ASfONiUqSAK$6qgOY@gRCkJ5o5ZQXBg2`j`50Kybv$R
r@jvm7zWopfv^O)xN0NmQA1Eq}aY$<_#3vf6AAgxkwWvJBRbDy2msCqv

delta 242
zcmWN}Axi{790l<Io7>%+nVs32B3lj>uV@rePz(l}!U+b8EQSH~u$^MKS%X(JT>4}1
zJ6L3+LD(P$zk)^l5F!W;j~|a$-uHk9YRy{hHvNfyR>MT6L^O=XPy8z9_&VwHL$bRa
zl9IeEDWoOU`cjRwSE1weOn~CbgZ6pIyqR@CfkwvLDL|eMX{F%R^rCrBm$9%Ik4Z?O
z5hG-l#Ws-?CUQ;Lod<TB4fzJ_^Pj4**G%*QaLyn38BTfKw7B9QQ(??U_6s#{6%{7@
iShSe(aj(KHzw}z%^Np);$Di)kF3H^WopI82UG@)MA~&l5

diff --git a/handler/spice.py b/handler/spice.py
index f1b9210..96f10fb 100644
--- a/handler/spice.py
+++ b/handler/spice.py
@@ -42,17 +42,20 @@ class SimulationHandler(AuthBaseHandler):
         # print("sim type:",sim_type)
         # print("property:",properties_str)
         # print("spice   :\n",spice)
+        try:
+            simulator = Simulator_CZ()
+            simulator.Get_Spice(spice)
+            analysis = simulator.Sim(sim_type,properties)
+            print('properties:\n',properties)
+            print('simulation finished !')         
 
-        simulator = Simulator_CZ()
-        simulator.Get_Spice(spice)
-        analysis = simulator.Sim(sim_type,properties)
-        print('properties:\n',properties)
-        print('simulation finished !')         
+            Container_SimResult.load_analysis(sim_type,analysis)
+            print('data container load data successfully!! ')
+            message = "Simulation: Success \n"
+        except:
+            message = "Simulation: Fail \n"
 
-        Container_SimResult.load_analysis(sim_type,analysis)
-        print('data container load data successfully!! ')
-
-        message = "Sim_Type="+ sim_type + "\n Properties=" +properties_str 
+        message += "Sim_Type="+ sim_type + "\n Properties=" +properties_str 
         Mongo.connect(DataBase='example',Collection=username)
         Mongo.update(behavior=message,tags='simulation',spice=spice)
 
diff --git a/template/schematic/schematic.html b/template/schematic/schematic.html
index 9856dcb..4f25bfa 100644
--- a/template/schematic/schematic.html
+++ b/template/schematic/schematic.html
@@ -122,8 +122,8 @@
                 graph.foldingEnabled = false;
                 
                 //Maximum size
-                graph.maximumGraphBounds = new mxRectangle(0, 0, 800, 600)
-                graph.border = 50;
+                // graph.maximumGraphBounds = new mxRectangle(0, 0, 800, 600)
+                // graph.border = 50;
 
                 // Panning handler consumed right click so this must be
                 // disabled if right click should stop connection handler.
@@ -225,7 +225,7 @@
                 // var lorem_2 = "To be continued......";
                 var attention_head = "注意事项:";
                 var attention_body = ["1.当前系统不会自动更新元件名，当引用多个相同元件时，请在执行仿真前仔细检查元件的名字是否有重复，如有重复请自行在属性中修改元件名。（Vdd和Gnd除外）",
-                                      "2.由于在后台CMOS器件统一使用了180nm的工艺库文件，所以请不要修改CMOS器件的MODEL。",
+                                      "2.由于在后台CMOS器件统一使用了180nm的工艺库文件，所以请不要修改CMOS器件的MODEL。另外，请注意，180nm工艺库下的电源电压为3.3V！！！！",
                                       "3.系统尚不成熟，如遇bug，可以将bug的相关情况发送到colson_zhang@foxmail.com。"];