From 2fe767445240c56bb0bedf96badc67e0853b8442 Mon Sep 17 00:00:00 2001
From: bettleChen <2207153529@qq.com>
Date: Mon, 17 Jul 2023 14:04:30 +0800
Subject: [PATCH] update code and reset code

---
 NetworkAnalog/SimObjs.py                      |  49 ++++++------------
 .../__pycache__/SimObjs.cpython-37.pyc        | Bin 24496 -> 24530 bytes
 NetworkAnalog/network.db                      | Bin 40960 -> 40960 bytes
 3 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/NetworkAnalog/SimObjs.py b/NetworkAnalog/SimObjs.py
index 24904bb..07c77b1 100644
--- a/NetworkAnalog/SimObjs.py
+++ b/NetworkAnalog/SimObjs.py
@@ -13,27 +13,6 @@ from PIL import ImageTk, Image
 from dbUtil import search, execute_sql
 
 
-host_img = ImageTk.PhotoImage(
-    Image.open(sys.path[0] + "/../datas/images/主机.png").resize((60, 60)))
-host_img_tm = ImageTk.PhotoImage(
-    Image.open(sys.path[0] + "/../datas/images/主机_tm.png").resize((60, 60)))
-
-router_img = ImageTk.PhotoImage(
-    Image.open(sys.path[0] + "/../datas/images/路由器.png").resize((60, 60)))
-router_img_tm = ImageTk.PhotoImage(
-    Image.open(sys.path[0] + "/../datas/images/路由器_tm.png").resize((60, 60)))
-
-switch_img = ImageTk.PhotoImage(
-    Image.open(sys.path[0] + "/../datas/images/交换机.png").resize((60, 60)))
-switch_img_tm = ImageTk.PhotoImage(
-    Image.open(sys.path[0] + "/../datas/images/交换机_tm.png").resize((60, 60)))
-
-hub_img = ImageTk.PhotoImage(
-    Image.open(sys.path[0] + "/../datas/images/集线器.png").resize((60, 60)))
-hub_img_tm = ImageTk.PhotoImage(
-    Image.open(sys.path[0] + "/../datas/images/集线器_tm.png").resize((60, 60)))
-
-
 class SimBase():
     # todo: 组件父类
     """
@@ -115,18 +94,6 @@ class SimBase():
         创建图片
         :return:
         """
