From 5cb6038eaa98c121d0885332b4aafd8c7f97589a Mon Sep 17 00:00:00 2001 From: Chris Kiehl Date: Sun, 26 Jan 2014 21:07:15 -0500 Subject: [PATCH] Deleted some stuff. added some stuff. Forgot to commit regularly --- .../advanced_config_integration_test.py | 18 ---- src/app/dialogs/body.py | 26 ------ src/app/dialogs/body.pyc | Bin 1232 -> 0 bytes src/app/dialogs/component_register.py | 5 +- src/app/dialogs/controller.py | 45 +++++++--- src/app/dialogs/experiments.py | 51 ----------- src/app/dialogs/header.py | 1 - src/app/dialogs/header.pyc | Bin 4725 -> 4650 bytes src/app/dialogs/model.py | 85 ------------------ src/app/dialogs/runtime_display_panel.py | 21 +++-- src/app/dialogs/segoe_statictext.py | 28 ------ src/app/dialogs/simple_config_panel.py | 55 ------------ src/app/dialogs/test.py | 15 ---- src/app/images/alessandro_rei_checkmark.png | Bin 0 -> 13373 bytes src/app/images/image_store.py | 1 + src/app/images/image_store.pyc | Bin 1081 -> 1206 bytes src/app/testrun.py | 21 ----- src/app/widgets/__init__.py | 0 src/experiments/command.py | 49 ++++------ src/languages/eng.py | 12 ++- src/languages/english.json | 6 +- src/mockapplication/mockapp.py | 1 + src/model/integration_test.py | 8 -- src/parser/MultiChoiceOption.py | 0 src/parser/RequiredOption.py | 0 src/parser/__init__.py | 0 src/parser/option.py | 14 --- 27 files changed, 84 insertions(+), 378 deletions(-) delete mode 100644 src/app/dialogs/advanced_config_integration_test.py delete mode 100644 src/app/dialogs/body.py delete mode 100644 src/app/dialogs/body.pyc delete mode 100644 src/app/dialogs/experiments.py delete mode 100644 src/app/dialogs/model.py delete mode 100644 src/app/dialogs/segoe_statictext.py delete mode 100644 src/app/dialogs/simple_config_panel.py delete mode 100644 src/app/dialogs/test.py create mode 100644 src/app/images/alessandro_rei_checkmark.png delete mode 100644 src/app/testrun.py delete mode 100644 src/app/widgets/__init__.py delete mode 100644 src/model/integration_test.py delete mode 100644 src/parser/MultiChoiceOption.py delete mode 100644 src/parser/RequiredOption.py delete mode 100644 src/parser/__init__.py delete mode 100644 src/parser/option.py diff --git a/src/app/dialogs/advanced_config_integration_test.py b/src/app/dialogs/advanced_config_integration_test.py deleted file mode 100644 index 14c5af8..0000000 --- a/src/app/dialogs/advanced_config_integration_test.py +++ /dev/null @@ -1,18 +0,0 @@ -''' -Created on Jan 19, 2014 - -@author: Chris -''' - -import argparse_test_data - - -client_parser_obj = argparse_test_data.parser - -frame = MainWindow(client_parser_obj) - - - - -if __name__ == '__main__': - pass \ No newline at end of file diff --git a/src/app/dialogs/body.py b/src/app/dialogs/body.py deleted file mode 100644 index 55cc53e..0000000 --- a/src/app/dialogs/body.py +++ /dev/null @@ -1,26 +0,0 @@ -''' -Created on Dec 23, 2013 - -@author: Chris -''' - -import wx - -class BasicDisplayPanel(wx.Panel): - def __init__(self, parent, **kwargs): - wx.Panel.__init__(self, parent, **kwargs) - - self.SetBackgroundColour('#F0F0F0') - - sizer = wx.BoxSizer(wx.VERTICAL) - sizer.AddSpacer(10) - text = wx.StaticText(self, label="Running bla bla bla") - sizer.Add(text, 0, wx.LEFT, 20) - sizer.AddSpacer(10) - - self.cmd_textbox = wx.TextCtrl( - self, -1, "", - style=wx.TE_MULTILINE | wx.TE_READONLY) - sizer.Add(self.cmd_textbox, 1, wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, 20) - self.SetSizer(sizer) - \ No newline at end of file diff --git a/src/app/dialogs/body.pyc b/src/app/dialogs/body.pyc deleted file mode 100644 index aa3097d425d4c688884fb47f547ded6f09c23bf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1232 zcmb_aOK;Oa5T13?v~?4p1uD2j;u0hTecUPp&8sCMO)JMmG_qtl-fg<6Yg^up+Mx6l zuKWRh8+U#HM-DKvNvOoRwsv-Qp5Hujze@J+??0Rn=3fr)eLU(75)RNq%79xCG3X(a z1HoWu!8!7I_zExuIP2xeqFY%a$CpU#dL{xbcsYs74H1@ic3+iuwzhX|dp{WIizM4C z*Do@uZ21Sjj$TKfTA*aukSdLW@ktPi=pQCVS_(~O0x@B3pxiwRoNk5Gp@oFfFXQ=$ zNBu;i0fq+c1Yp8oV!<~H7(Rvwn8B0*Ba^%_T%z}F4kkGm7O0+udKu6I3&(n=jNRsq z#R^RFz?Y2YD)0hK^BDPmSKGKQ1788YYHZgGEkbRYBOrch5e;#afZOwc1nU9R=z2K2 z9zku91%>P6MgXx9-O3u)+EG;ci-RrtrA^gSKcb*7BJ~(KXB5XW9+dl0us9OMAfFJS zIbgQAm(t@%NNQ|lgJjg*>l+i$j7G1Z!1rY=weM?+-W9qQgqMRX8O6MwM9C;KMz!Ro zE5C@@<5SadTlH#NucAkl^KKf1s3Ndk9cUT4;zny)K~(BI-tFdrYvPcmuCquNQR+7R zqtmwAYPUK~O~s?YX;vG@o%We|hgaO!=+RGRpq3em<#o8YViT zHz>^po5V^)=f)}xG7)RTUS0>;K$$KmQxhSiG!?wT5cM9p`kr^HM5a8m<6a|6QUv0q znb3Od4@S~EOcF8nR2F(cntEIYQ8G|oKjGuo>DVEh)D!g#39wD8WNok#d&-`(l2u?u zw#l|xh1xWqLmXTQoCEpz{#C+95k5_rJ7o6UXK&A=sQZJC}qJaT7LngJP*XbvJ;?aQG_5Z2VhU$rQ>JrsH= zDPBC3I3DyS6bgEg81?8sARaslz4kAV9(r@;)d&0S%)FUzzW4pj9%WOZTPJ#X@kcJO z`xCpC$xO#lQ^x z9rpzv$f{$jJ zTd-|@6;W*I0Xy7Cwqdl?ug>jAj_Q&`%XT;qZyAce4aOp?;sI6%pc&b<)cq4`>V(;7 zvg0X*4+$P2jrkk+9sPxB>Q??grwdn>FCODnzSU>9lhO%i8PzqNJu!sk zX?W|t_e|n45bjyw%>BaW;8pCVn-&J-N}(1^RX)_#)OMMqi5x)+dc96^uLuWTn9swZ zH`q^HlDt)hO0r6-N7M5pNtGl@k_0(PFaz;;NpK7uSdVAMX=OmVe80NB;QPw1fQVK; rRhDX>gO#;_7%LkaFI8nzV#ee%0-b;(V-X68giC#fW^H3^Svm>4`7g(+&rV+n|F`ig z;?d-_>zpMv%LUtUSkGZR5v=F3#9=9C+hz6?-7b60*ek|1dKH#ftlKG%o~;BGWay@Y zVY;5~>2IHJSi(Vzgk$R?_hHjp7ZlNgU!||yhLOF>IsC8}q>ok=5QGFZ6Y8PZKFY-` z$JjT{2i|}=cbYfht~-NlTkcCy#gHrT+a1-%Q5r0ncXF#ksmdle2TVM7}99APyN7tRB z(4U}AF9loJ-9hkP+(h$zxEel`Wt5bQaLNjA!x#K9__d$2R8W(@o9earNt&DLszDiZ z1Wj<|l-XVv_GG|g*q6&oM5buDiZ-guz_blT^QjgAb)~2Wb&ucy{E-`irV3&0%*BjS zG|@y+GVDi@*_S4^Y$qP1&vlmTCTj8S?qZU~`EXDy7IfRF(6P??8c(dy&onVnl*ua; cM^#-W5Cj(1eFWavn7OiJ`P}D{OUtqT0dBu|YybcN diff --git a/src/app/dialogs/model.py b/src/app/dialogs/model.py deleted file mode 100644 index 99e238a..0000000 --- a/src/app/dialogs/model.py +++ /dev/null @@ -1,85 +0,0 @@ -''' -Created on Jan 23, 2014 - -@author: Chris -''' - -import sys -import types -from app.dialogs.action_sorter import ActionSorter - -class ArgumentError(Exception): - pass - -class Model(object): - _instance = None - - def __init__(self, parser=None): - self._parser = parser - self.description = parser.description - - self.action_groups = ActionSorter(self._parser._actions) - - # monkey patch - print self._parser.error - self._parser.error = types.MethodType( - self.ErrorAsString, - self._parser) - print self._parser.error - - Model._instance = self - - def HasPositionals(self): - if self.action_groups._positionals: - return True - return False - - def IsValidArgString(self, arg_string): - if isinstance(self._Parse(arg_string), str): - return False - return True - - def _Parse(self, arg_string): - try: - print self._parser.error - self._parser.parse_args(arg_string.split()) - return True - except ArgumentError as e: - return str(e) - - def GetErrorMsg(self, arg_string): - return self._FormatMsg(self._Parse(arg_string)) - - def _FormatMsg(self, msg): - output = list(msg) - if ':' in output: - output[output.index(':')] = ':\n ' - return ''.join(output) - - def AddToArgv(self, arg_string): - sys.argv.append(arg_string.split()) - - @staticmethod - def ErrorAsString(self, msg): - ''' - Monkey patch for parser.error - Returns the error string rather than - printing and silently exiting. - ''' - raise ArgumentError(msg) - - @classmethod - def GetInstance(cls): - return cls._instance - - - -if __name__ == '__main__': - pass - - -# print m2 - - - - diff --git a/src/app/dialogs/runtime_display_panel.py b/src/app/dialogs/runtime_display_panel.py index 6a43904..dfb8ac1 100644 --- a/src/app/dialogs/runtime_display_panel.py +++ b/src/app/dialogs/runtime_display_panel.py @@ -29,16 +29,8 @@ class RuntimeDisplay(wx.Panel): self._init_properties() self._init_components() self._do_layout() - -# self.queue = Queue.Queue() - _stdout = sys.stdout - _stdout_write = _stdout.write - - sys.stdout = MessagePump() - sys.stdout.write = self.WriteToDisplayBox -# listener = Listener(self.queue, self.cmd_textbox) -# listener.start() - + self._HookStdout() + def _init_properties(self): self.SetBackgroundColour('#F0F0F0') @@ -56,9 +48,16 @@ class RuntimeDisplay(wx.Panel): sizer.Add(self.cmd_textbox, 1, wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, 30) sizer.AddSpacer(20) self.SetSizer(sizer) + + def _HookStdout(self): + _stdout = sys.stdout + _stdout_write = _stdout.write + + sys.stdout = MessagePump() + sys.stdout.write = self.WriteToDisplayBox def AppendText(self, txt): - self.cmd_textbox.AppendText(txt) + self.cmd_textbox.AppendText(txt) def WriteToDisplayBox(self, txt): if txt is not '': diff --git a/src/app/dialogs/segoe_statictext.py b/src/app/dialogs/segoe_statictext.py deleted file mode 100644 index 9378635..0000000 --- a/src/app/dialogs/segoe_statictext.py +++ /dev/null @@ -1,28 +0,0 @@ -''' -Created on Jan 20, 2014 - -@author: Chris -''' - -import wx - -class SegoeText(wx.StaticText): - ''' - Convenience subclass of wx.StaticText. - - Sets the default font to Segoe UI and - has methods fow easily changing size and weight - ''' - - - def __init__(self, parent, label): - wx.StaticText.__init__(self, parent, label=label) - self._font = wx.Font(20, wx.FONTFAMILY_DEFAULT, - wx.FONTWEIGHT_NORMAL, wx.FONTWEIGHT_BOLD, False, - 'Segoe UI Light') - - self.SetFont(self._font) - - def SetWeight(self, weight): - pass - \ No newline at end of file diff --git a/src/app/dialogs/simple_config_panel.py b/src/app/dialogs/simple_config_panel.py deleted file mode 100644 index 781a567..0000000 --- a/src/app/dialogs/simple_config_panel.py +++ /dev/null @@ -1,55 +0,0 @@ -''' -Created on Dec 9, 2013 - -@author: Chris - - -''' - -import wx -import os - -class BodyDisplayPanel(wx.Panel): - def __init__(self, parent, **kwargs): - wx.Panel.__init__(self, parent, **kwargs) - - self.SetBackgroundColour('#F0F0F0') - - sizer = wx.BoxSizer(wx.VERTICAL) - sizer.AddSpacer(10) - -# about_header = wx.StaticText(self, label="About") -# about_header = self._bold_static_text("About") -# about_body = wx.StaticText(self, label="This program does bla. Enter the command line args of your choice to control bla and bla.") -# -# sizer.Add(about_header, 0, wx.LEFT | wx.RIGHT, 20) -# sizer.AddSpacer(5) -# sizer.Add(about_body, 0, wx.LEFT | wx.RIGHT, 20) - - sizer.AddSpacer(40) - - text = self._bold_static_text("Enter Command Line Arguments") -# - sizer.Add(text, 0, wx.LEFT, 20) - sizer.AddSpacer(10) - - h_sizer = wx.BoxSizer(wx.HORIZONTAL) - self.cmd_textbox = wx.TextCtrl( - self, -1, "") - h_sizer.Add(self.cmd_textbox, 1, wx.ALL | wx.EXPAND) - sizer.Add(h_sizer, 0, wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.EXPAND, 20) - - self.SetSizer(sizer) - - def get_contents(self): - return self.cmd_textbox.GetValue() - - def _bold_static_text(self, text_label): - text = wx.StaticText(self, label=text_label) - font_size = text.GetFont().GetPointSize() - bold = wx.Font(font_size, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD) - text.SetFont(bold) - return text - - - diff --git a/src/app/dialogs/test.py b/src/app/dialogs/test.py deleted file mode 100644 index a623f21..0000000 --- a/src/app/dialogs/test.py +++ /dev/null @@ -1,15 +0,0 @@ -''' -Created on Dec 8, 2013 - -@author: Chris -''' - - - - - - - - - -# im = Image.open(images.computer) diff --git a/src/app/images/alessandro_rei_checkmark.png b/src/app/images/alessandro_rei_checkmark.png new file mode 100644 index 0000000000000000000000000000000000000000..d73d0ab8fe708e8f2e2207f5a9b35495c7082dd7 GIT binary patch literal 13373 zcmaKTWl$YWv@I3_A-D!R1lQp1?ykWO?(Tk&;10pv-7OH@o#5{7uIB)k@4g@J$E$iX z)w8RnW~SHLwO9A-ncd+^3X;fQ@V`JoK_N>^iK%>8|Nj~S{Kv6Rz;Nutz#GX*ihbCR z?OF6M=))j7Nd0vFuu}iqBu1cH z9?2666B`o^IE=du=S84)iC{$#$m8PFB0qLl>%Xhqm*8>0;aZUlh9P>z$@JmThIjdi zUDswq`_v7wvO3OwKlZIcSAe*uxoJEU)gO9{Ew~hMn9QwuDSu2|97Kn}F;Zv+ho9u# zh(99XxO)EYMOz+xBMJ7VXv|vHXmDlMGQrwK!fjVE_MF8xl+;Hbq?~t)!z|}(?)y^J_S>!9!yedl!hcHNq)}p=yepmA_!XTI zDLs*0bI~orN+YMj^HspUpT(}LB%+5{K~ICH+(W@okxpy<)Zr-XVwV4|{(NBEAR_e_ zW~PRYke;0Hj#ct;0>qGg!$G{7jD)5~qb>~i8iwvr8kS3|^odreuv8Kk@yah=YxjF_ z0<89@5t2JYZcVWV0{h1>jPj$(oiPOUXtI!9kw9^nc4woouJ^D1U|jGE)uSt~v0t-p zO0z9*-;_H0Aj+d9#PBovuWEZl`h>aD*9JWwK)zYRcVQpl$fbl;-Uqzf0*=1`pCK`va3IBzf#$X$5}h5bd1yNeU-+4mIqry0e`Ayx!=*?E zk1b06_rUx5e~0cmHnGA+6OStZiMV7opw8`TW?_ZrRV#SJ{6?)Dd(slvH!CVw#JVWY zP4B3``Mf-mHd1r;&HLvJ<*j0T_|=ZOnmKmS{-zAuBWFz(TqK-_wQ1h+rF1tC_t@vE z%WuQpIf6UOJTyl-pQi|4{n%EoHzGUfjH{i9EX1j4T$+f^Ik5o~NX!t0CUvD4&!v9t zKMB(ai4b$%^syz^`UHXc5JiQzgMJO=5 ze17O?@qkv)Kqi;;rO}+n>6qj;X;@s)o=J~H4}+10RVePg*Ba^TN02T^iQXn@sI^tC z5C`cJwk{n?vR^Gia4NWmmNdH?K58Q7YUk)yw|<9ZwCGDvC~86k(h#@$Yk8@b z@P%lT25&a(ux(ta%Vm7PcK#?ZgRmVxuS81$2KWWBHcb*KE{HvtEjds=OohxymVDfAc^{sNr&CZJ}& zepfir)~15a))fi#a7FtZ`n>16V)kDkM340**u`T1?Kk)l?sLcPiuiPKw8cvp(?2fj zq=O2jCweRHana3@jSu-|WOQYXT*i(8ao7UuHXj7hU+T*=iB!eYAF6lB5aKl#xa69I zXDG_uhHCv@WW4Rs^r~FaSDp1Kd7TV+beLUczsixM-~iW^ErxUr%~uJZ=j7KN#MH6M7~6Pb%+poloJl7hY7R(4EV7pY%Y#$!IfHn$ z&|%PZBk2Bx{#b?1OnjW9ibJ4&Nye^pcB-ssM*Mv4D+;I1@~&|6D%x-Nh3e?)hrBoDU=Ga@;%F#Kp|zh_D2kUi+_eG6iWi!LwBg}jaBd0#mo>yJ@tgn{uf0qBRa zu>mde(9dfkb??;g!acU>55mv=Nrws|Vd?CC;+JP*!%#7v-@)rbz`x2IIZ$b0Z||L`UBL#ru!}-_}cZv(=sjJdXOL z%h0De3vssJfhA57VyAnT{zZYC2*Mq-+D! z!?3)xdAVkD#zJoa#_J5HKWCbLg@SIBo?1{L_dzJ{dvcC1OudG`e(rovd?{Vl5r*O( zg^oraYq6O;=Nb$2kNqGzWw0QcCl=!h zV?x9VN8B1kJ-w##AH19%%!`1F&{h)@7N08+8~M`YIeETLjeM2F@ryX}96P+{vHW#o zAZKrJ!6%+Q%ldR{D5M~MCffN&!&QV+#dk4G>mMBLcU(6y zu0BcAt=jQZUI+%=^eM`e)4mn`FEnZqVdkq?A^ia?*fde3qMN2EIiLrhQ){ffN`m2exp{8 zEHK2v$#fSN7fqLYcO(QgKZr#sG#-5@N;LEuJS!^kxJ0Vc$4dlUa<5x8dEYyROAjlEiE*;G}C=c zDHdP)`_KBXbUp2A)fi%u`((a5DJ!dss`JA@IOYAbyHKO*D5rgFKY4v^p2cg`ihk2z z!>vLXLnod2CSJBVvKQFS0}jJ9m*VJz8f6RYbBBGhWqxXwH0bEFRh#x>uRGXun7r5R z+@aM^UkhhtwpYg=Ytzm%7l1Umc5Vmv-r8iWgvbxs<-&6%@D+!n$-{-Q8T|x*(ZJHU zo^x+jX3#u3K0D~n%ahv9^Wk~y-#gn=qM%1r?;Vw5uf)lxrscU5!P4|QI@0U4PlZ~4 zpT%d!D7DfS(-!uMPPHSepNxE$uj$+@r7(9EqwKF3D`N)Yuv=Cf1R!kcru^vRJwQ3& zbojzAAy-fs`QRP!k1D+jLhFX@mOnUDrF(J>Q!edVBLQz|@@%zrLEql}(Axk<6Di*< zkY3E#9{quI=u0xL!a<3<;Kbb=p)mXx=R`w+*&7FrEKj3yHg-JmX#>3A-8>|u$<};L z0IiqY)g}`(&%1%Nlju}n ziM~ppKP!SVl3;Xax!S|^h%KMtn;7gn#p*pO_t#34&aht#E1~>v*UL9+ zxwm%zJULIYGHy-?%-(x6b5K3j;f^45%v$tKln8k`{VquLKW45f6bjywbCV+f3UoJ( z2@IXAS)OJ31gwU3j!YH%h0Rj$4s4p#ZWs_>o$ONNaVT$}e;3xf6)#j*{~OKB@9`rh zjDz$J+<*4I^KH@jxgNE_+KOu9WiNV=`^|$aMZ&JBxkmQ9Gu}U?7-%pw=M2YD8noG7 zmc%T{`Kmyc>{?}T+%FAznk-50rjjdBiG@CI;BA@ok6%!TrTXWxiz8s(lu0N2+OK2h16N4fL zjQZCu9oX1u+KHHZdO50z>6$;A`bzyl&jSVw_e7gRNHrP2c)XN3kz_v7Zm1RCiHPpW*@!`=*Py>HX5_JVZ&+zHBjs|XKh+Z6+}?*=J>;;={)150K71F?sg&48 zJMu4&DOC|_LO<_dNLZV2RpNzb|nswYxOVo4%;mkybC^`;n4F~Q$aFtDB zT1V*@f4tI9W!|aU`R;RQ!wAP!4s9CM;+?%Jkj87n@Kg5aBvDy>B!)*EMqd8+@e%}| zjvqZpYt}qgkbO*++0UrwLO6a6>ewXof0?V5grf^dF?YM^y}Om1hXiYEAxzi<6*iw( zI^U~unE2TxX_>(RO{ipi+wBAzH9@5@v{+#cKHs-wPzev0yJG~ggDB9*$^MZ#c7ZX1 ze&T+lfJ2W+y>drSLYLx@jb~8zxJ`hOXL6%Ft0n`BUglo0`g_c<_*&=VkDGuGoQJgyVZH8M8=F;s{+8uuT9B@Vuy{Kzt>Zn6m!{szR}fij7L53fA>rTWe?@Mq)+ z5Gb307+1jbl$PM;`w$$&h6oahmVLE>>|u&Gue<^G zR1*$G1R|HHgdi`LV0u9Yqc5Ce)Cv=kF4R582yZ3^F_F{EzU~K zw3%m!p~UZ7Nj9&3YlaV$1o^2$3mirmHrPOg$odVfi2*&9>d7|nu7B&)>#(5zj4m(s zX+TwQO8phEJJ9Ra{>snnhj|CA1TQl4pmLevsLVJJfPS{T1Ubggc?Ru1d4_2InK-$IGh!&v4 zW*A^K^Y_ZkIFL-cA1z&R2YDa*MoC@+%qU`aBII( zgZBf4+hixx)L9q)Rg+Fh%s$cBG2!`sc-On*SHFqF5~Bt{(B)@kiP+CiH8TDWo4Cf6 zT4a>A1I_T1M+(boE%` zwM|V9NI0|JE|qH5S`YPaEQQzzo{tWG%U7Vc0+q?#+8Yp|H!S2F$Ug+4v><-MK{}%d z^LAfBuri%C)HCj8`#4$atkzUT79uu2MQ`25tw3WD|LeHbz)~!5R4r%jtcKl zWNBP^VuS`_l9AvspQU-H={YlYp76X|RFj}QB~N?hMh?9nqNb+(NEn6D5Xq=V-S+JL z;IR7{V}g+_Xexug3Lxws^KKG_hgey6+$i5-7AWT~kaelt_oALv(bZPzDh|qH8L{yU zQLKi11-4$bP-9W0B1Ix*Bp&0~y0i`XUPgaujZm4V{d^Ge++w~F6>)R!`#7BdkAYE0 zUL-LdqzzsmxY3rbWg3~a?Z1OL&1{Q~cpyW24x6fKi>FKR`<$f1@UU zB3cLzk?7x3L zNjSgkzC!~Z)qnZm;Aa{o-Bcl5%G4y zUTQxN*_*+(f^$kl|<9#ZrT-7Rq!;I-=H z`MqoGUWj5$&&T4{zj3^d?EW^Rg*!L+`|r*PT-uFUt^4@gWbw`b3+R5UgJkyuGfh6t zCMT%182rf2OoOcRhwA_AeBKXTVsB2AqZI{O17fH-z$O{VHj3SlXt4bxu%x=x?+G&~KhKGS6MhQW0YETqzqnV|_s;ZaGnhn0qfp<^OY z8Z%dE*tDRpM%HdTA6X-eSuqburubzl(sw2M7HK+&NvR~pa+>qhU)OI0+3%1~z1;{r z{MPTqk7SRoNM_sQ05s8McwEz;9}Tr97|!PK30t;_{DUsWov5zYiB6gjxDoXbER9hn z{KO~D_kBdU53 zBVu(d;q#jIf2G=P#zkj0ibBt59&9cqKSGu(*A)Aqd=GT~;|C{FbrTNH8h_ylI*gOtQ7r_&qr_B`Y*tDc)7nk1sW=6VU{ z#-I~^(uL_%>;_@4gIM7Z*fvr}5#T)Jx$i6bxIyKNqG)*40{fV{jw_+hBg3e5G<`t6 zcg}W}mJE>Z!@G!kb4mgo2U}O!dq?vuc2iv`{szy^LV2SeIY1a}Ckvse*GLtghg+Etc`z&^7GPciEMex~llztRvx1`B={kHTdc zq~xZ}o|%!=(_B9X;eYn|6p-H;YzE5yBn1o)|LZ;yk^ayP#{lP5SJ*W6S>`*RoIsX& zKeF@Yn|;vzS@!x=^GJ!-O8qbFD!S{Pt8}=%e0gX!*gdYWh^8)ym?asd799Ca0e$|D zxJxo9W zxQIz>%ZdGlG#CCA`%@d^#WPtG6{RqTn&oiWc}XJkH&Wybi1%)SX8N7?_~#A{ z9^1HpmCf9+@SuKf&M}IP6pXUnqO>ezcapY+u&gE{)X$Xj@vN;e&1yrzDGz=}verBc zgVMxRPHtfQg-88CAya^Yo)0sQG$me)(L)}G|2HtC=fv+p{bBs}8L3AQ|GOHWEXLL4 zd*lSxPy3Jrk0p>k&=2t1xEMVUnmkZIfH?Ndf~~YqSa!K z%I9F#H%Q2Pe8)*+EDJAZWO5P(e@8o8N2H4ZIvF3(Biq;cFL$dgJOA+ zWW=7f^oi#Rk%oNoZ{m}Ftog!3Z8a5T&lnp7 z<|z*(#+H)tAdqLb3i&ZJz{~4NI!tH!l)HTTdo$YB%^)ngag|mEi*PyJCZlOe(1b0>DZCKQ+~;(3CP?6X;t48kFUXP4ng zGOTT5)Zfe~49kJ4z7@(*L?BDvK7j(4*R(TF*q;x@nEttB1en$C$^xhiQ42tKEuSs=gLn~?p0jVjIv_@Ar!RwAO@me|#q!?G9qsQ|on?Khp$f;= zdI=Ne+IYNt5**{sD(})CQVM2ImWwMY$Ii}K8Qi`?`(RT{VPOkb+uLqxu>OV3+K-5k z`$T1YH_f@B^89D4=2UiTN-dlmpn7RKenh>jawN1B!elDlYKjF5g>oyy*y?RsDmS0r_JfT1pFNboF>(dOd&r zO(k}tBncuLlH8vwCBbU{Pys(z#A8-F;kVump0aM>#tLYZ`Vb74%sx|dKq?vQ!p)jiviBW9mppuP9AdT40vY^gt zfeEa+(U6(YIzF@=-F2srM)U_*)!T_ zp|RoBV?gSc^5`V!H5R2Ovhk=TGKQ8mZG7xp0=ygsst;+tiQbp%ZMI``{o`=!Rs2!N zvD4fueN>unK3Q-9$QIH~Ea*fB%{}%vTf^>UO5aUYk-Uzrpz{|3N+mb)@Aa4(JM+WB zzf;B_N|g8c7!8y>4bNDoRwX0ME60D)WPIhGJmSkp8T-3)J{QF%*Af4Mpn2Xp2Sw?3 zxuAt27WDNO7|}+^Ac&`X5HFCVbQ35A(=apprntn2QYRc-Z zZ8jxq1N}L!X9QX!r#XE_n$?EbGwe5;)pi7i)$j;IMXT8e6*qTF`aexavFNQ@Vgj~i z8UB+lPr=Cb0Q5Y@re9T4f(nLiA*`BNy(`$bOlm|VDk*Zu3v2SmT$uO+Ssq4`ObDNQ zg&#B@2Pt1&4<5ibzDwa>-F*@My2gCIXJy-S!Cq}+AR|F+v!Of-~fqkJx)#&?MaIL6ai zsLSG8saKpd2C4+RCqPM_VQ}1n%gax)+zpRSnFb76@>W<@uRrqvR2E2jz z8|>^lnUq8(PutA^qfl1e28e2D^n~?<&w&c}9Q7t0-{|YEyE7L)l`U&(@afg34!0)v z5_y3(Vy<+&uZ-E2oZ_@eMuYO`=mXP!voi|61|?*}-*L&pn6FXR>{9bA1e-?=0Sr~V zmv!t0hSGkBWykdHo1TK0eY1GR!}Ri&@9J4Pv$k%Dkr0wzl3wckPnIjW0q+0KILFX& zaw%=QXaaGKnacc0QaI9LDkmQHRT=13Z_nxaoII4ZoCsD{d3Z?6R1m11kBR_fTF9}{ z_TdaYf%;EM6^$i4PeOx{Kn$h%b|qqzf(wQLTu|OvH$N4vCwMRrNm{wh(9AJvn&W8K3y8QrnZ;QjoYRqda0{EA3EwC z2nAII3^#^RPOM+jH3*DxiPKMzKUA1JbfW9C^4MN;u?&*_!1|j;I-Wq_!SklX?CEWL z2q7J&?_dIj6!}=;-obITsB$zr!9;MK@4O0A$cM#d*#y-@pPIX-d}(b^?~<<+?9(TO zmEqenPB3IeX?<&Z-Z?a#aojg)^5?eG`x}5O>Q{)3ri`ZkObdHfU94Kgw!vP04;(~f zFW(4DJP)SW$~JTK)XOfQ^8>#luL$Pm|Q%2oU|-=P{!EqfQgTQB&DNiaIIh>Q#wDg96dp8X0QcTH_Em==4Al5r8m)Bwa2cKW zhJ5f3!Wyxp9-|_zBUL+{(}Xkrg>;&N+<2$eU3Vq?QU}LHuelTDE?sMeWsiR|Fj_S6hx z!$dZr z;oy#uCeVIy@>*C?*KuZ8mftug>5U_4y1Q8O{sdW+hw^WI->8Mt_nr0zI&8#>3*eWE z&A+BQP3?KJJT7%(Resh~@4R2qle^5=4~&WIcKAhC>U$i3JiPQZ@r_9_2{hd4fO>ru z96r$@fAeyC13jk~m^!G!a1dyyD~Y!awXo#n^{5q`Wp-W@U>{+5@wDNNmlf7ye>!r? zeOR@TIc5rY*g&0|@G~YGeEj-k9|pyaVL_NImP;|9SnY3@E-#f^#KZAWr6?Y}o(7u+SbBZp2p?T@0}XuWvt zoIRjEIH*)`h}DfD+3$p2wxd6qf>^BaFKJ_RdGa(hH41sAOZa zwaTVKn~2}?j#@*WKYY@aK_uB->}L8J_WG8KY?cDXQAbzG8Jw{Pm)13r)ck4sK0p7Q zd%Lr;2!z0i=x9b}gBH?sZqv@p4qugaZe#K0d>8}XixHrhz$LC2zxt!2K8X)u3F19} zV0dfw0lw%bGOJ1miS9RF`eg*IqB<&o@yWMJJOB7u(_3axvY<2m&1ye$$B5w+ITXXHB_uVPqUqpb0h`XwwZ zAzlbI9zN`i@$oAZ%0EqTZpB4GsuJ;&xMatPzw@-;%!`~X=w*Y%ycmYARMieVx&Bp< zb@ZcPYk{FhMDw3qU^+Wjq4Am16l-26zIX~loTf@})TDqlYe;EN<{OkCp&oe)g0AW{^QDS_RhYXc|S%sH48E*V& zaiObtNb9x(?4-Mx>Hfpt&c0~fp`R()eHS~j_gQTERbQy6%a=K_3*eqv=XSvzgy8aGap-PzPJ0bs|v?KvY9+DJNdJrh+($Aj8G#~%p}fT znRVzoZnyPkBdM#bQoaECR=6(tv0Oy6`Zu%B<$^VsovgIp7k^HP?bsF_2aC)bTJCPp z$^FS1oST#@MR_EY54G$R^3_+qEh-Ok;eC!o@)tBB;0SLBL<`y^;~$?;|6_Z)E*Gt6 zNI|lhy`O+IwKs?5w5fa68w7DZZ;Vu&Mcn_1#5Wvyoy)-ONnI)g`pz1WPw9!pY zRDIUETYc#e^h{{3>qY53=A96&K^}9$E#VsTC#XawSomR9gif4Qw*Gt#y$fg$nHzle zxaymg2Q&<@v?>#?(0~axF zkih@617M1!Z>r9Dxuu+$z%Y}cc-x-lO~qp{U~0VEyAw^RTwO`B-Bd%YfF)%?h$6iN zG;Gq_&r=wu!}hJvsJBb}xJir3JB`Bm;w?ikim5EA=C&lLfSW2UD(Qk%CvAbOa6EtWVAcAf5X@l5XWz5{T(Y%xiEwUxc~*$V=!&14;~siBPZk+M+t zB3u^uUs~KOpa~tWTi3%y1Zt{>XObl%H(pk{4X)pX%%r-Zd0n*M6Wjep&U8Qi`Bf73 zUZ5kL4SW@1Huag`&n9s-T|7*BMx0YM>D${u&U?0KUnn|r<73P9^;pgS=_*PF7LS_* z|L{S4&lgFcoj)boItDSJZp)+Kp4usWLi-#zJJ54T$@yENoaltl-RD%_u94u6!Rzu@ zR+q1(1hM3RAd!QZgbY>?jOL_f<8q+XEmF~u|u8{xayJgfoDO#F$6s%o@-EX zi%t5i1p3D3OMl8zwK8;W*L zl(3jgpxTG;kOkUbHBt2b@RVMnp$AWz>#%0t^q8K3M}|XoJc>lK4i|VkqwA7UD_c{U zC1SrFv9CgfRf!T_xw4|;JPjIyMtXb;!qAhm8^u8T<-m`lKJh%|j~iWuyS(#Zm&q19=X_O_DL)waKPHY!=XHkXUdYr<6U5AF@T z_K|P!x}I+ZC+BW75{00*E>v>w-XyhwsYDmCk&;lNe}kS%R_hiV2GRgKXuFa>ci5$J zsk2-hxze{30q^jAHH2a?T%PmNFQ=M*j<+Y{ z#Q~1up}o|Eqb+7FS-#6Ok9)i;S}9gk{S@=RciG0OkOmbGd{0*J|4czQj{CW z^xAHAW^}zBc2V$WnL```-rJA6>K~JYEAf&mPqsto1Y4RIX4@>aOFoaOg^2V{BWNl? zGV}8mZZW8;+jZ!L?{t>!9RW7;WVU@nUFr zbgM%8I%L~GPRr4_Z>nbM``O%?ZQ56{_B0UpKt(=$DjV`b1V1;QMWA4TO;>_mbXt=^dTI)tFKgkYGt z(97_R5BgIx@#;9x%qxFK=TVEGm+5Ir5w%~Ro^)*PcZm3VWkZG6sC*}lXD&91DvV+t zjJO|6mFoW`U#3?Qxz$zPZjKNa_GO2HhCEz~d@$7`UlXmLD!NqPYBlD^XvL^^G?eru zR79A}*G9JUdrV-25KaK7>L!~^C~>YCZGmi(anw3_u~Bv@za6x{p87@qcZ>4>Z{f@T fyE^9i9lDzXA9U&NR`;>E2TEF8L9ANDAn<9>y literal 0 HcmV?d00001 diff --git a/src/app/images/image_store.py b/src/app/images/image_store.py index 89ac2e6..6b227a2 100644 --- a/src/app/images/image_store.py +++ b/src/app/images/image_store.py @@ -7,6 +7,7 @@ Convenience module for keeping the filepaths in one place. """ +alessandro_rei_checkmark = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\alessandro_rei_checkmark.png" computer = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\computer.png" computer2 = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\computer2.png" computer3 = r"C:\Users\Chris\Dropbox\pretty_gui\Gooey\src\app\images\computer3.png" diff --git a/src/app/images/image_store.pyc b/src/app/images/image_store.pyc index 5bbae251953358291d515eb18932ba068781e49d..82d410a008e3fcda681f04b54a85dcdb860b2413 100644 GIT binary patch delta 161 zcmdnVv5ixj`7@E~mkX%9gdIr4$EV~c$H$jQ0NFUT R`7+-S69Ot=V`5`Og#d}+D0~0_ delta 78 zcmdnSxsyYh`7}K Y1Bv+fl>FrQ_{k@jZ!ii>UdSR00LSb%7 diff --git a/src/app/testrun.py b/src/app/testrun.py deleted file mode 100644 index ce66db9..0000000 --- a/src/app/testrun.py +++ /dev/null @@ -1,21 +0,0 @@ -''' -Created on Dec 8, 2013 - -@author: Chris -''' - -import wx -import Queue -from dialogs.display_main import MainWindow - - -if __name__ == '__main__': - queue = Queue.Queue() - # stdoutput = sys.stdout - # out = TestObj(queue) - # sys.stdout = out - - app = wx.App(False) - frame = MainWindow(queue) - frame.Show(True) # Show the frame. - app.MainLoop() \ No newline at end of file diff --git a/src/app/widgets/__init__.py b/src/app/widgets/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/experiments/command.py b/src/experiments/command.py index 7b0e788..3da0204 100644 --- a/src/experiments/command.py +++ b/src/experiments/command.py @@ -8,33 +8,22 @@ Created on Jan 7, 2014 import sys import time -_time = time.time - -class MessagePump(object): - def __init__(self): -# self.queue = queue - self.stdout = sys.stdout - self.asdf = [] - - # Overrides stdout's write method - def write(self, text): - self.asdf.append((text, _time())) -# if text != '': -# self.queue.put(text) - - -# self.queue = Queue.Queue() -_stdout = sys.stdout -sys.stdout = MessagePump() -# listener = Listener(self.queue, self.cmd_textbox) -# listener.start() - -print 'hello!' -time.sleep(1) -print 'Jello!' - -output = sys.stdout.asdf -sys.stdout = _stdout -for i in output: - print i -print _time() \ No newline at end of file + +from multiprocessing.dummy import Process, Pool + +def myFunc(): + time.sleep(2) + print 'whoo!' + raise ValueError("Graaaaaaahhhhh") + + +if __name__ == '__main__': + pool = Pool(1) + try: + pool.apply(myFunc) + except: + print 'Yo, shit is broken, son!' + + + + diff --git a/src/languages/eng.py b/src/languages/eng.py index 6614d89..4990d16 100644 --- a/src/languages/eng.py +++ b/src/languages/eng.py @@ -18,7 +18,17 @@ if __name__ == '__main__': 'running':'Running', "sure_you_want_to_exit":"Are you sure you want to exit?", 'close_program': 'Close Program?', - 'status':'Status' + 'status':'Status', + 'uh_oh': ''' +Uh oh! Looks like there was a problem. +Copy the below error to let your developer know what went wrong. + +{} + ''', + 'error_title':"Error", + 'execution_finished':'Execution Finished', + 'success_message': 'Program completed Sucessfully!\nPress the OK button to exit', + } with open('english.json', 'wb') as f: diff --git a/src/languages/english.json b/src/languages/english.json index bd4882d..f44d7e3 100644 --- a/src/languages/english.json +++ b/src/languages/english.json @@ -1,6 +1,8 @@ { "cancel": "Cancel", "close_program": "Close Program?", + "error_title": "Error", + "execution_finished": "Execution Finished", "next": "Next", "optional_args_msg": "Optional Arguments", "required_args_msg": "Required Arguments", @@ -8,5 +10,7 @@ "settings": "Settings", "simple_config": "Enter Command Line Arguments", "status": "Status", - "sure_you_want_to_exit": "Are you sure you want to exit?" + "success_message": "Program completed Sucessfully!\nPress the OK button to exit", + "sure_you_want_to_exit": "Are you sure you want to exit?", + "uh_oh": "\nUh oh! Looks like there was a problem. \nCopy the below error to let your developer know what went wrong.\n\n{} \t\t\n\t\t" } \ No newline at end of file diff --git a/src/mockapplication/mockapp.py b/src/mockapplication/mockapp.py index 3c30b0c..85d5810 100644 --- a/src/mockapplication/mockapp.py +++ b/src/mockapplication/mockapp.py @@ -39,6 +39,7 @@ def main(): print 'printing message at: %s' % hashlib.md5(str(_time())).hexdigest() _sleep(.5) print 'Finished running the program. Byeeeeesss!' +# raise ValueError("Something has gone wrong! AHHHHHHHHHHH") if __name__ == '__main__': # sys.argv.extend('asdf -c 5 -s'.split()) diff --git a/src/model/integration_test.py b/src/model/integration_test.py deleted file mode 100644 index 5627d34..0000000 --- a/src/model/integration_test.py +++ /dev/null @@ -1,8 +0,0 @@ -''' -Created on Jan 24, 2014 - -@author: Chris -''' - -if __name__ == '__main__': - pass \ No newline at end of file diff --git a/src/parser/MultiChoiceOption.py b/src/parser/MultiChoiceOption.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/parser/RequiredOption.py b/src/parser/RequiredOption.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/parser/__init__.py b/src/parser/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/parser/option.py b/src/parser/option.py deleted file mode 100644 index 7b2c0db..0000000 --- a/src/parser/option.py +++ /dev/null @@ -1,14 +0,0 @@ -''' -Created on Dec 12, 2013 - -@author: Chris -''' - -# parser.add_argument("-r", "--recursive", dest="recurse", action="store_true", help="recurse into subfolders [default: %(default)s]") - -class Option(object): - def __init__(self, arg_option): - self.arg_option = arg_option - - @classmethod - def \ No newline at end of file