From 9fc7359dd1dc307ad14af27a094f4fc0b9153448 Mon Sep 17 00:00:00 2001
From: danamir <danamir522@gmail.com>
Date: Sun, 15 Apr 2018 18:02:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=82=D0=BE=D1=80=D0=B0=D1=8F=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B0=20=D0=B0=D0=B2=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=D0=BD=D0=BE=D1=8D=D0=BA=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BC=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=B4=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B8=D0=B7=D0=BE=D0=B1=D0=BD=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F,=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py            |  22 ++++++++--------------
 odd-perekrestok.db | Bin 0 -> 12288 bytes
 validators.py      |  32 ++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100644 odd-perekrestok.db
 create mode 100644 validators.py

diff --git a/main.py b/main.py
index 2915c26..1d997ff 100644
--- a/main.py
+++ b/main.py
@@ -4,6 +4,7 @@ import wx.xrc
 import sqlite3
 
 
+
 class MainFrame(wx.Frame):
     def __init__(self, parent):
         wx.Frame.__init__(self, parent, id=wx.ID_ANY, title=wx.EmptyString, pos=wx.DefaultPosition,
@@ -17,9 +18,6 @@ class MainFrame(wx.Frame):
         pass
 
 
-############################################################################# Class MainFramePanel
-###########################################################################
-
 class MainFramePanel(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 500),
@@ -32,7 +30,7 @@ class MainFramePanel(wx.Panel):
         self.lbl_kaf.Wrap(-1)
         bSizer1.Add(self.lbl_kaf, 0, wx.ALIGN_CENTER | wx.ALL, 5)
 
-        self.lbl_NameProg = wx.StaticText(self, wx.ID_ANY, u"Расчёт цикла светофорного регулирования на перекрёстке\n",
+        self.lbl_NameProg = wx.StaticText(self, wx.ID_ANY, u"Расчёт цикла светофорного регулирования на перекрёстке",
                                           wx.DefaultPosition, wx.DefaultSize, 0)
         self.lbl_NameProg.Wrap(-1)
         bSizer1.Add(self.lbl_NameProg, 0, wx.ALIGN_CENTER | wx.ALL, 5)
@@ -93,28 +91,24 @@ class MainFramePanel(wx.Panel):
     def on_init(self):
         pass
 
+    def go_page2(self, event):
+        values = []
 
-    def go_page2(self,event):
-        text = []
-        login = " "
         name = self.inpt_name.GetValue()
-        text.append(name)
-        login = ''.join(str(name))
+        values.append(name)
         familia = self.inpt_familia.GetValue()
-        text.append(familia)
+        values.append(familia)
 
         group = self.inpt_group.GetValue()
-        text.append(group)
+        values.append(group)
 
         zach_numb = str(self.inpt_zachetka.GetValue())
 
         variant_num = zach_numb[-2:len(zach_numb)]
         from gui import page2
+        print(values)
 
         page2.MyPanel5.run_page(self)
-        print(login)
-
-
 
 
 app = wx.App()
diff --git a/odd-perekrestok.db b/odd-perekrestok.db
new file mode 100644
index 0000000000000000000000000000000000000000..310d049b98f71618900d22654a1c46730354fce2
GIT binary patch
literal 12288
zcmeI%!Aiq07zgmA6?J2^^DqX&;PbYjs9XC0)){43r>iZvQ|YimVe4>qqIbdP+Q}F3
zAv}066Y5SQyDI;Wgd}a6ul==`(3_r{WHH^3C!;7Mi<KGY?3jo#rpc<yng^GiwR|Ak
z`B)ViJK(p5`N=e6#*CTyuDSr{ApijgKmY;|fB*y_009U<V2Qx1&Nr&H8h`6&(O?)q
zMUx~-vzNTp+MaNHLB4b13d)aCUG~CsIvT_i>U4c^E<C#SI+u>urwh@ipxfyMg1T2e
zbpzMkrzFkdG)$Ynv+GuaPQ{rMxIWd78jBe#Olc`sSz(4cPfNXurMweMoySt=v6Xpj
zbsl?Zp2nfJUTxPnOVYde`SD>W_w->j&Bj0DFn{e~Gw;p!^_%lA%8-?tA50bm1Rwwb
z2tWV=5P$##AOHafKmY=NSYU^5$-nxGC{}2%R4Q-p+Pz9qJ{LE?m@EhgKmY;|fB*y_
U009U<00Izz00jP_fUXw`--y7jivR!s

literal 0
HcmV?d00001

diff --git a/validators.py b/validators.py
new file mode 100644
index 0000000..299f465
--- /dev/null
+++ b/validators.py
@@ -0,0 +1,32 @@
+import wx
+import string
+
+class DataValidator(wx.PyValidator):
+    def __init__(self):
+        wx.PyValidator.__init__(self)
+        self.flag = flag
+        self.Bind(wx.EVT_CHAR, self.OnChar)
+
+    def clone(self):
+        return DataValidator()
+
+    def validate(self):
+        return True
+
+    def TransferToWindow(self):
+        return True
+
+    def TransferFromWindow(self):
+        return True
+
+    def OnChar(self, event):
+        keycode = int(event.GetKeyCode())
+        if keycode < 256:
+            #print keycode
+            key = chr(keycode)
+            #print key
+            if self.flag == 'no-alpha' and key in string.ascii_letters:
+                return
+            if self.flag == 'no-digit' and key in string.digits:
+                return
+        event.Skip()
\ No newline at end of file