diff --git a/generalfunction.py b/generalfunction.py new file mode 100644 index 0000000..6f35fcf --- /dev/null +++ b/generalfunction.py @@ -0,0 +1,10 @@ +import os + +def getFullPath(file): + put = os.getcwd() + path = str(put) + '\\' + file + return path + +file =img/good.jpg +p1 = getFullPath("img\error.jpg") +print(p1) diff --git a/gui/SecondPage.py b/gui/SecondPage.py old mode 100755 new mode 100644 index 61f5515..30cd701 --- a/gui/SecondPage.py +++ b/gui/SecondPage.py @@ -1,220 +1,197 @@ import wx import random +import os -class SecondPageFrame(wx.Frame): - def scale_bitmap(self, bitmap, width, height): - self.w = width - self.h = height - image = wx.Image(bitmap) - image = image.Scale(self.w, self.h, wx.IMAGE_QUALITY_HIGH) - result = wx.Bitmap(image) - return result +class SeconPageFrame(wx.Frame): + def __init__(self, *args, **kwds): + # 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.panel_1 = wx.Panel(self, wx.ID_ANY) + self.color = "white" + 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, "") - def __init__(self, *args, **kwds): - kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE - wx.Frame.__init__(self, *args, **kwds) - self.SetSize((800, 600)) - self.radio_btn_2 = wx.RadioButton(self, wx.ID_ANY, u"Крестообразный\n") - self.radio_btn_3 = wx.RadioButton(self, wx.ID_ANY, u"Т-образный") - self.text_ctrl_1 = wx.TextCtrl(self, wx.ID_ANY, style=wx.TE_PROCESS_ENTER) - self.text_ctrl_2 = wx.TextCtrl(self, 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) + self.radio_btn_2.SetValue(True) - self.text_ctrl_1.Bind(wx.EVT_TEXT_ENTER, self.proverka_vvoda) - self.text_ctrl_2.Bind(wx.EVT_TEXT_ENTER, self.proverka_vvoda) - self.radio_btn_2.SetValue(True) + self.__set_properties() + self.__do_layout() + self.set_kat_dor() + def scale_bitmap(self, bitmap, width, height): + self.w = width + self.h = height + image = wx.Image(bitmap) + image = image.Scale(self.w, self.h, wx.IMAGE_QUALITY_HIGH) + result = wx.Bitmap(image) + return result - self.__set_properties() - self.__do_layout() - self.set_kat_dor() + def __set_properties(self): + # begin wxGlade: SeconPageFrame.__set_properties + self.SetTitle("Расчет цикла светофорного регулирования") + def __do_layout(self): + # begin wxGlade: SeconPageFrame.__do_layout + sizer_1 = wx.BoxSizer(wx.VERTICAL) + sizer_2 = wx.StaticBoxSizer(wx.StaticBox(self.panel_1, wx.ID_ANY, "sizer_2"), wx.VERTICAL) + grid_sizer_2 = wx.FlexGridSizer(1, 6, 0, 0) + grid_sizer_3 = wx.GridSizer(0, 2, 0, 0) + grid_sizer_1 = wx.GridSizer(0, 4, 0, 0) + label_1 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Исходные данные для расчета") + label_1.SetFont(wx.Font(18, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) + sizer_2.Add(label_1, 0, wx.ALIGN_CENTER | wx.ALL, 10) + label_7 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Категория \n Горизональной улицы") + grid_sizer_1.Add(label_7, 0, wx.ALIGN_CENTER | wx.ALL, 10) + label_8 = wx.StaticText(self.panel_1, wx.ID_ANY, "", style=wx.ALIGN_CENTER) + grid_sizer_1.Add(label_8, 0, wx.ALIGN_CENTER, 0) + label_9 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Категория \n Вертикальной улицы") + grid_sizer_1.Add(label_9, 0, wx.ALIGN_CENTER, 0) + label_10 = wx.StaticText(self.panel_1, wx.ID_ANY, "") + grid_sizer_1.Add(label_10, 0, wx.ALIGN_CENTER, 0) + label_11 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Количество полос \n Горизонтальной улицы") + grid_sizer_1.Add(label_11, 0, wx.ALIGN_CENTER, 0) + label_12 = wx.StaticText(self.panel_1, wx.ID_ANY, "", style=wx.ALIGN_CENTER) + grid_sizer_1.Add(label_12, 0, wx.ALIGN_CENTER, 0) + label_13 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Количество полос \n Вертикальной улицы") + grid_sizer_1.Add(label_13, 0, wx.ALIGN_CENTER, 0) + label_14 = wx.StaticText(self.panel_1, wx.ID_ANY, "") + grid_sizer_1.Add(label_14, 0, wx.ALIGN_CENTER, 0) + sizer_2.Add(grid_sizer_1, 1, wx.EXPAND, 0) + label_18 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Выберите тип пересечения") + label_18.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) + sizer_2.Add(label_18, 0, wx.ALL, 9) + 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("/Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-4.jpg", wx.BITMAP_TYPE_ANY)) + grid_sizer_3.Add(self.bitmap_4, 0, 0, 0) - def __set_properties(self): - self.SetTitle("Расчёт цикла светофорного регулирования") + self.bitmap_5 = wx.StaticBitmap(self.panel_1, wx.ID_ANY, wx.Bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-t.png", wx.BITMAP_TYPE_ANY)) + grid_sizer_3.Add(self.bitmap_5, 0, 0, 0) + sizer_2.Add(grid_sizer_3, 1, wx.EXPAND, 0) - def __do_layout(self): - sizer_1 = wx.BoxSizer(wx.VERTICAL) - grid_sizer_2 = wx.GridSizer(0, 3, 20, 100) - grid_sizer_3 = wx.FlexGridSizer(0, 2, 20, 200) - grid_sizer_1 = wx.GridSizer(0, 4, 0, 0) - btn_sizer = wx.BoxSizer(wx.HORIZONTAL) + label_15 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Необходимо расчитать:") + label_15.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) + sizer_2.Add(label_15, 0, 0, 0) + label_16 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Ширину проезжей части \n Горизонтальной улицы") + grid_sizer_2.Add(label_16, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 0) + grid_sizer_2.Add(self.text_ctrl_1, 0, wx.ALIGN_CENTER, 0) - label_6 = wx.StaticText(self, wx.ID_ANY, u"Исходные данные для расчёта:") - label_6.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - sizer_1.Add(label_6, 0, wx.ALIGN_CENTER_HORIZONTAL, 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.Hide() + grid_sizer_2.Add(bitmap_2, 0, 0, 0) - label_7 = wx.StaticText(self, wx.ID_ANY, u"Категория \n горизонтальной улицы") - grid_sizer_1.Add(label_7, 0, wx.ALIGN_CENTER | wx.ALL, 10) + label_17 = wx.StaticText(self.panel_1, wx.ID_ANY, u"Ширину проезжей части \n Вертикальной улицы") + grid_sizer_2.Add(label_17, 0, 0, 0) + grid_sizer_2.Add(self.text_ctrl_2, 0, wx.ALIGN_CENTER, 0) - self.kat_horizont = wx.StaticText(self, wx.ID_ANY, "", style=wx.ALIGN_CENTER) - grid_sizer_1.Add(self.kat_horizont, 0, wx.ALIGN_CENTER, 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)) + grid_sizer_2.Add(bitmap_3, 0, 0, 0) + sizer_2.Add(grid_sizer_2, 1, wx.EXPAND, 0) - label_9 = wx.StaticText(self, wx.ID_ANY, u"Категория \n вертикальной улицы") - grid_sizer_1.Add(label_9, 0, wx.ALIGN_CENTER, 0) + self.panel_1.SetSizer(sizer_2) + sizer_1.Add(self.panel_1, 1, wx.EXPAND, 0) + self.SetSizer(sizer_1) + self.Layout() - self.kat_vertical = wx.StaticText(self, wx.ID_ANY, "") - grid_sizer_1.Add(self.kat_vertical, 0, wx.ALIGN_CENTER, 0) + def good(self): + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/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() - label10= wx.StaticText(self, wx.ID_ANY, u"Количество полос \n горизонтальной улицы") - grid_sizer_1.Add(label10, 0, wx.ALIGN_CENTER, 0) + def bad(self): + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img3 = self.scale_bitmap(self.img2, 70, 50) + self.bitmap_3.SetBitmap(wx.Bitmap(self.img3)) + self.bitmap_3.Show() + self.Refresh() - self.kolvo_polosv_horiz = wx.StaticText(self, wx.ID_ANY, "", style=wx.ALIGN_CENTER) - grid_sizer_1.Add(self.kolvo_polosv_horiz, 0, wx.ALIGN_CENTER, 0) + def set_kat_dor(self): + self.kolvo_polosv_vert.SetLabel(str(random.randint(2, 4))) + self.kolvo_polosv_horiz.SetLabel(str(random.randint(2, 4))) + self.kat_horizont.SetLabel(str(random.randint(2, 4))) + self.kat_vertical.SetLabel(str(random.randint(2, 4))) - label_13 = wx.StaticText(self, wx.ID_ANY, u"Количество полос \n вертикальной улицы") - grid_sizer_1.Add(label_13, 0, wx.ALIGN_CENTER, 0) + def proverka_vvoda(self, event): + self.pr_Vert = int(self.kolvo_polosv_horiz.GetLabel()) * 3.75 + self.pr_hor = int(self.kolvo_polosv_horiz.GetLabel()) * 3.75 - self.kolvo_polosv_vert = wx.StaticText(self, wx.ID_ANY, "") - grid_sizer_1.Add(self.kolvo_polosv_vert, 0, wx.ALIGN_CENTER, 0) + print(self.pr_hor) + print(self.pr_Vert) + if len(self.text_ctrl_1.GetValue()) > 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/123.jpg" + self.img4 = self.scale_bitmap(self.img1, 50, 50) + self.bitmap_2.SetBitmap(wx.Bitmap(self.img4)) + self.bitmap_2.Show() + self.Refresh() + else: + print("bad") + self.bitmap_2.Hide() + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img3 = self.scale_bitmap(self.img2, 70, 50) + self.bitmap_2.SetBitmap(wx.Bitmap(self.img3)) + self.bitmap_2.Show() + self.text_ctrl_1.SetValue(str(self.pr_hor)) + self.Refresh() - sizer_1.Add(grid_sizer_1, 1, wx.EXPAND, 0) - label_18 = wx.StaticText(self, wx.ID_ANY, u"Выберите тип пересечения:") - label_18.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) + if len(self.text_ctrl_2.GetValue()) > 0: + 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.img4 = self.scale_bitmap(self.img1, 50, 50) + self.bitmap_3.SetBitmap(wx.Bitmap(self.img4)) + self.bitmap_3.Show() + self.Refresh() + else: + print("Bad") + self.bitmap_3.Hide() + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" + self.img3 = self.scale_bitmap(self.img2, 70, 50) + self.bitmap_3.SetBitmap(wx.Bitmap(self.img3)) + self.bitmap_3.Show() + self.text_ctrl_2.SetValue(str(self.pr_Vert)) + self.Refresh() - sizer_1.Add(label_18, 0, wx.ALL, 9) - 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) - - img = self.scale_bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-4.jpg", 150, 150) - bitmap_4 = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap()) - bitmap_4.SetBitmap(wx.Bitmap(img)) - grid_sizer_3.Add(bitmap_4, 0, 0, 0) - - img = self.scale_bitmap("/Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-t.jpg", 150, 150) - bitmap_5 = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap()) - bitmap_5.SetBitmap(wx.Bitmap(img)) - grid_sizer_3.Add(bitmap_5, 0, 0, 0) - - sizer_1.Add(grid_sizer_3, 1, wx.CENTER, 0) - - label_15 = wx.StaticText(self, wx.ID_ANY, u"Вам необходимо рассчитать:") - label_15.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, "")) - sizer_1.Add(label_15, 0, 0, 0) - - label_16 = wx.StaticText(self, wx.ID_ANY, u"Ширину проезжей части \n горизонтальной улицы") - grid_sizer_2.Add(label_16, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 0) - grid_sizer_2.Add(self.text_ctrl_1, 0, wx.ALIGN_CENTER, 0) - - self.bitmap_2 = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap(75, 75)) - self.bitmap_2.Hide() - grid_sizer_2.Add(self.bitmap_2, 0, wx.ALIGN_CENTER, 0) - - label_17 = wx.StaticText(self, wx.ID_ANY, u"Ширину проезжей части \n вертикальной улицы") - grid_sizer_2.Add(label_17, 0, 0, 0) - grid_sizer_2.Add(self.text_ctrl_2, 0, wx.ALIGN_CENTER, 0) - - self.bitmap_3 = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap(75, 75)) - self.bitmap_3.Hide() - grid_sizer_2.Add(self.bitmap_3, 0, 0, 0) - - sizer_1.Add(grid_sizer_2, 1, wx.EXPAND, 0) - - - self.btn_page3 = wx.Button(self, wx.ID_ANY, u"Далее", wx.DefaultPosition, wx.DefaultSize, 0) - btn_sizer.Add(self.btn_page3, 0, wx.ALIGN_BOTTOM | wx.ALIGN_RIGHT | wx.ALL, 5) - sizer_1.Add(btn_sizer, 1, wx.EXPAND, 0) - self.btn_page3.Bind(wx.EVT_BUTTON, self.go_page3) - self.SetSizer(sizer_1) - self.Layout() - - def good(self): - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/good.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/error.jpg" - self.img3 = self.scale_bitmap(self.img2, 70, 50) - self.bitmap_3.SetBitmap(wx.Bitmap(self.img3)) - self.bitmap_3.Show() - self.Refresh() - - - def set_kat_dor(self): - self.kolvo_polosv_vert.SetLabel(str(random.randint(2, 4))) - self.kolvo_polosv_horiz.SetLabel(str(random.randint(2, 4))) - self.kat_horizont.SetLabel(str(random.randint(2, 4))) - self.kat_vertical.SetLabel(str(random.randint(2, 4))) - - def proverka_vvoda(self, event): - self.pr_Vert = int(self.kolvo_polosv_horiz.GetLabel()) * 3.75 - self.pr_hor = int(self.kolvo_polosv_horiz.GetLabel()) * 3.75 - - print(self.pr_hor) - print(self.pr_Vert) - if len(self.text_ctrl_1.GetValue()) > 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" - self.img4 = self.scale_bitmap(self.img1, 50, 50) - self.bitmap_2.SetBitmap(wx.Bitmap(self.img4)) - self.bitmap_2.Show() - self.Refresh() - else: - print("bad") - self.bitmap_2.Hide() - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" - self.img3 = self.scale_bitmap(self.img2, 70, 50) - self.bitmap_2.SetBitmap(wx.Bitmap(self.img3)) - self.bitmap_2.Show() - self.text_ctrl_1.SetValue(str(self.pr_hor)) - self.Refresh() - - if len(self.text_ctrl_2.GetValue()) > 0: - 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/good.jpg" - self.img4 = self.scale_bitmap(self.img1, 50, 50) - self.bitmap_3.SetBitmap(wx.Bitmap(self.img4)) - self.bitmap_3.Show() - self.Refresh() - else: - print("Bad") - self.bitmap_3.Hide() - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" - self.img3 = self.scale_bitmap(self.img2, 70, 50) - self.bitmap_3.SetBitmap(wx.Bitmap(self.img3)) - self.bitmap_3.Show() - self.text_ctrl_2.SetValue(str(self.pr_Vert)) - self.Refresh() - - - - def proverka_radiobtn(self): - self.s = 1 - print(self.radio_btn_2.GetValue()) - print(self.radio_btn_3.GetValue()) - if self.radio_btn_2.GetValue() == self.radio_btn_2.GetValue(): - self.error_radio_btn() - self.s = 0 - return self.s - - - def go_page3(self, event): - from gui import page3 - page3.Page3.OnInit(page3) - self.Destroy() + def proverka_radiobtn(self): + self.s = 1 + print(self.radio_btn_2.GetValue()) + print(self.radio_btn_3.GetValue()) + if self.radio_btn_2.GetValue() == self.radio_btn_2.GetValue(): + self.error_radio_btn() + self.s = 0 + return self.s + def go_page3(self, event): + from gui import page3 + page3.Page3.OnInit(page3) + self.Destroy() class SecondPage(wx.App): - def OnInit(self): - self.frame = SecondPageFrame(None, wx.ID_ANY, "") - self.frame.Center() - self.frame.Show() - return True + def OnInit(self): + self.frame = SeconPageFrame(None, wx.ID_ANY, "") + self.SetTopWindow(self.frame) + self.frame.Show() + return True +# end of class SecondPage if __name__ == "__main__": - SeconPage = SecondPage(0) - SeconPage.MainLoop() + SeconPage = SecondPage(0) + SeconPage.MainLoop() diff --git a/gui/page3.py b/gui/page3.py index 4da4fb7..162fe04 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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.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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.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/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" 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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.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/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.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/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.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,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/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 +451,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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/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 +459,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/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,7 +472,7 @@ 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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_6.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_6.Show() @@ -480,7 +480,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/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 +493,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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_7.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_7.Show() @@ -501,7 +501,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/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 +517,7 @@ class Page3Frame(wx.Frame): if self.text_ctrl_8.GetValue() == str(self.s1): print("good") - self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_8.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_8.Show() @@ -526,7 +526,7 @@ class Page3Frame(wx.Frame): print("bad") self.s = float(self.data[3][1]) - float(self.data[4][1])- float(self.data[5][1]) self.s1 = "%.2f" % self.s - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_8.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_8.Show() @@ -539,7 +539,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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_9.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_9.Show() @@ -547,7 +547,7 @@ class Page3Frame(wx.Frame): else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_9.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_9.Show() @@ -559,7 +559,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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_10.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_10.Show() @@ -567,7 +567,7 @@ class Page3Frame(wx.Frame): else: print("bad") 1 - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_10.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_10.Show() @@ -579,14 +579,14 @@ 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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_11.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_11.Show() self.Refresh() else: print("bad") - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_11.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_11.Show() @@ -601,7 +601,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/good.jpg" + self.img1 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/123.jpg" self.img4 = self.scale_bitmap(self.img1, 20, 20) self.bitmap_2.SetBitmap(wx.Bitmap(self.img4)) self.bitmap_2.Show() @@ -610,7 +610,7 @@ class Page3Frame(wx.Frame): print("bad") self.s = float(self.data[7][1]) - float(self.data[8][1]) - float(self.data[9][1]) self.s1 = "%.2f" % self.s - self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/error.jpg" + self.img2 = "/Users/danamir/PycharmProjects/odd-perekrestok/img/bad.jpg" self.img3 = self.scale_bitmap(self.img2, 25, 25) self.bitmap_2.SetBitmap(wx.Bitmap(self.img3)) self.bitmap_2.Show() diff --git a/img/good.jpg b/img/123.jpg similarity index 100% rename from img/good.jpg rename to img/123.jpg diff --git a/img/error.jpg b/img/bad.jpg similarity index 100% rename from img/error.jpg rename to img/bad.jpg diff --git a/main.py b/main.py index 9a72dc0..9f8cf4c 100644 --- a/main.py +++ b/main.py @@ -8,6 +8,7 @@ from gui import SecondPage class MainFramePanel(wx.Panel): def __init__(self, parent): + # todo Изменить цвет панели на белый wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 500), style=wx.FULL_REPAINT_ON_RESIZE) self.frame = parent @@ -82,6 +83,7 @@ class MainFramePanel(wx.Panel): dlg.Destroy() def go_page2(self, event): + name = self.inpt_name.GetValue() name = name.replace(' ', '') diff --git a/src/page3.py b/src/page3.py index 6ac5d8b..8ee25a3 100755 --- a/src/page3.py +++ b/src/page3.py @@ -114,7 +114,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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 = ") @@ -124,7 +124,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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 = ") @@ -134,7 +134,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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) = ") @@ -144,7 +144,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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 = ") @@ -154,7 +154,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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 =") @@ -164,7 +164,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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 =") @@ -174,7 +174,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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) =") @@ -184,7 +184,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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 =") @@ -194,7 +194,7 @@ class MyFrame(wx.Frame): 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/good.jpg", wx.BITMAP_TYPE_ANY)) + 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) diff --git a/src/second_page1.wxg b/src/second_page1.wxg index 3a78aa7..7f367f4 100644 --- a/src/second_page1.wxg +++ b/src/second_page1.wxg @@ -1,225 +1,236 @@ - + - + 658, 331 frame wxVERTICAL - - - 0 - wxALIGN_CENTER_HORIZONTAL - - - 16 - default - - bold - 0 - - - - - 0 wxEXPAND - - 0 - 4 - 0 - 0 - - - 10 - wxALL|wxALIGN_CENTER - - + + + wxVERTICAL + + + + 10 + wxALL|wxALIGN_CENTER + + + 18 + default + + bold + 0 + + + + - - - - 0 - wxALIGN_CENTER - - + + + 0 + wxEXPAND + + 0 + 4 + 0 + 0 + + + 10 + wxALL|wxALIGN_CENTER + + + + + + + 0 + wxALIGN_CENTER + + + + + + + 0 + wxALIGN_CENTER + + + + + + + 0 + wxALIGN_CENTER + + + + + + 0 + wxALIGN_CENTER + + + + + + + 0 + wxALIGN_CENTER + + + + + + + 0 + wxALIGN_CENTER + + + + + + + 0 + wxALIGN_CENTER + + + + - - - - 0 - wxALIGN_CENTER - - + + + 9 + wxALL + + + 14 + default + + bold + 0 + + + + - - - - 0 - wxALIGN_CENTER - + + + 0 + wxEXPAND + + 0 + 2 + 0 + 0 + + + 0 + wxALIGN_CENTER_HORIZONTAL + + + + + + + 0 + wxALIGN_CENTER_HORIZONTAL + + + + + + + 0 + + /Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-4.jpg + + + + + 0 + + /Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-t.png + + + - - - - 0 - wxALIGN_CENTER - - + + + 0 + + + 14 + default + + bold + 0 + + + + - - - - 0 - wxALIGN_CENTER - - - - - - - 0 - wxALIGN_CENTER - - - - - - - 0 - wxALIGN_CENTER - - - - - - - - 9 - wxALL - - - 14 - default - - bold - 0 - - - - - - - - 0 - wxEXPAND - - 0 - 2 - 0 - 0 - - - 0 - wxALIGN_CENTER_HORIZONTAL - - - - - - - 0 - wxALIGN_CENTER_HORIZONTAL - - - - - - - 0 - - /Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-4.jpg - - - - - 0 - - /Users/danamir/PycharmProjects/odd-perekrestok/img/perekr-t.png - - - - - - - 0 - - - 14 - default - - bold - 0 - - - - - - - - 0 - wxEXPAND - - 1 - 6 - 0 - 0 - - - 0 - wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL - - - - - - - 0 - wxALIGN_CENTER - - - - - - 0 - - 1 - /Users/danamir/PycharmProjects/odd-perekrestok/img/good.jpg - - - - - 0 - - - - - - - 0 - wxALIGN_CENTER - - - - - - 0 - - /Users/danamir/PycharmProjects/odd-perekrestok/img/good.jpg + + + 0 + wxEXPAND + + 1 + 6 + 0 + 0 + + + 0 + wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL + + + + + + + 0 + wxALIGN_CENTER + + + + + + 0 + + 1 + /Users/danamir/PycharmProjects/odd-perekrestok/img/good.jpg + + + + + 0 + + + + + + + 0 + wxALIGN_CENTER + + + + + + 0 + + /Users/danamir/PycharmProjects/odd-perekrestok/img/good.jpg + + +