From 7b1ffc3071b3169d08b0d798dc8f4ee8158125b0 Mon Sep 17 00:00:00 2001 From: danamir Date: Sat, 8 Dec 2018 09:32:31 +0300 Subject: [PATCH] alpha release --- db/models.py | 37 ++++++++++++++++++++++++++++++++++++- db/odd.db | Bin 4096 -> 12288 bytes gui/SecondPage.py | 4 ++++ gui/page3.py | 11 ++++++++++- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/db/models.py b/db/models.py index 6ee94ee..a265b6b 100644 --- a/db/models.py +++ b/db/models.py @@ -45,7 +45,42 @@ class KatDorogi(Base): return "KatDor(kategoria=%s, minshirinapolosu=%s, maxshirinapolosu=%s, shirinaobochinu=%s, maxpivedinetns=%s)" % \ (self.kategoria, self.minshirinapolosu, self.maxshirinapolosu, self.shirinaobochinu, self.maxpivedinetns) - +class Zadanie(): + __tablename__ = 'KatDor' + id = Column(Integer, primary_key=True, autoincrement=True) + N1 = Column("N1", Float(Precision=16)) + N11 = Column("N11", Float(Precision=16)) + N12 = Column("N11", Float(Precision=16)) + N13 = Column("N11", Float(Precision=16)) + N1p = Column("N11", Float(Precision=16)) + N2 = Column("N11", Float(Precision=16)) + N21 = Column("N11", Float(Precision=16)) + N22 = Column("N11", Float(Precision=16)) + N23 = Column("N11", Float(Precision=16)) + N2p = Column("N11", Float(Precision=16)) + N3 = Column("N11", Float(Precision=16)) + N31 = Column("N11", Float(Precision=16)) + N32 = Column("N11", Float(Precision=16)) + N33 = Column("N11", Float(Precision=16)) + N3p = Column("N11", Float(Precision=16)) + N4 = Column("N11", Float(Precision=16)) + N41 = Column("N11", Float(Precision=16)) + N42 = Column("N11", Float(Precision=16)) + N43 = Column("N11", Float(Precision=16)) + N4p = Column("N11", Float(Precision=16)) + + def __init__(self, n1, n11, n12, n13): + self.n1 = n1 + self.n11 = n11 + self.n12 = n12 + self.n13 = n13 + + + + + + + meta.create_all(engine) diff --git a/db/odd.db b/db/odd.db index 5a1cc9560e69928788d35aaedd94572e0cff13aa..302247735600acafd23490ee8fd7dc522fd2b416 100644 GIT binary patch literal 12288 zcmeHN-)q}O9KVxfd(v9UmKHaJz(rt)O4CNR%ji?5wO$+Q#;N0sHH-6B@=`PUd{4?~l8$KKDJJ z#pjl9mrd6|>$cO>TvPxYfDn9$5C9;D%ZacsxIT*uhf8$9s4=3>feW){3L8N7B{AdK zmuwFFh(CwC<}&H5G6jKY>Be^ZZUYCaY8}`1@71c-u5TKyDu<0s?-G~EPEEnD6jxho z7^|ADS!PtRSF0tZRzfx9qjCv_I$>7eO&yt*i!2+LPNO04eBHL%uA>oYXs5Qeu$*r> zW>a%^(3Y`tUf?a6IQor)Rw0(PqEe<>#ty~U zp%^<9BZs=(=rk=gh(eIM8*C;!ISKDeK5jQP_nPel-&_JUF%XIhObabWs$y@PI+?x0yymjsEef#R7nuzSgW&>N0nk&;Xe zk%;gkrqgLZP3Kahk}ygTIc$)0e~0*WXP}>qy-9zpWw)anmK#<~64p>U3Rg>O8t4&T`bPD9&gLr?@nx=!ahOsT@Pw=S}m^j7DNS4oWDR5{dQW8U7jL)U?cdMOU(T^9@WC`2sbU-NskcY$o_fE_@cESsObT3|=K4MC z|G58+_lW4dUF1FLcX8iO@HpS)@o?XJKjgtr%KQw(A)I2cau?g}W1nx6A#i_?^`F?) zM?W>yQUoXhZxI4?{l7(%NgstGa6|+IVn6s+e?)(3P7$C8j4uLo{g3b5(a0$RZ;Al@ z|No{4Qh$oT_#$wU`3tb%8DKwSGT_;N#myZaFC5-Q%Ks6Dk@A1X!vEpa+oJqmOox*F zpMx&|+hVmwmAuO&D9@zswKRNWK19PO z+4{&VJ4zGJK#nBA=#Z4}xNVmLCA@Jc(l3psTxxECBGAcB7%FCu}l z?a(-(F6bJw!tIq3W{t0vK1D;u0&iQ9)MwP^CPs1Nk$-eRL+E|}zR!t2m>5i#&@7oC zVki}9ZbUF1A~%kBR$<`%KZDaMIPY+z9{_4h5ugZ+D+2WWe_Usd#!V48HU!97-gj}K Q`~R^)N;{$m{QnX72RF32x&QzG delta 105 zcmZojXi%6SEhxyqz`z2;%s|WtVo%gD78YdC)5zpy`pCe<#LmDR!^F 0: if str(self.pr_hor) == self.text_ctrl_1.GetValue(): + self.file = open("123", "w").close() + self.file = open("123", "w") + self.file.writelines(self.text_ctrl_1.GetValue()+"\n") + self.file.close() print("good") self.bitmap_2.Hide() self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/good.jpg" diff --git a/gui/page3.py b/gui/page3.py index b65d34a..4da4fb7 100755 --- a/gui/page3.py +++ b/gui/page3.py @@ -50,6 +50,7 @@ class Page3Frame(wx.Frame): self.text_ctrl_12 = wx.TextCtrl(self.panel_1, wx.ID_ANY, style=wx.TE_PROCESS_ENTER) self.text_ctrl_12.Bind(wx.EVT_TEXT_ENTER, self.proverka_vvoda12) self.btn_page4 = wx.Button(self, wx.ID_ANY, u"\u0414\u0430\u043b\u0435\u0435") + self.btn_page4.Bind(wx.EVT_BUTTON, self.gopage4) self.__do_layout() @@ -334,7 +335,7 @@ class Page3Frame(wx.Frame): self.label_17.SetLabel("N11 = " + str(self.data[1][0]) + "=") self.label_18.SetLabel("N12 = " + str(self.data[2][0]) + "=") self.label_19.SetLabel("N1 прямо = " + str(self.data[0][1]) + "-" + str(self.data[1][1]) + "-" + str(self.data[2][1]) + "=") - + self.label_20.SetLabel("N2 =" + str(self.data[3][0]) + "=") self.label_21.SetLabel("N21 =" + str(self.data[4][0]) + "=") self.label_22.SetLabel("N22 =" + str(self.data[5][0]) + "=") @@ -418,8 +419,12 @@ class Page3Frame(wx.Frame): if len(self.text_ctrl_4.GetValue()) > 0: self.s = float(self.data[0][1]) - float(self.data[1][1]) - float(self.data[2][1]) self.s1 = "%.2f" % self.s + self.file = open("123", "a") + self.file.writelines(self.s1) + self.file.close() if self.text_ctrl_4.GetValue() == str(self.s1): + print("good") print( str(float(self.data[0][1]) - float(self.data[1][1]) - float(self.data[2][1]))) @@ -611,6 +616,10 @@ class Page3Frame(wx.Frame): self.bitmap_2.Show() self.text_ctrl_1.SetValue(str(self.s1)) self.Refresh() + def gopage4(self, event): + from gui import page4 + page4.MyApp.OnInit(page4) + self.Destroy() class Page3(wx.App):