From 5e024f07f54ab714a9296f9f57fb9f54cb776680 Mon Sep 17 00:00:00 2001 From: oleting Date: Sun, 24 Jan 2021 21:26:14 +0100 Subject: [PATCH] ~ small fix --- __pycache__/Iinstruction.cpython-39.pyc | Bin 4919 -> 0 bytes __pycache__/code_to_image.cpython-39.pyc | Bin 3259 -> 0 bytes gui/gui.py | 19 +++++++++++++------ gui/utils.py | 7 ++++--- interpreter/NassiShneidermann.py | 7 ++++++- 5 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 __pycache__/Iinstruction.cpython-39.pyc delete mode 100644 __pycache__/code_to_image.cpython-39.pyc diff --git a/__pycache__/Iinstruction.cpython-39.pyc b/__pycache__/Iinstruction.cpython-39.pyc deleted file mode 100644 index 8d97961bd4b9aabd0bb011c40e314373b1e5ae37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4919 zcmcgv&5zs06`vu86h%>5*}Gn^Q-3IJ(nf8)N&0~XL6ADNfgpe(2iT$rh%E@NW_Fir zigJeBcqLG$&7a|e_o#oR*WP%|sn??Dp z!}`;A-k-M#`3{x(fp;H4i~kNCC!B`FrEt|kZKS*Uh`EfST@Q_s>6%JrAsIE?#>jFl zN&@9os)Lk3&CbvPimEHoq#U0Qcr8}Uvc?a~4aA15}bokbD zP5xE1cvsl`#wESppD?i9RCln?M}l;MW7YLiKhfcBTcW|Y`SztoiP(DG23gC|}P1xYT& z{x@QX&)1IzD374UpF$^8MqQ0lR~L+HTz{o;#*J^8YY0;`7N;c|cOZ+e43$B4N!=#b zz`JJVd=W(8#Q87@#?kb_@BCQwhM^zFz2mX$`C-_r-H!)zE$h|{ULr1%%#%PE2!xcT#DgpykU1UnsceD`-o|1P9_I>?9kBi5;MvEATzqr*k z;NUb80T*)QFANWBmWNLQ|3vzu(ZkP01Sw9&@~|G&{)n|aiZ9QU1EXq*Q8~dUF<}L8?yhlnzrc^Y0V9{Nf+@wOyy$_D zdvT^gO=zi}vMb|In;A1RHB$2!>QdpTuV*?`rMt(a|I%CYMO8KZ#zvsIMkHQ(7x`tf z8WYBI2U?8zA#{&U*G5%APu_-cat}LvPQHcR53s}ZWO@M8p`djaZ5#1*5AI??#E708 zUlMJb(Urj6I=XmUFahj#hvdCtJ*HUCZ~pQ%~Pnn1b28v@&A z_OTzvxt!CCnh=N?50py)V`A$72JjFM0Yp5#0yC?D`E7VY{t!C&uHqwPU0GUJF@Y2L zV`yq_2z97Qr?;0=@CKOU(^!ED<}L_pU~VDIXN{RPYtHOhYv!cnwT`e)8>w~0W^K?} z+Dz@Vl{%nz5+iM=ol9-D1;t{fTenG7Af~(zUvY1!0s%MU#81RX01h$CtfTBzqPLV@ zWjoVH{zbpLxqeLb?1h_OCvHAz@f2#R6en&Yf8#|VOx(qcs)3a}aa-zrN8xi=QCuf~ zY@wO?b#+3pihc$y#@rIh;I#g;!@9If?dwxh)aqvPL84B9YEqVvl$_B^dXLN)N>9ii z_ke)R*A*!-ASF7}zTN|z8GFU@hO`ulC?~XU-PM2$$M}EpHg`R zrZw*yZ`r#IiS{A1rK4QSpMtqyTLF7YVE~I#uD#N^&KYoHxvS*HE5=RU02}Pci<4Wx zqB*zPY6slPZofPYV4G5dfOjlm^&ZUitO?6_&ZwDF8xZGIh&d<@luIf^;9aM}iUjp4 zbJ@)ye4f`oAJ6r?>an)u&#_yXRIInJpeK)wQQ_}y0>yILTdP&BwoM4=3Z_yOIHpbFIxq2q zH7BaF?!%2gKvS8uv|YAiNVI*gCB1t+@FRctd?0^{o~)KF{wzI4m+^O~DBD!K(w8^k z7)8Db-$!X>2CyX0pcR|&2kTuZ>ruWBgTIIJ+gU9?OoXbwd=5Wc6AMoB2xF;L$EJAx z|HUD(u;ee-_^CjMe&W8aMEyG(GQR|R`K#skRRG4dK7f`3nC|KTV6@@C?Z^)z&zm~& z>G(Y4gFqzj^`~ZWJym+}H~8`H-^kj-F&AE$9^4CNW-@sZL?`(|i7?D`|7fUwef$>Hem> Z-R)W$ZUfZ$FU`d3?!UEvGTVlc{{`r%4v7E& diff --git a/__pycache__/code_to_image.cpython-39.pyc b/__pycache__/code_to_image.cpython-39.pyc deleted file mode 100644 index f3c1216bb3560638c93ff50f46719b0376a171c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3259 zcmai0OK%)S5T2gLzPx^~gkOi z@`-TZ;vW!{L(I)Tfj@vy1b<*oNF2Zt;>0N@zUtXs&-xL1)IB{_)!o%qU)7X5JX|u+ z3NQa?d_Q3rf6zy^${ES4*Hkq@eBrKykMN| z7(1+Ga&ymeO=Z2XmAS`UN9A7Rxy9{069zJ%inEkh4;F9LosCsbiS4Qs@%0uCjIS@R zyG^kuBPHUs*}GnQRm~~YIw<3WT2WefB~~al63YwP(#B`q)=HP6j#}@i29ZgxdO^vK zP+RLFv1w;XUfnn3C|<7~-n+TN#gmo$TWU25SC-s3_Lf&e;c+1Yw@aAKP-bs?Zdb6ijWfr2+_)M>s!A8}T;JOk z{9^SRcTH5|jucfDRhzEwS9^D@wmgYjF=%^01Hh7pD|{~$iL>ExwR%9;YNMn5zL1!H zkT{YYTeIZ|Xi3fuo2!vb9Gun;;V#ejYmOWyUh%8VrdZb&D@xH+ZrJukG7@xr<P7usyh5Tjf ziYYIHw(lgxW)yN*B?=Euk(a=e?_fCQ$|8u`l|RBTr@NAy=iw%D3AbpbU21b@7xCM5 zx^{Q!`2UfH`?EV8gNjZ0=nyJ{a2h!OP)-Bx__?(AA@!Kv_8^}ZdSK+Xa*zQnUgAT$ zd40zmKwIwGU^tcIBapKBC?DH(dNKriUOt=JswX$D&DsTCN|9 zx+#OM{9g;Typ9$5HtlOuRLCl(@*)j7!fYKS@6tErzf2g6>oD+IjsA77LLjDF7$)#< zUSo4?hFxXz){J$TUA5%<;2eWG1)YZa!`DKcT-?i88F;5TZ6KdzxX5h;2@PvK%Vxlo zcfy{TkQrQ?=F80f-E%cW`X?P`){JCE6P;HHRQ(kvYC_?dm2rAOfQ+n50|NIEnRG{s z0tVp4*s=l6;*y4*2Ar(H+<&GZ`)Q$zwr2|(F>;o8zx_(>?}hy|jcRDf>)^=uXwWb` z2@X>l4)`hiqTxr;dZQ)r@B9pFVgkN~gmZyiVDs!6o_Py^_z3jV0de=WfZ%58TJ1m> zYQWfiUK+i95Oj?QN1n0*X6qRm=I^@y)K!CgIxD4gAuxDG1}v|W(hxla^x+;UAi6h$ zp4nftML+32AbK(u-6g%z01$4#?1yNOAKYT12) zG6LzeDFsq2M+M=Fx^;hPaj9lWs+|%$hD=iCV0#S_@(%Lk$6y@IUb^BUS;~bmWo5&Z zpI}T1jYi;lVWZ*AKr!!M4D~!}O67%XwW-94x8fv+>X0%pt;6|u?&|VV7nQn%lsCc9 z3Z?l~r&6coN3PN(9d=Pt*9NFYQDIVM)X|^~)z^b8)o5f?*C|*RA%#zah blame Kons or yourself!', title='Empty') + elif path: fnames = output(path) sg.popup_annoying('Successfully created!', title='Created', auto_close_duration=2, auto_close=True, text_color='green') @@ -163,10 +166,14 @@ class Gui: # handle event select output folder if event == '-OUTPUT FOLDER-': - logging.debug(('event = ' + str(event) + - ' value = ' + str(values['-OUTPUT FOLDER-']))) - fnames = output(values['-OUTPUT FOLDER-']) - window['-OUTPUT FILE LIST-'].update(fnames) + try: + logging.debug(('event = ' + str(event) + + ' value = ' + str(values['-OUTPUT FOLDER-']))) + fnames = output(values['-OUTPUT FOLDER-']) + window['-OUTPUT FILE LIST-'].update(fnames) + except Exception as e: + logging.error(str(e)) + sg.popup_error(str(e)) elif event == '-OUTPUT FILE LIST-': logging.debug(('event = ' + str(event) + ' value = ' + str(values['-OUTPUT FILE LIST-']))) diff --git a/gui/utils.py b/gui/utils.py index 395b514..4db3e28 100644 --- a/gui/utils.py +++ b/gui/utils.py @@ -23,13 +23,14 @@ def nassi(input_path: str, output_path: str, outputname: str, types, remove_tags custom_tags = {"comments" : comments, "ignore" : remove_tags, "types" : types} - NSD.load_from_file(input_path, custom_tags) - cancel = NSD.convert_to_image(output_directory, on_conflict=behaviour) + is_empty = NSD.load_from_file(input_path, custom_tags) + cancel = NSD.convert_to_image(output_directory, on_conflict=behaviour) + if not cancel: return None - return output_directory + return output_directory, is_empty diff --git a/interpreter/NassiShneidermann.py b/interpreter/NassiShneidermann.py index 09a5835..8f551ea 100644 --- a/interpreter/NassiShneidermann.py +++ b/interpreter/NassiShneidermann.py @@ -84,4 +84,9 @@ class NassiShneidermanDiagram: def load_from_file(self, filepath:str, itp_custom_tags: Optional[Dict[str, List[str]]]): itp = JavaInterpreter(filepath) itp.reset_tags(itp_custom_tags) - self.function_scopes = itp.load_instruction_scopes() \ No newline at end of file + self.function_scopes = itp.load_instruction_scopes() + + if not self.function_scopes: + return True + else: + return False \ No newline at end of file