-        if self.ObjType == 1:
-            self.img = host_img
-            self.img_tm = host_img_tm
-        elif self.ObjType == 2:
-            self.img = router_img
-            self.img_tm = router_img_tm
-        elif self.ObjType == 3:
-            self.img = switch_img
-            self.img_tm = switch_img_tm
-        else:
-            self.img = hub_img
-            self.img_tm = hub_img_tm
         self.canvas.delete("L")
         id = self.canvas.create_image(self.ObjX - 30, self.ObjY - 30,
                                       image=self.img if self.ConfigCorrect == 1 else self.img_tm, anchor="nw",
@@ -488,6 +455,10 @@ class SimHost(SimBase):
         self.interface = [{}]
         self.connections = [None]
         self.set_default_config()
+        self.img = ImageTk.PhotoImage(
+            Image.open(sys.path[0] + "/../datas/images/主机.png").resize((60, 60)))
+        self.img_tm = ImageTk.PhotoImage(
+            Image.open(sys.path[0] + "/../datas/images/主机_tm.png").resize((60, 60)))
 
     def create_packet(self, ip, mac, message):
         """
@@ -548,6 +519,10 @@ class SimRouter(SimBase):
         self.ObjLabel = label if label is not None else self.set_default_name()
         self.router_table = {}
         self.set_default_router_table()
+        self.img = ImageTk.PhotoImage(
+            Image.open(sys.path[0] + "/../datas/images/路由器.png").resize((60, 60)))
+        self.img_tm = ImageTk.PhotoImage(
+            Image.open(sys.path[0] + "/../datas/images/路由器_tm.png").resize((60, 60)))
 
     def set_default_router_table(self):
         """
@@ -653,6 +628,10 @@ class SimSwitch(SimBase):
         self.ObjLabel = label if label is not None else self.set_default_name()
         self.mac_table = {}
         self.set_default_mac_table()
+        self.img = ImageTk.PhotoImage(
+            Image.open(sys.path[0] + "/../datas/images/交换机.png").resize((60, 60)))
+        self.img_tm = ImageTk.PhotoImage(
+            Image.open(sys.path[0] + "/../datas/images/交换机_tm.png").resize((60, 60)))
 
     def set_default_mac_table(self):
         """
@@ -742,6 +721,10 @@ class SimHub(SimBase):
         super().__init__(canvas, x, y, self.ObjID, config, label)
         self.ObjType = 4
         self.ObjLabel = label if label is not None else self.set_default_name()
+        self.img = ImageTk.PhotoImage(
+            Image.open(sys.path[0] + "/../datas/images/集线器.png").resize((60, 60)))
+        self.img_tm = ImageTk.PhotoImage(
+            Image.open(sys.path[0] + "/../datas/images/集线器_tm.png").resize((60, 60)))
 
     def transmit(self, packet: SimPacket):
         """
diff --git a/NetworkAnalog/__pycache__/SimObjs.cpython-37.pyc b/NetworkAnalog/__pycache__/SimObjs.cpython-37.pyc
index 772375f13d0a416036444d9a5ca70aa262bf1086..451b022e904b6e3bee3486127dfef7a10a1dfb9a 100644
GIT binary patch
delta 7327
zcmb_h32<D+wVj?Bjb=tOqtRm7Lbfbhco`vV@QU%i$RJ~6gYDQJAkR<pp5#HZh<<Nu
znQy)f1`-kih^~aJwj8oS0iiNbDN-yUkc5y0XCeRdNC-*F{O@1CippM<h2)<5MjC05
zfuA2-bJTsi`}V!J@4bCr^XN0;N6(1prf4+mq5qzK<uT*WBhhBzj4ZftI2%X?gvan0
z{!I05{H@9av!P^&X(AI&hKUx))MO*cNH&^`GQBzz%ho1qv+-nHcrNo8K_hgl#|Rzw
zChMpdHfpF>L%n+HMT{u*qSR}kUd*VaUaeVo+?Q;m{^fC_jtF&3m_~$pqk;Mj+;5_O
zqcM&8)3`s~5W75yrnAtZCn20FD`T32)bQ>eD27C*S2U>=zS&}~dY^BTn5I7Adph1k
zbDf~A_iMfBoFN-jzkg2KOd`s;<Is*dVT^0$Av0&Ut1tO~69{6wPMxe;xfb)u5W1~v
zeNxYwjxSfpI{q9rE7`;?)7A{LPcLL_4HFishQNJ|v#>>VDw9qPXh&o#SU0Js1MMt|
zQ^ng>u#yXD)^a7Pt!r3`5R{O5+A?JW*1Ie%TbH&r#4Md^w|7J?#e`)939n>jF9Bh)
z#&SN<))Zf=epPJe4FZOlF>O;W$6RoimjYPW)zor)>74EOQ~jnb8!<8sM1MAas3g&O
zAa<%hhUTsq-_-FML-ac$*J5xTuSn%{xk_Oc(8%UuPq<x(4kc^m57!XkY@Fx!<}=2P
z)$J=UT6&Rwk=#JEL>2#W{C#<d)R)d=<PM_C9)g}kOhO^Kk-&+hq^aAcmd@(^W?60t
z)^a*v1^^~?{07<BslkeMw8S=tY*~-dRe%J+m_28MFxj3?czmb+Ym0j#HwjUrejIIY
znLO>!;Wb7&WvBAl!F5vA#TF+zh*wV{>{O*~Gi%9aux9D@q2(GCtuB?0&0e*Vnu&mW
zsyy{tj9mxl1{?rP-cq&^Z9qL6`|WTFqXxhP^bt70T;3r2^jQ*;kZIYy;QmgKM3ORp
zxFppkcN~Z7_^cZ;P6$V-Au!y1S%QkqTWI#b(a(x`JZee&uC=}3;w|rz@VVNgi7u}P
zOy=N($>TKIsW07stNL5~tt~8I9cJ?Bj60)iwvfx8U66TJu=88`A@h#n`g*U}umMbV
zVu4S><K$I<s|m^uw;jW-!^vG3-VJcwP2JqEZx0meNrcKy=jyf>)5@~3sC=&PBA~<(
z-&<VN_%%^;1vSr(g3)^QyJ?9v97W^%pGD?6%U-}jdRd3FNb?E5+<;{W2v_PIYG2b;
zYdO;6B~O)R%GPuJnTc`1wq?;FhV%juNMwPT>W!xM`5Qo~FlpSDdd})IrKaa7&}{RB
zT0H%Ej^P5d{q?bX-ni@YXYRgV_EWFmXVOUcMt}FtOWP!z(h=bstFGL*nYwUK@{a-f
zBM+iYJEMIF&;~d_K*0*Ps}Q7G(=1zR+G8}sQgTL8J0A-YfF%GVRnB}88Ao!6wV?$!
zb@$Ao#mfIXS~mmA+i(kZmoRf&UC_Ls3a!*g-Lzt+`ArePnaL}Z-ZHCW2+hNQBLq%$
zVNkoikR6l(^ujw2=Iwkp=cQ`(rIuNjPsdDFvkEOFnXyp+AP64-Fgs=po)aWvp`h+_
zDmrtt-J({)=LAyuyfiFk=7cq5YcdgCn-MzC(=+D>ILWV8f1SCsv8*NY+Cm&&R-0$N
zFx&xN0eLt5VMeZbyy)HoU<avjk7)!1mnmBJ0u<n5fcpR+B}i7~%){D{`{zid8sPdG
z{VYU{M}4TZLyV}$TaR7Ke(sZ364mu>#9{jPg5}!-YB}QAoSdnl2}K0E5zF^+%=`pk
zg3fAWcBA+o^@Z6N^xcA?<A7TMw*g>U2~MoD6WFZh4(S%Vf&3K6Wmeo`8{SR>Pt(tW
zj|BaG5v&h}f)NQiTt;ngJ1)A4r`tM2J*<4zPmri~b4gr9=C*D_%oBx$NBGLm5F|s$
z+C!YSPmK4EaK8<c%EFBM#czuC+}UF7D26%APf@FMqd8T1`yl1|$;+JDw1v!@qeNjE
znw=NL)9qgr0Z1xS>ZW<;2}6B+UYju06Z2X`U-9L6?IO+zi8ny(%eV?Im@Q_ig$pjK
z^e~;qBgM>uCE@_HG%%m@a0;!H1U;nsC_2pbvuHtVc|QQAaYBaF4{Mop&P)i`N|Tk4
zU!YkF)LRQzilb^p;)NZfSjs2H<^(&ZnsT9;K4g|IqhyVhFUXXs!OHR|7EESJHDxK~
ztx#8XyfQpFF(;yYfNm*4l>~%ywJ3WhYr)H4Du>IvO#ZMbov@zMGe<15d+RRuf@7_r
z@L2ir<w}9*ww4bOakF~(f*)?ga1X^RtG5wzM*-t!&Qs4}tgSS2Tk)CBA<@l?_}XGw
z%XgQ1VJ8Fm-s`orAs+<u3iH$y1}Q&NS&{3@?<yW!^oVbh8@h!6%|7$QlV?7Cd-<}J
z1tN~!vE?fZ7oFpynoL^Q;*)A{$=qG6)L!&Q0pm&~>iO`K-d+3Xw?7%!wO#KuGZMy2
zdb^0&MZ_+b2xB_pYPZa7RcDsWsdUY+(2N7c^Oh!sD5}D;gvh9q%Qjy%N@Vv?Cfmf7
zqkK@ViKyg9fkZY+W8GvMNnA81)zan1HsioZ{d1ky)JNsixCJ|V*F(iWE)R*zI<ZX`
zU=&a`PN~NF98r@Y4t0{ss*uPDXqtJ0rah{*u3R*H3pgAH+zJQ-&If!RpaT$DoXX@Q
zXu$&|97sL}fC*Vi`7B!B0F+I@t#;5L@0;|qW)K9u_3>a$uq9Ym8;b_3DOpB?>*?pG
z`uEQL&1%*qJH&-5d&#}pQO{`jlt*~%n$d_I9gW$w*T)TSv&ZmF_nZ==b%y_xI3<pH
zwEDNrsH&LJV0h@uGSI^nuoNUlp+#N1sZpI+6;MN~BH}sqw~fuzi{}o}psWJGxbzKL
z7^JkxcBun(34nu!6Bd{6TwB2J<%a;(fDZ%i1bhT=7hpO7Mi@``YR;w8*ULE|2`8j!
zsf=z}n&z63jfb7TK@wYV9*>wo{{o^(1o@v|v<iPwUfLo8DH@fAQma=dZ$}f-IaPy_
zzUd?v7l%RcTV~D}E4bVxn0y2<RThkvD#<}THDKB=sfBC)yNgx+7FMts?m!FfF;?e;
zPcmG(RnqyleF}b?#$Q!?*3R)`rh02{le%Z^i<d*1-CL2?%Dh=F2=3kvsMp3)<P_4%
zhiUu`_1Se#HR6t`tW1@)e*U#4m<<z5s7?QGg{eFS7G*!@Q@WXGzg2%&zqB%{Zo_2u
zo)^%9?ruOqR<1prXzAEfW+pRs^k7d};hUJm8(c`Or{D$=YM{=b;E4olViAcE*v|b=
z)%HYGaYMgYq*^xK5=(n1K7tfUAw-h;`z2dKW1(OxeMhTm+7u5wM@!{%s&iB4`IEh0
zK97+~-&YT8x?lyDxbNBBgQe;Q?!K1Y-SO+P-x^b~oGY-I&r5pZA}zanfZW}6_KP>q
z5W~HYtDk_LM9lsyz3KFjQ*$<?o6`NPkS}69pbrjCaCxL@Co1y=`tH?iy*Fc8{I$W8
zD-ZR%G`SYCz~-K+7|BpCV&Xh+@r5njf?tieT6d~*rhPas2lz{;f{W9bI%v|XkYQSO
zI;Yzd5L$Y0rs~;B<x27Pt^4pG@{7w_hdHb|X(Knk^KHzrbpSLdBYy(maNu-2itZ@@
zXC{u0lBE$H^lp;T`;(CzJ#%OW^MhPFc4PVjfFA>H0<iVn`w_lYDt)qPyQ6r|<sq@G
zA|8KAbKWfqx2x}W-xuWr31K?b=IVxRGuqPQ`|+l{U064a(&zsk^}x1AyKuU+!KBq#
zR~CCJHqp{;={_XvS0}FclOJh7&Dzr00+t2z{_ClcHy(NX%-vt557F;~>9Bfzd*fdC
z66LSS9yIoC#zDbbzJwJA0RI7C9m<Nt@s7bxRZ{0VrSEA`eOJytcUFLpx#!AR8@A;%
zCSO6z0lW(M4q$x0vABW#<RXH%kQ$JVIW<J+K8?lZ(%tH(dzHr3UHhl2mL5|qRyX(D
z_D)$LPg!A6IU_Wy;T@qxnw?!VnCnk8O!#<ZQ%#*8>UYljf8>WXoFC-(NSQG;$4$(+
zXwdr(=|SzBCX&4{3yzfE8m34MKf~A$utVwXq2hEo+QzNzX5gRG^rOmq^@Gda=9ugZ
z{|TN`I3}Ou9qRR~A6N~!&gt03xz@u8KBAuARdVOys}fVYGc#a!-uAC>XZE`h^5Er^
zr|#R+BlwkIcf#ug=v@Yn#C$~c6JIc)0w=BmXbl0_)Je4N0C3`BSLdSS1E6t6!&Ofo
zNeAg|)=202oxpBxQUQh+a1=~iF_*9Xm#H<D*9yIp^O_UJyMtS=lmo^+LPXbz;)8qZ
z{;8byb@k@H1?P@r_(x^bR>br>1o2{8Jpjjs`No5o!Z#R=&6OBU(a+;4esq6_5GVQW
zel0oS?rv7EB}4sVky`hjB9-|4^Y{3icZ<`P)Z^E525?|0uR7h@sQz-zlf$oJPdH9b
zqPEg=*g@ERrg9MWCN2nn0Uoad*qeSyt+B@+c8_ih{R&VK!aw!+Jf2tXUv-^W{4ES~
z{rX<6v;S2G-+%tOkN&+M^RH>!7jeueQ}~#}u?7ihVupMIGTjM)hK}D()Bk^>$yDXo
z1L@o_-s(vK`hOm_J<yxa+w>Hw4?6xrfj&U_ljSr<eLK6iyT@9MZouf>W2ZBc3!@NG
z+%G+rxeHwskbH@-o3Stx496yH2cs3iHQBsT$e8Qsvhi4`)ZDL-h=_QDA|is`xHs;L
S4SN>HE+*U&-x$xvwSNF8^Yr%s

delta 7212
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
TCBa_D%;0H6*M^pc5+VKH<#^YB

diff --git a/NetworkAnalog/network.db b/NetworkAnalog/network.db
index 9e93d8641e004372f5d59a013e4d414a0c85f9e0..729a5fee1693b4c6edae462bca5485f2d3abc5c1 100644
GIT binary patch
delta 204
zcmZoTz|?SnX@WFk@I)DB#^8+!TjDwRWO-{qaI>I70`KIS+=X_02N}#5MVXj5j17#_
zOw7y@byG~!jC4)RO-ywy4S}qrv{XZ5vlPQr1Isk#;BZeP#-&WX#vJUSoIqWZ4f8cw
zSa=!BCU@i+Gs`lTPTrSyi6@h>#FU9Wlu?|CiF0z{Y*o%+k5DH=#w^B?&8PBZ_%(^K
Tic^C*lyUOJJeAGH^=B0T-&Zz*

delta 203
zcmZoTz|?SnX@WGP{X`jOM*EEkTjDu*Yanp5ph5!g<eJ=tc0GIt8B94vnV2}zEDaMa
z%}va8P12H0bWMybOmr<0EmC!jQ`5|iEt4!w5)Dj)J^W3WRxp(rbFhbkG)*?l*J6Ip
z*gUx-&zRYqv1#(Yyh}W8jLoJ@?4gX}OiY}U3umix2781$88UV;Hg7(aFT<}%j76Lp
R%%O~vC+4YaHm*Ob005RUI4J-C