diff --git a/.gitignore b/.gitignore index a99cb65..5ba631d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ learn .idea .python-version venv +__pycache__ diff --git a/controller.py b/controller.py index 1b986c0..1e9393a 100644 --- a/controller.py +++ b/controller.py @@ -10,7 +10,7 @@ def hex_to_rgb(value): def setBacgroundColor(): """ Устанавливает цвет панели для приложения - :return: + :return: цвет в hex """ hex_color = "#DBF0B2" color =hex_to_rgb(hex_color) diff --git a/db/models.py b/db/models.py index f329782..fcb9b32 100644 --- a/db/models.py +++ b/db/models.py @@ -1,11 +1,17 @@ + from sqlalchemy import Column, Integer, String, Float from sqlalchemy import create_engine from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker import os - +import platform path_db = os.path.abspath("db/odd.db") -path = "sqlite:////" + path_db + +if platform.system() == "Windows": + path = "sqlite:///" + path_db +else: + path = "sqlite:////" + path_db + engine = create_engine(path, echo=True) Session = sessionmaker(bind=engine) Base = declarative_base(engine) @@ -61,13 +67,6 @@ class Zadanie(Base): return "Zadanie(n1=%s)" %(self.n1) - - - - - - - meta.create_all(engine) diff --git a/db/odd.db b/db/odd.db index 7c96006..ca32ec9 100644 Binary files a/db/odd.db and b/db/odd.db differ diff --git a/gui/SecondPage.py b/gui/SecondPage.py index 66cbef7..a0a2150 100644 --- a/gui/SecondPage.py +++ b/gui/SecondPage.py @@ -9,14 +9,14 @@ class SeconPageFrame(wx.Frame): # begin wxGlade: SeconPageFrame.__init__ kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE wx.Frame.__init__(self, *args, **kwds) - self.SetSize((658, 331)) + self.SetSize((800, 600)) self.panel_1 = wx.Panel(self, wx.ID_ANY) - self.panel_1.SetBackgroundColour(self.color) + #self.panel_1.SetBackgroundColour(self.color) self.radio_btn_2 = wx.RadioButton(self.panel_1, wx.ID_ANY, u"Крестообразный") self.radio_btn_3 = wx.RadioButton(self.panel_1, wx.ID_ANY, u"Т-образный") - self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_2 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") + self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "", style = wx.TE_PROCESS_ENTER) + self.text_ctrl_2 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "", style = wx.TE_PROCESS_ENTER) self.text_ctrl_1.Bind(wx.EVT_TEXT_ENTER, self.proverka_vvoda) self.text_ctrl_2.Bind(wx.EVT_TEXT_ENTER, self.proverka_vvoda) @@ -41,7 +41,7 @@ class SeconPageFrame(wx.Frame): self.color = controller.setBacgroundColor() self.SetBackgroundColour(self.color) self.btnColor = controller.setBckgroundButtonColor() - self.btn2.SetBackgroundColour(self.btnColor) + #self.btn2.SetBackgroundColour(self.btnColor) def __do_layout(self): # begin wxGlade: SeconPageFrame.__do_layout @@ -81,8 +81,12 @@ class SeconPageFrame(wx.Frame): grid_sizer_3.Add(self.radio_btn_2, 0, wx.ALIGN_CENTER_HORIZONTAL, 0) grid_sizer_3.Add(self.radio_btn_3, 0, wx.ALIGN_CENTER_HORIZONTAL, 0) - self.bitmap_4 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap(100,100, wx.BITMAP_TYPE_ANY)) - grid_sizer_3.Add(self.bitmap_4, 0, 0, 0) + + self.imgor = "..\\img\\perekr-4.jpg" + self.img = self.scale_bitmap(self.imgor, 150, 150) + self.bitmap_4 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap(100, 100, wx.BITMAP_TYPE_ANY), style=wx.BORDER_NONE) + self.bitmap_4.SetBitmap(wx.Bitmap(self.img)) + grid_sizer_3.Add(self.bitmap_4, 0, wx.ALIGN_CENTER, 0) self.bitmap_5 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap(100, 100, wx.BITMAP_TYPE_ANY)) grid_sizer_3.Add(self.bitmap_5, 0, 0, 0) @@ -107,20 +111,23 @@ class SeconPageFrame(wx.Frame): grid_sizer_2.Add(bitmap_3, 0, 0, 0) sizer_2.Add(grid_sizer_2, 1, wx.EXPAND, 0) + self.button_1 = wx.Button(self.panel_1, wx.ID_ANY, "Далее") + sizer_2.Add(self.button_1, 0, wx.ALIGN_RIGHT, 0) + self.panel_1.SetSizer(sizer_2) sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0) self.SetSizer(sizer_1) self.Layout() def good(self): - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 50, 50) self.bitmap_2.SetBitmap(wx.Bitmap(self.img1)) self.bitmap_2.Show() self.Refresh() def bad(self): - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 70, 50) self.bitmap_3.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_3.Show() @@ -146,7 +153,7 @@ class SeconPageFrame(wx.Frame): self.file.close() print("good") self.bitmap_2.Hide() - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 50, 50) self.bitmap_2.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_2.Show() @@ -154,7 +161,7 @@ class SeconPageFrame(wx.Frame): else: print("bad") self.bitmap_2.Hide() - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 70, 50) self.bitmap_2.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_2.Show() @@ -165,7 +172,7 @@ class SeconPageFrame(wx.Frame): if str(self.pr_Vert) == self.text_ctrl_2.GetValue() and len(self.text_ctrl_2.GetValue()) > 0: print("good") self.bitmap_3.Hide() - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 50, 50) self.bitmap_3.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_3.Show() @@ -173,7 +180,7 @@ class SeconPageFrame(wx.Frame): else: print("Bad") self.bitmap_3.Hide() - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 70, 50) self.bitmap_3.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_3.Show() diff --git a/gui/page3.py b/gui/page3.py index 162fe04..97039ec 100755 --- a/gui/page3.py +++ b/gui/page3.py @@ -119,7 +119,7 @@ class Page3Frame(wx.Frame): grid_sizer_2.Add(self.label_26, (3, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_1, (3, 3), (1, 1), 0, 0) - self.bitmap_1 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_1 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_1.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_1, (3, 4), (1, 1), 0, 0) @@ -131,7 +131,7 @@ class Page3Frame(wx.Frame): grid_sizer_2.Add(self.label_28, (4, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_2, (4, 3), (1, 1), 0, 0) - self.bitmap_2 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_2 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_2.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_2, (4, 4), (1, 1), 0, 0) @@ -143,7 +143,7 @@ class Page3Frame(wx.Frame): grid_sizer_2.Add(self.label_32, (5, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_3, (5, 3), (1, 1), 0, 0) - self.bitmap_3 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_3 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_3.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_3, (5, 4), (1, 1), 0, 0) @@ -154,7 +154,7 @@ class Page3Frame(wx.Frame): self.label_30 = wx.StaticText(self.panel_1, wx.ID_ANY, "") grid_sizer_2.Add(self.label_30, (6, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_4, (6, 3), (1, 1), 0, 0) - self.bitmap_4 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_4 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_4.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_4, (6, 4), (1, 1), 0, 0) @@ -165,7 +165,7 @@ class Page3Frame(wx.Frame): self.label_34 = wx.StaticText(self.panel_1, wx.ID_ANY, "") grid_sizer_2.Add(self.label_34, (7, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_5, (7, 3), (1, 1), 0, 0) - self.bitmap_5 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_5 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_5.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_5, (7, 4), (1, 1), 0, 0) @@ -176,7 +176,7 @@ class Page3Frame(wx.Frame): self.label_36 = wx.StaticText(self.panel_1, wx.ID_ANY, "") grid_sizer_2.Add(self.label_36, (8, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_6, (8, 3), (1, 1), 0, 0) - self.bitmap_6 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_6 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_6.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_6, (8, 4), (1, 1), 0, 0) @@ -187,7 +187,7 @@ class Page3Frame(wx.Frame): self.label_38 = wx.StaticText(self.panel_1, wx.ID_ANY, "") grid_sizer_2.Add(self.label_38, (9, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_7, (9, 3), (1, 1), 0, 0) - self.bitmap_7 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_7 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_7.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_7, (9, 4), (1, 1), 0, 0) self.label_23 = wx.StaticText(self.panel_1, wx.ID_ANY, u"N2(\u043f\u0440\u044f\u043c\u043e) =") @@ -197,7 +197,7 @@ class Page3Frame(wx.Frame): self.label_40 = wx.StaticText(self.panel_1, wx.ID_ANY, "") grid_sizer_2.Add(self.label_40, (10, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_8, (10, 3), (1, 1), 0, 0) - self.bitmap_8 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_8 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_8.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_8, (10, 4), (1, 1), 0, 0) @@ -208,28 +208,28 @@ class Page3Frame(wx.Frame): self.label_42 = wx.StaticText(self.panel_1, wx.ID_ANY, "") grid_sizer_2.Add(self.label_42, (11, 2), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_9, (11, 3), (1, 1), 0, 0) - self.bitmap_9 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_9 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_9.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_9, (11, 4), (1, 1), 0, 0) self.label_100 = wx.StaticText(self.panel_1, wx.ID_ANY, "N31 =") grid_sizer_2.Add(self.label_100, (12, 0), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_10, (12, 3), (1, 1), 0, 0) - self.bitmap_10 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_10 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_10.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_10, (12, 4), (1, 1), 0, 0) self.label_101 = wx.StaticText(self.panel_1, wx.ID_ANY, "N32 =") grid_sizer_2.Add(self.label_101, (13, 0), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_11, (13, 3), (1, 1), 0, 0) - self.bitmap_11 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_11 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_11.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_11, (13, 4), (1, 1), 0, 0) self.label_102 = wx.StaticText(self.panel_1, wx.ID_ANY, "N3 прямо =") grid_sizer_2.Add(self.label_102, (14, 0), (1, 1), 0, 0) grid_sizer_2.Add(self.text_ctrl_12, (14, 3), (1, 1), 0, 0) - self.bitmap_12 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) + self.bitmap_12 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("../img/bad.jpg", wx.BITMAP_TYPE_ANY)) self.bitmap_12.SetMinSize((35, 35)) grid_sizer_2.Add(self.bitmap_12, (14, 4), (1, 1), 0, 0) @@ -357,7 +357,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_1.GetValue() == str(self.data[0][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_1.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_1.Show() @@ -365,7 +365,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_1.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_1.Show() @@ -378,7 +378,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_2.GetValue() == str(self.data[1][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_2.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_2.Show() @@ -386,7 +386,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_2.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_2.Show() @@ -399,7 +399,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_3.GetValue() == str(self.data[2][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_3.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_3.Show() @@ -407,7 +407,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_3.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_3.Show() @@ -428,7 +428,7 @@ class Page3Frame(wx.Frame): print("good") print( str(float(self.data[0][1]) - float(self.data[1][1]) - float(self.data[2][1]))) - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_4.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_4.Show() @@ -436,7 +436,8 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_4.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_4.Show() @@ -451,7 +452,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_5.GetValue() == str(self.data[4][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_5.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_5.Show() @@ -459,7 +460,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_5.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_5.Show() @@ -472,15 +473,15 @@ class Page3Frame(wx.Frame): if self.text_ctrl_6.GetValue() == str(self.data[5][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_6.SetBitmap(wx.Bitmap(self.img4)) - self.bitmap_6.Show() + self.bitmap_6.Hide() self.Refresh() else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_6.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_6.Show() @@ -493,7 +494,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_7.GetValue() == str(self.data[6][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_7.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_7.Show() @@ -501,7 +502,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img2 = "../img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_7.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_7.Show() @@ -517,7 +518,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_8.GetValue() == str(self.s1): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_8.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_8.Show() @@ -539,7 +540,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_9.GetValue() == str(self.data[8][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_9.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_9.Show() @@ -559,7 +560,7 @@ class Page3Frame(wx.Frame): if len(self.text_ctrl_10.GetValue()) > 0: if self.text_ctrl_10.GetValue() == str(self.data[9][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_10.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_10.Show() @@ -579,7 +580,7 @@ class Page3Frame(wx.Frame): if len(self.text_ctrl_11.GetValue()) > 0: if self.text_ctrl_11.GetValue() == str(self.data[10][1]): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_11.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_11.Show() @@ -601,7 +602,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_1.GetValue() == str(self.s1): print("good") self.bitmap_1.Hide() - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" + self.img1 = "../img/bad.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_2.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_2.Show() diff --git a/logger.py b/logger.py new file mode 100644 index 0000000..139597f --- /dev/null +++ b/logger.py @@ -0,0 +1,2 @@ + + diff --git a/main.py b/main.py index 16c03f9..3d5137e 100644 --- a/main.py +++ b/main.py @@ -1,161 +1,167 @@ # -*- coding: UTF-8 -*- - import wx import controller from db.models import Student from sqlalchemy import exists from db.models import Session from gui import SecondPage -import tkinter as tk -import sys + +import logging +import os + +logging.basicConfig(filename="app.log", + filemode='a', + format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s', + datefmt='%H:%M:%S', + level=logging.DEBUG) + +logging.info("Running Urban Planning") class MyFrame(wx.Frame): - def __init__(self, *args, **kwds): - # begin wxGlade: MyFrame.__init__ - kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE - wx.Frame.__init__(self, *args, **kwds) - self.panel_1 = wx.Panel(self, wx.ID_ANY, size=(100, 100)) - self.inpt_name = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.inpt_familia = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.inpt_group = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.inpt_zachetka = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.btn2 = wx.Button(self.panel_1, wx.ID_ANY, u"\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438") - self.button_1 = wx.Button(self.panel_1, wx.ID_ANY, u"\u0414\u0430\u043b\u0435\u0435") - self.size = self.SetSize(600, 600) + def __init__(self, *args, **kwds): + # begin wxGlade: MyFrame.__init__ + kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE + wx.Frame.__init__(self, *args, **kwds) + self.panel_1 = wx.Panel(self, wx.ID_ANY) + self.inpt_name = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") + self.inpt_familia = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") + self.inpt_group = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") + self.inpt_zachetka = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") + self.btn_settings = wx.Button(self.panel_1, wx.ID_ANY, u"\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438") + self.btn_next = wx.Button(self.panel_1, wx.ID_ANY, u"\u0414\u0430\u043b\u0435\u0435") - self.__set_properties() - self.__do_layout() - self.__binds() + self.btn_settings.Bind(wx.EVT_BUTTON, self.setup) + self.btn_next.Bind(wx.EVT_BUTTON, self.go_page2) + + self.__set_properties() + self.__do_layout() + # end wxGlade + + def __set_properties(self): + # begin wxGlade: MyFrame.__set_properties + self.SetTitle("Расчет цикла свеетофорного регулирования: Приветственая") + self.inpt_name.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + self.inpt_familia.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + self.inpt_zachetka.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + self.btn_settings.SetMinSize((100, 50)) + self.btn_next.SetMinSize((100, 50)) + #self.frameSize = controller.setSize() + #elf.SetSize(self.frameSize) + self.SetMinSize((800, 600)) + self.color = controller.setBacgroundColor() + self.panel_1.SetBackgroundColour(self.color) + + # end wxGlade + + def __do_layout(self): + # begin wxGlade: MyFrame.__do_layout + sizer_1 = wx.BoxSizer(wx.VERTICAL) + sizer_2 = wx.StaticBoxSizer(wx.StaticBox(self.panel_1, wx.ID_ANY, ""), wx.VERTICAL) + grid_sizer_2 = wx.GridSizer(0, 2, 0, 0) + grid_sizer_1 = wx.GridSizer(0, 2, 0, 0) + label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u041a\u0430\u0444\u0435\u0434\u0440\u0430 \"\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f \u0438 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c \u0434\u0432\u0438\u0436\u0435\u043d\u0438\u044f\"") + label_1.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + sizer_2.Add(label_1, 0, wx.ALIGN_CENTER | wx.BOTTOM | wx.LEFT | wx.RIGHT, 20) + label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0420\u0430\u0441\u0447\u0435\u0442 \u0446\u0438\u043a\u043b\u0430 \u0441\u0432\u0435\u0442\u043e\u0444\u043e\u0440\u043d\u043e\u0433\u043e \u0440\u0435\u0433\u0443\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043d\u0430 \u043f\u0435\u0440\u0435\u043a\u0440\u0435\u0441\u0442\u043a\u0435") + label_2.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + sizer_2.Add(label_2, 0, wx.ALIGN_CENTER, 0) + label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u041f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044c\u0442\u0435\u0441\u044c") + label_3.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + sizer_2.Add(label_3, 0, wx.ALL, 5) + label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0418\u043c\u044f") + label_4.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + grid_sizer_1.Add(label_4, 0, wx.ALIGN_CENTER, 0) + grid_sizer_1.Add(self.inpt_name, 0, wx.ALIGN_CENTER, 0) + inpt_familia1 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0424\u0430\u043c\u0438\u043b\u0438\u044f") + inpt_familia1.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + grid_sizer_1.Add(inpt_familia1, 0, wx.ALIGN_CENTER, 0) + grid_sizer_1.Add(self.inpt_familia, 0, wx.ALIGN_CENTER, 0) + label_5 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0413\u0440\u0443\u043f\u043f\u0430") + label_5.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + grid_sizer_1.Add(label_5, 0, wx.ALIGN_CENTER, 0) + grid_sizer_1.Add(self.inpt_group, 0, wx.ALIGN_CENTER, 0) + label_6 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u2116 \u0417\u0430\u0447\u0435\u0442\u043d\u043e\u0439 \u043a\u043d\u0438\u0436\u043a\u0438") + label_6.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + grid_sizer_1.Add(label_6, 0, wx.ALIGN_CENTER, 0) + grid_sizer_1.Add(self.inpt_zachetka, 0, wx.ALIGN_CENTER, 0) + sizer_2.Add(grid_sizer_1, 1, wx.EXPAND, 0) + grid_sizer_2.Add(self.btn_settings, 0, wx.ALIGN_BOTTOM, 0) + grid_sizer_2.Add(self.btn_next, 0, wx.ALIGN_BOTTOM | wx.ALIGN_RIGHT, 0) + sizer_2.Add(grid_sizer_2, 1, wx.EXPAND, 0) + self.panel_1.SetSizer(sizer_2) + sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0) + self.SetSizer(sizer_1) + self.Layout() + # end wxGlade + + def empty_pole(self): + + dlg = wx.MessageDialog(self, 'Не все поля заполнены. Заполните все поля перед продолжением', 'Ошибка', wx.OK) + val = dlg.ShowModal() + if val == wx.ID_OK: + dlg.Destroy() + + def go_page2(self, event): - # end wxGlade - def __set_properties(self): - # begin wxGlade: MyFrame.__set_properties - self.SetTitle("Расчет цикла свеетофорного регулирования: Приветственая") - self.inpt_name.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.inpt_familia.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - self.inpt_zachetka.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) + name = self.inpt_name.GetValue() + name = name.replace(' ', '') - self.color = controller.setBacgroundColor() - self.SetBackgroundColour(self.color) - self.btnColor = controller.setBckgroundButtonColor() - self.btn2.SetBackgroundColour(self.btnColor) + familia = self.inpt_familia.GetValue() + if len(familia) == 0: + self.empty_pole() + return + + group = self.inpt_group.GetValue() + if len(group) == 0: + self.empty_pole() + return + zach_number = self.inpt_zachetka.GetValue() + zach_number = zach_number.replace(' ', '') + if len(zach_number) == 0: + self.empty_pole() + return + + fio = str(familia).lower() + ' ' + str(name).lower() + new_session = Session() + + if new_session.query(exists().where(Student.fname == fio). + where(Student.group == group).where(Student.zach_number == zach_number)).scalar(): + print("ЗАГРУЖАЮ ВАШЕ ЗАДАНИЕ") + else: + print("пора занести вас в базу и придумать для вас задание") + student = Student(fname=fio, group=group, zach_number=zach_number) + new_session.add(student) + new_session.commit() + + + SecondPage.SecondPage.OnInit(SecondPage) + self.Destroy() + # todo Перенести весь функционал из main.py + # todo Подключить логирование + # todo Настроить относительные пути к ресурсам + # todo настроить размеры окна - def __do_layout(self): - # begin wxGlade: MyFrame.__do_layout - sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2 = wx.StaticBoxSizer(wx.StaticBox(self.panel_1, wx.ID_ANY, ""), wx.VERTICAL) - grid_sizer_2 = wx.GridSizer(0, 2, 0, 0) - grid_sizer_1 = wx.GridSizer(0, 2, 0, 0) - label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u041a\u0430\u0444\u0435\u0434\u0440\u0430 \"\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f \u0438 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c \u0434\u0432\u0438\u0436\u0435\u043d\u0438\u044f\"") - label_1.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - sizer_2.Add(label_1, 0, wx.ALIGN_CENTER | wx.BOTTOM | wx.LEFT | wx.RIGHT, 20) - label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0420\u0430\u0441\u0447\u0435\u0442 \u0446\u0438\u043a\u043b\u0430 \u0441\u0432\u0435\u0442\u043e\u0444\u043e\u0440\u043d\u043e\u0433\u043e \u0440\u0435\u0433\u0443\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043d\u0430 \u043f\u0435\u0440\u0435\u043a\u0440\u0435\u0441\u0442\u043a\u0435") - label_2.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - sizer_2.Add(label_2, 0, wx.ALIGN_CENTER, 0) - label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u041f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044c\u0442\u0435\u0441\u044c") - label_3.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - sizer_2.Add(label_3, 0, wx.ALL, 5) - label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0418\u043c\u044f") - label_4.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - grid_sizer_1.Add(label_4, 0, wx.ALIGN_CENTER, 0) - grid_sizer_1.Add(self.inpt_name, 0, wx.ALIGN_CENTER, 0) - inpt_familia1 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0424\u0430\u043c\u0438\u043b\u0438\u044f") - inpt_familia1.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - grid_sizer_1.Add(inpt_familia1, 0, wx.ALIGN_CENTER, 0) - grid_sizer_1.Add(self.inpt_familia, 0, wx.ALIGN_CENTER, 0) - label_5 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0413\u0440\u0443\u043f\u043f\u0430") - label_5.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - grid_sizer_1.Add(label_5, 0, wx.ALIGN_CENTER, 0) - grid_sizer_1.Add(self.inpt_group, 0, wx.ALIGN_CENTER, 0) - label_6 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u2116 \u0417\u0430\u0447\u0435\u0442\u043d\u043e\u0439 \u043a\u043d\u0438\u0436\u043a\u0438") - label_6.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) - grid_sizer_1.Add(label_6, 0, wx.ALIGN_CENTER, 0) - grid_sizer_1.Add(self.inpt_zachetka, 0, wx.ALIGN_CENTER, 0) - sizer_2.Add(grid_sizer_1, 1, wx.EXPAND, 0) - grid_sizer_2.Add(self.btn2, 0, wx.ALIGN_BOTTOM, 0) - grid_sizer_2.Add(self.button_1, 0, wx.ALIGN_BOTTOM | wx.ALIGN_RIGHT, 0) - sizer_2.Add(grid_sizer_2, 1, wx.EXPAND, 0) - self.panel_1.SetSizer(sizer_2) - sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0) - self.SetSizer(sizer_1) - self.Layout() - # end wxGlade + def setup(self): + pass - def __binds(self): - self.button_1.Bind(wx.EVT_BUTTON, self.go_page2) - - def getSize(self): - app = wx.App(False) - sw, sh = wx.GetDisplaySize() - self.w = 0.75 * sw - self.h = 0.75 * sh - return self.w, self.h - - def empty_pole(self): - dlg = wx.MessageDialog(self, 'Не все поля заполнены. Заполните все поля перед продолжением', 'Ошибка', wx.OK) - val = dlg.ShowModal() - if val == wx.ID_OK: - dlg.Destroy() - - def go_page2(self, event): - - name = self.inpt_name.GetValue() - name = name.replace(' ', '') - - familia = self.inpt_familia.GetValue() - if len(familia) == 0: - self.empty_pole() - return - - group = self.inpt_group.GetValue() - if len(group) == 0: - self.empty_pole() - return - zach_number = self.inpt_zachetka.GetValue() - zach_number = zach_number.replace(' ', '') - if len(zach_number) == 0: - self.empty_pole() - return - - fio = str(familia).lower() + ' ' + str(name).lower() - new_session = Session() - - if new_session.query(exists().where(Student.fname == fio). - where(Student.group == group).where(Student.zach_number == zach_number)).scalar(): - print("ЗАГРУЖАЮ ВАШЕ ЗАДАНИЕ") - else: - print("пора занести вас в базу и придумать для вас задание") - student = Student(fname=fio, group=group, zach_number=zach_number) - new_session.add(student) - new_session.commit() - - - SecondPage.SecondPage.OnInit(SecondPage) - self.Destroy() - - # todo Перенести весь функционал из main.py class MyApp(wx.App): - def OnInit(self): - self.frame = MyFrame(None, wx.ID_ANY, "") - self.frame.Center() - self.frame.Show() - return True + def OnInit(self): + self.frame = MyFrame(None, wx.ID_ANY, "") + self.frame.Center() + self.frame.Show() + return True + -# end of class MyApp if __name__ == "__main__": - - app = MyApp(0) - import wx.lib.inspection - - wx.lib.inspection.InspectionTool().Show() - app.MainLoop() + app = MyApp(0) + app.MainLoop() diff --git a/src/page3.py b/src/page3.py deleted file mode 100755 index 8ee25a3..0000000 --- a/src/page3.py +++ /dev/null @@ -1,221 +0,0 @@ -#!/usr/bin/env python -# -*- coding: UTF-8 -*- -# -# generated by wxGlade 0.8.3 on Tue Dec 4 08:25:17 2018 -# - -import wx -import wx.grid - -# begin wxGlade: dependencies -# end wxGlade - -# begin wxGlade: extracode -# end wxGlade - - -class MyFrame(wx.Frame): - def __init__(self, *args, **kwds): - # begin wxGlade: MyFrame.__init__ - kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE - wx.Frame.__init__(self, *args, **kwds) - self.SetSize((1296, 631)) - self.panel_1 = wx.Panel(self, wx.ID_ANY) - self.grid_1 = wx.grid.Grid(self.panel_1, wx.ID_ANY, size=(1, 1)) - self.text_ctrl_1 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_2 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_3 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_4 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_5 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_6 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_7 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_8 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.text_ctrl_9 = wx.TextCtrl(self.panel_1, wx.ID_ANY, "") - self.btn_page4 = wx.Button(self, wx.ID_ANY, u"\u0414\u0430\u043b\u0435\u0435") - - self.__set_properties() - self.__do_layout() - # end wxGlade - - def __set_properties(self): - # begin wxGlade: MyFrame.__set_properties - self.SetTitle("frame") - self.grid_1.CreateGrid(4, 8) - self.grid_1.SetColLabelValue(0, "1") - self.grid_1.SetColLabelValue(1, "2") - self.grid_1.SetColLabelValue(2, "3") - self.grid_1.SetColLabelValue(3, "4") - self.grid_1.SetColLabelValue(4, "5") - self.grid_1.SetColLabelValue(5, "6") - self.grid_1.SetColLabelValue(6, "7") - self.grid_1.SetColLabelValue(7, "8") - self.grid_1.SetRowLabelValue(0, "a") - self.grid_1.SetRowLabelValue(1, "b") - self.grid_1.SetRowLabelValue(2, "c") - self.grid_1.SetRowLabelValue(3, "d") - self.grid_1.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ".SF NS Text")) - # end wxGlade - - def __do_layout(self): - # begin wxGlade: MyFrame.__do_layout - sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2 = wx.BoxSizer(wx.HORIZONTAL) - grid_sizer_2 = wx.GridBagSizer(0, 0) - grid_sizer_1 = wx.FlexGridSizer(0, 1, 0, 0) - label_2 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0418\u0441\u0445\u043e\u0434\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0440\u0430\u0441\u0447\u0435\u0442\u0430\n") - label_2.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - grid_sizer_1.Add(label_2, 0, wx.ALL, 10) - label_4 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0421\u043e\u0441\u0442\u0430\u0432 \u0442\u0440\u043d\u0430\u0441\u043f\u043e\u0440\u0442\u043d\u043e\u0433\u043e \u043f\u043e\u0442\u043e\u043a\u0430") - label_4.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - grid_sizer_1.Add(label_4, 0, wx.ALL, 10) - label_5 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u041b\u0435\u0433\u043a\u043e\u0432\u044b\u0435 \u0430\u0432\u0442\u043e\u043c\u043e\u0431\u0438\u043b\u0438 - 60%") - grid_sizer_1.Add(label_5, 0, 0, 0) - label_6 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0413\u0440\u0443\u0437\u043e\u0432\u044b\u0435 \u0430\u0432\u0442\u043e\u043c\u043e\u0431\u0438\u043b\u0438 - 35%") - grid_sizer_1.Add(label_6, 0, 0, 0) - label_7 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0410\u0432\u0442\u043e\u0431\u0443\u0441\u044b - 3%") - grid_sizer_1.Add(label_7, 0, 0, 0) - label_8 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0410\u0432\u0442\u043e\u043f\u043e\u0435\u0437\u0434\u0430 - 2%") - grid_sizer_1.Add(label_8, 0, 0, 0) - label_9 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u041a\u043e\u0444\u0444\u0438\u0446\u0438\u0435\u043d\u0442\u044b \u043f\u0440\u0438\u0432\u0435\u0434\u0435\u043d\u0438\u044f") - label_9.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - grid_sizer_1.Add(label_9, 0, wx.ALL, 10) - label_10 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u041b\u0435\u0433\u043a\u043e\u0432\u044b\u0435 \u0430\u0432\u0442\u043e\u043c\u043e\u0431\u0438\u043b\u0438 - 1 ") - label_10.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ".SF NS Text")) - grid_sizer_1.Add(label_10, 0, 0, 0) - label_11 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0413\u0440\u0443\u0437\u043e\u0432\u044b\u0435 \u0430\u0432\u0442\u043e\u043c\u043e\u0431\u0438\u043b - 1.5") - label_11.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ".SF NS Text")) - grid_sizer_1.Add(label_11, 0, 0, 0) - label_12 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0410\u0432\u0442\u043e\u0431\u0443\u0441\u044b - 2.5") - label_12.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ".SF NS Text")) - grid_sizer_1.Add(label_12, 0, 0, 0) - label_13 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0410\u0432\u0442\u043e\u043f\u043e\u0435\u0437\u0434\u0430 - 3", style=wx.ALIGN_LEFT) - label_13.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ".SF NS Text")) - grid_sizer_1.Add(label_13, 0, 0, 0) - label_14 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0422\u0430\u0431\u043b\u0438\u0446\u0430 \u0438\u043d\u0442\u0435\u043d\u0441\u0438\u0432\u043d\u043e\u0441\u0442\u0438 \u0430/\u043c \u043f\u043e \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043c\u0438") - label_14.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - grid_sizer_1.Add(label_14, 0, wx.ALL, 10) - grid_sizer_1.Add(self.grid_1, 1, wx.ALL | wx.EXPAND, 10) - grid_sizer_1.Add((0, 0), 0, 0, 0) - sizer_2.Add(grid_sizer_1, 1, wx.EXPAND | wx.SHAPED, 0) - static_line_1 = wx.StaticLine(self.panel_1, wx.ID_ANY, style=wx.LI_VERTICAL) - sizer_2.Add(static_line_1, 0, wx.EXPAND, 0) - label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044c:") - label_1.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - grid_sizer_2.Add(label_1, (0, 0), (1, 1), wx.ALL, 10) - label_3 = wx.StaticText(self.panel_1, wx.ID_ANY, "N = a*Ni*x + b*Ni*y + c*Ni*z + d*Ni*w ") - label_3.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - grid_sizer_2.Add(label_3, (1, 0), (1, 1), wx.ALL, 10) - label_15 = wx.StaticText(self.panel_1, wx.ID_ANY, u"\u0433\u0434\u0435 N - \u0438\u0441\u0445\u043e\u0434\u043d\u0430\u044f \u0438\u043d\u0442\u0435\u043d\u0441\u0438\u0432\u043d\u043e\u0441\u0442\u044c, \u0430\u0432\u0442/ \u0447\na,b,c,d -\u043a\u043e\u044d\u0444\u0444\u0438\u0446\u0438\u0435\u043d\u0442\u044b \u043f\u0440\u0438\u0432\u0435\u0434\u0435\u043d\u0438\u044f\nx,y,z - \u0434\u043e\u043b\u044f \u0430\u0432\u0442\u043e\u043c\u043e\u0431\u0438\u043b\u0435\u0439") - grid_sizer_2.Add(label_15, (2, 0), (1, 1), 0, 0) - label_16 = wx.StaticText(self.panel_1, wx.ID_ANY, "N1 = ") - grid_sizer_2.Add(label_16, (3, 0), (1, 1), 0, 0) - label_25 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_25, (3, 1), (1, 1), 0, 0) - label_26 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_26, (3, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_1, (3, 3), (1, 1), 0, 0) - bitmap_1 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_1.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_1, (3, 4), (1, 1), 0, 0) - label_17 = wx.StaticText(self.panel_1, wx.ID_ANY, "N11 = ") - grid_sizer_2.Add(label_17, (4, 0), (1, 1), 0, 0) - label_27 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_27, (4, 1), (1, 1), 0, 0) - label_28 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_28, (4, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_2, (4, 3), (1, 1), 0, 0) - bitmap_2 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_2.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_2, (4, 4), (1, 1), 0, 0) - label_18 = wx.StaticText(self.panel_1, wx.ID_ANY, "N12 = ") - grid_sizer_2.Add(label_18, (5, 0), (1, 1), 0, 0) - label_31 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_31, (5, 1), (1, 1), 0, 0) - label_32 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_32, (5, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_3, (5, 3), (1, 1), 0, 0) - bitmap_3 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_3.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_3, (5, 4), (1, 1), 0, 0) - label_19 = wx.StaticText(self.panel_1, wx.ID_ANY, u"N1(\u043f\u0440\u044f\u043c\u043e) = ") - grid_sizer_2.Add(label_19, (6, 0), (1, 1), 0, 0) - label_29 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_29, (6, 1), (1, 1), 0, 0) - label_30 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_30, (6, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_4, (6, 3), (1, 1), 0, 0) - bitmap_4 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_4.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_4, (6, 4), (1, 1), 0, 0) - label_20 = wx.StaticText(self.panel_1, wx.ID_ANY, "N2 = ") - grid_sizer_2.Add(label_20, (7, 0), (1, 1), 0, 0) - label_33 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_33, (7, 1), (1, 1), 0, 0) - label_34 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_34, (7, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_5, (7, 3), (1, 1), 0, 0) - bitmap_5 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_5.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_5, (7, 4), (1, 1), 0, 0) - label_21 = wx.StaticText(self.panel_1, wx.ID_ANY, "N21 =") - grid_sizer_2.Add(label_21, (8, 0), (1, 1), 0, 0) - label_35 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_35, (8, 1), (1, 1), 0, 0) - label_36 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_36, (8, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_6, (8, 3), (1, 1), 0, 0) - bitmap_6 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_6.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_6, (8, 4), (1, 1), 0, 0) - label_22 = wx.StaticText(self.panel_1, wx.ID_ANY, "N22 =") - grid_sizer_2.Add(label_22, (9, 0), (1, 1), 0, 0) - label_37 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_37, (9, 1), (1, 1), 0, 0) - label_38 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_38, (9, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_7, (9, 3), (1, 1), 0, 0) - bitmap_7 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_7.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_7, (9, 4), (1, 1), 0, 0) - label_23 = wx.StaticText(self.panel_1, wx.ID_ANY, u"N2(\u043f\u0440\u044f\u043c\u043e) =") - grid_sizer_2.Add(label_23, (10, 0), (1, 1), 0, 0) - label_39 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_39, (10, 1), (1, 1), 0, 0) - label_40 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_40, (10, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_8, (10, 3), (1, 1), 0, 0) - bitmap_8 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_8.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_8, (10, 4), (1, 1), 0, 0) - label_24 = wx.StaticText(self.panel_1, wx.ID_ANY, "N3 =") - grid_sizer_2.Add(label_24, (11, 0), (1, 1), 0, 0) - label_41 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_41, (11, 1), (1, 1), 0, 0) - label_42 = wx.StaticText(self.panel_1, wx.ID_ANY, "") - grid_sizer_2.Add(label_42, (11, 2), (1, 1), 0, 0) - grid_sizer_2.Add(self.text_ctrl_9, (11, 3), (1, 1), 0, 0) - bitmap_9 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg", wx.BITMAP_TYPE_ANY)) - bitmap_9.SetMinSize((35, 35)) - grid_sizer_2.Add(bitmap_9, (11, 4), (1, 1), 0, 0) - sizer_2.Add(grid_sizer_2, 1, wx.EXPAND, 0) - self.panel_1.SetSizer(sizer_2) - sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0) - sizer_1.Add(self.btn_page4, 0, wx.ALIGN_RIGHT, 0) - self.SetSizer(sizer_1) - self.Layout() - # end wxGlade - -# end of class MyFrame - -class MyApp(wx.App): - def OnInit(self): - self.frame = MyFrame(None, wx.ID_ANY, "") - self.SetTopWindow(self.frame) - self.frame.Show() - return True - -# end of class MyApp - -if __name__ == "__main__": - app = MyApp(0) - app.MainLoop() diff --git a/src/second_page.wxg b/src/second_page.wxg index b82420f..0248397 100644 --- a/src/second_page.wxg +++ b/src/second_page.wxg @@ -1,7 +1,7 @@ - + - + 658, 331 frame @@ -46,7 +46,7 @@ 0 wxALIGN_CENTER - + @@ -77,7 +77,7 @@ 0 wxALIGN_CENTER - + @@ -167,6 +167,17 @@ + + + 0 + wxALIGN_RIGHT + + + go_page3 + + + + diff --git a/src/second_page1.wxg b/src/second_page1.wxg index 7f367f4..35b7cc5 100644 --- a/src/second_page1.wxg +++ b/src/second_page1.wxg @@ -1,9 +1,9 @@ - + - + - 658, 331 + 800, 780 frame @@ -18,8 +18,8 @@ - 10 - wxALL|wxALIGN_CENTER + 0 + wxALL|wxALIGN_CENTER_HORIZONTAL 18 @@ -54,7 +54,7 @@ 0 wxALIGN_CENTER - + @@ -85,7 +85,7 @@ 0 wxALIGN_CENTER - + @@ -149,15 +149,19 @@ 0 + wxALIGN_CENTER - /Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-4.jpg + + D:\Programming\PythonProjects\odd-perekrestok\img\perekr-4.jpg 0 + wxALIGN_CENTER - /Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-t.png + + D:\Programming\PythonProjects\odd-perekrestok\img\perekr-t.png @@ -165,6 +169,7 @@ 0 + wxALL 14 @@ -178,12 +183,12 @@ - + 0 - wxEXPAND + wxALL|wxALIGN_CENTER_HORIZONTAL 1 - 6 + 9 0 0 @@ -209,6 +214,14 @@ /Users/danamir/PycharmProjects/odd-perekrestok/img/good.jpg + + + 0 + + 20 + 20 + + 0 @@ -230,6 +243,22 @@ /Users/danamir/PycharmProjects/odd-perekrestok/img/good.jpg + + + 0 + + 20 + 20 + + + + + + + 0 + wxALIGN_RIGHT + +