Skip to content

Commit a406b8a

Browse files
dragonyanglongdragonyanglong
authored
Merge pull request #83 from dragonyanglong/update_wx
Update wx
2 parents 8cba8a5 + 8809673 commit a406b8a

13 files changed

+303
-233
lines changed

Diff for: ‎src/diffpy/pdfgui/gui/adddatapanel.py

+19-21
Original file line numberDiff line numberDiff line change
@@ -38,38 +38,36 @@ def __init__(self, *args, **kwds):
3838
# begin wxGlade: AddDataPanel.__init__
3939
kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
4040
wx.Panel.__init__(self, *args, **kwds)
41-
self.textLoadData = wx.StaticText(self, wx.ID_ANY, "Load a data set from file.")
42-
self.buttonOpen = wx.Button(self, wx.ID_OPEN, "Open")
43-
self.static_line_2 = wx.StaticLine(self, wx.ID_ANY)
44-
self.buttonCancel = wx.Button(self, wx.ID_CANCEL, "Cancel")
4541

46-
self.__set_properties()
47-
self.__do_layout()
42+
sizer_1 = wx.BoxSizer(wx.VERTICAL)
4843

49-
self.Bind(wx.EVT_BUTTON, self.onOpen, self.buttonOpen)
50-
self.Bind(wx.EVT_BUTTON, self.onCancel, self.buttonCancel)
51-
# end wxGlade
52-
self.__customProperties()
44+
sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
45+
sizer_1.Add(sizer_4, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
5346

54-
def __set_properties(self):
55-
# begin wxGlade: AddDataPanel.__set_properties
47+
self.textLoadData = wx.StaticText(self, wx.ID_ANY, "Load a data set from file.")
5648
self.textLoadData.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans"))
57-
# end wxGlade
58-
59-
def __do_layout(self):
60-
# begin wxGlade: AddDataPanel.__do_layout
61-
sizer_1 = wx.BoxSizer(wx.VERTICAL)
62-
sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
6349
sizer_4.Add(self.textLoadData, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
64-
sizer_4.Add(self.buttonOpen, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.ALL, 5)
65-
sizer_1.Add(sizer_4, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
50+
51+
self.buttonOpen = wx.Button(self, wx.ID_OPEN, "Open")
52+
sizer_4.Add(self.buttonOpen, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
53+
54+
self.static_line_2 = wx.StaticLine(self, wx.ID_ANY)
6655
sizer_1.Add(self.static_line_2, 0, wx.BOTTOM | wx.EXPAND, 10)
67-
sizer_1.Add(self.buttonCancel, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.ALL, 5)
56+
57+
self.buttonCancel = wx.Button(self, wx.ID_CANCEL, "Cancel")
58+
sizer_1.Add(self.buttonCancel, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
59+
6860
sizer_1.Add((450, 0), 0, 0, 0)
61+
6962
self.SetSizer(sizer_1)
7063
sizer_1.Fit(self)
64+
7165
self.Layout()
66+
67+
self.Bind(wx.EVT_BUTTON, self.onOpen, self.buttonOpen)
68+
self.Bind(wx.EVT_BUTTON, self.onCancel, self.buttonCancel)
7269
# end wxGlade
70+
self.__customProperties()
7371

7472
# UTILITY FUNCTIONS ####
7573

Diff for: ‎src/diffpy/pdfgui/gui/addphasepanel.py

+30-28
Original file line numberDiff line numberDiff line change
@@ -37,49 +37,51 @@ def __init__(self, *args, **kwds):
3737
# begin wxGlade: AddPhasePanel.__init__
3838
kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
3939
wx.Panel.__init__(self, *args, **kwds)
40+
41+
sizer_1 = wx.BoxSizer(wx.VERTICAL)
42+
43+
sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
44+
sizer_1.Add(sizer_4, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
45+
4046
self.labelOpenPhase = wx.StaticText(self, wx.ID_ANY, "Load a structure from file.")
47+
self.labelOpenPhase.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans"))
48+
sizer_4.Add(self.labelOpenPhase, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
49+
4150
self.buttonOpen = wx.Button(self, wx.ID_OPEN, "Open")
51+
sizer_4.Add(self.buttonOpen, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
52+
4253
self.static_line_5 = wx.StaticLine(self, wx.ID_ANY)
54+
sizer_1.Add(self.static_line_5, 0, wx.EXPAND, 0)
55+
56+
sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
57+
sizer_1.Add(sizer_5, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
58+
4359
self.labelCreatePhase = wx.StaticText(self, wx.ID_ANY, "Create a structure from scratch.")
60+
self.labelCreatePhase.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans"))
61+
sizer_5.Add(self.labelCreatePhase, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
62+
4463
self.buttonNew = wx.Button(self, wx.ID_NEW, "New")
64+
sizer_5.Add(self.buttonNew, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
65+
4566
self.static_line_6 = wx.StaticLine(self, wx.ID_ANY)
67+
sizer_1.Add(self.static_line_6, 0, wx.BOTTOM | wx.EXPAND, 10)
68+
4669
self.buttonCancel = wx.Button(self, wx.ID_CANCEL, "Cancel")
70+
sizer_1.Add(self.buttonCancel, 0, wx.ALIGN_RIGHT | wx.ALL, 5)
71+
72+
sizer_1.Add((450, 10), 0, 0, 0)
4773

48-
self.__set_properties()
49-
self.__do_layout()
74+
self.SetSizer(sizer_1)
75+
sizer_1.Fit(self)
76+
77+
self.Layout()
5078

5179
self.Bind(wx.EVT_BUTTON, self.onOpen, self.buttonOpen)
5280
self.Bind(wx.EVT_BUTTON, self.onNew, self.buttonNew)
5381
self.Bind(wx.EVT_BUTTON, self.onCancel, self.buttonCancel)
5482
# end wxGlade
5583
self.__customProperties()
5684

57-
def __set_properties(self):
58-
# begin wxGlade: AddPhasePanel.__set_properties
59-
self.labelOpenPhase.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans"))
60-
self.labelCreatePhase.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans"))
61-
# end wxGlade
62-
63-
def __do_layout(self):
64-
# begin wxGlade: AddPhasePanel.__do_layout
65-
sizer_1 = wx.BoxSizer(wx.VERTICAL)
66-
sizer_5 = wx.BoxSizer(wx.HORIZONTAL)
67-
sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
68-
sizer_4.Add(self.labelOpenPhase, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
69-
sizer_4.Add(self.buttonOpen, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.ALL, 5)
70-
sizer_1.Add(sizer_4, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
71-
sizer_1.Add(self.static_line_5, 0, wx.EXPAND, 0)
72-
sizer_5.Add(self.labelCreatePhase, 1, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
73-
sizer_5.Add(self.buttonNew, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.ALL, 5)
74-
sizer_1.Add(sizer_5, 0, wx.BOTTOM | wx.EXPAND | wx.TOP, 5)
75-
sizer_1.Add(self.static_line_6, 0, wx.BOTTOM | wx.EXPAND, 10)
76-
sizer_1.Add(self.buttonCancel, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.ALL, 5)
77-
sizer_1.Add((450, 10), 0, 0, 0)
78-
self.SetSizer(sizer_1)
79-
sizer_1.Fit(self)
80-
self.Layout()
81-
# end wxGlade
82-
8385
# UTILITY FUNCTIONS ####
8486

8587
def __customProperties(self):

Diff for: ‎src/diffpy/pdfgui/gui/calculationpanel.py

+63-43
Original file line numberDiff line numberDiff line change
@@ -27,83 +27,103 @@ def __init__(self, *args, **kwds):
2727
# begin wxGlade: CalculationPanel.__init__
2828
kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
2929
wx.Panel.__init__(self, *args, **kwds)
30-
self.panelNameLabel = wx.StaticText(self, wx.ID_ANY, "Calculation Configuration")
31-
self.radioBoxStype = wx.RadioBox(self, wx.ID_ANY, "Scatterer Type", choices=["Neutron", "X-ray"], majorDimension=2, style=wx.RA_SPECIFY_COLS)
32-
self.labelCalcRange = wx.StaticText(self, wx.ID_ANY, "Range", style=wx.ALIGN_RIGHT)
33-
self.textCtrlCalcFrom = wx.TextCtrl(self, wx.ID_ANY, "1.0")
34-
self.labelTo = wx.StaticText(self, wx.ID_ANY, "to", style=wx.ALIGN_RIGHT)
35-
self.textCtrlCalcTo = wx.TextCtrl(self, wx.ID_ANY, "10.0")
36-
self.labelRStep = wx.StaticText(self, wx.ID_ANY, "spacing", style=wx.ALIGN_RIGHT)
37-
self.textCtrlRStep = wx.TextCtrl(self, wx.ID_ANY, "0.01")
38-
self.labelScaleFactor = wx.StaticText(self, wx.ID_ANY, "Scale Factor", style=wx.ALIGN_RIGHT)
39-
self.textCtrlScaleFactor = wx.TextCtrl(self, wx.ID_ANY, "1.0")
40-
self.labelQmax = wx.StaticText(self, wx.ID_ANY, "Qmax", style=wx.ALIGN_RIGHT)
41-
self.textCtrlQmax = wx.TextCtrl(self, wx.ID_ANY, "25.0")
42-
self.label_1 = wx.StaticText(self, wx.ID_ANY, "")
43-
self.label_1_copy = wx.StaticText(self, wx.ID_ANY, "")
44-
self.labelQdamp = wx.StaticText(self, wx.ID_ANY, "Qdamp", style=wx.ALIGN_RIGHT)
45-
self.textCtrlQdamp = wx.TextCtrl(self, wx.ID_ANY, "0.0")
46-
self.labelQbroad = wx.StaticText(self, wx.ID_ANY, "Qbroad", style=wx.ALIGN_RIGHT)
47-
self.textCtrlQbroad = wx.TextCtrl(self, wx.ID_ANY, "0.0")
48-
self.label_1_copy_2 = wx.StaticText(self, wx.ID_ANY, "")
49-
self.label_1_copy_1 = wx.StaticText(self, wx.ID_ANY, "")
50-
self.label_1_copy_6 = wx.StaticText(self, wx.ID_ANY, "")
51-
self.label_1_copy_5 = wx.StaticText(self, wx.ID_ANY, "")
52-
self.label_1_copy_3 = wx.StaticText(self, wx.ID_ANY, "")
53-
self.label_1_copy_4 = wx.StaticText(self, wx.ID_ANY, "")
5430

55-
self.__set_properties()
56-
self.__do_layout()
31+
sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
5732

58-
self.Bind(wx.EVT_RADIOBOX, self.onStype, self.radioBoxStype)
59-
# end wxGlade
60-
self.__customProperties()
33+
outerSizer = wx.BoxSizer(wx.VERTICAL)
34+
sizer_1.Add(outerSizer, 1, wx.EXPAND, 0)
35+
36+
sizer_panelname = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, ""), wx.HORIZONTAL)
37+
outerSizer.Add(sizer_panelname, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 5)
6138

62-
def __set_properties(self):
63-
# begin wxGlade: CalculationPanel.__set_properties
39+
self.panelNameLabel = wx.StaticText(self, wx.ID_ANY, "Calculation Configuration")
6440
self.panelNameLabel.SetFont(wx.Font(18, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, 0, ""))
41+
sizer_panelname.Add(self.panelNameLabel, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 5)
42+
43+
outerSizer.Add((450, 5), 0, 0, 0)
44+
45+
self.radioBoxStype = wx.RadioBox(self, wx.ID_ANY, "Scatterer Type", choices=["Neutron", "X-ray"], majorDimension=2, style=wx.RA_SPECIFY_COLS)
6546
self.radioBoxStype.SetMinSize((330, 43))
6647
self.radioBoxStype.SetSelection(0)
67-
# end wxGlade
48+
outerSizer.Add(self.radioBoxStype, 0, wx.ALL, 5)
6849

69-
def __do_layout(self):
70-
# begin wxGlade: CalculationPanel.__do_layout
71-
sizer_1 = wx.BoxSizer(wx.HORIZONTAL)
72-
outerSizer = wx.BoxSizer(wx.VERTICAL)
7350
grid_sizer_1 = wx.FlexGridSizer(4, 6, 5, 10)
74-
sizer_panelname = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, ""), wx.HORIZONTAL)
75-
sizer_panelname.Add(self.panelNameLabel, 0, wx.ALIGN_CENTER_VERTICAL | wx.LEFT | wx.RIGHT, 5)
76-
outerSizer.Add(sizer_panelname, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 5)
77-
outerSizer.Add((450, 5), 0, 0, 0)
78-
outerSizer.Add(self.radioBoxStype, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5)
51+
outerSizer.Add(grid_sizer_1, 0, wx.ALL | wx.EXPAND, 5)
52+
53+
self.labelCalcRange = wx.StaticText(self, wx.ID_ANY, "Range", style=wx.ALIGN_RIGHT)
7954
grid_sizer_1.Add(self.labelCalcRange, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 5)
55+
56+
self.textCtrlCalcFrom = wx.TextCtrl(self, wx.ID_ANY, "1.0")
8057
grid_sizer_1.Add(self.textCtrlCalcFrom, 0, wx.ALIGN_CENTER_VERTICAL, 0)
58+
59+
self.labelTo = wx.StaticText(self, wx.ID_ANY, "to", style=wx.ALIGN_RIGHT)
8160
grid_sizer_1.Add(self.labelTo, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 20)
61+
62+
self.textCtrlCalcTo = wx.TextCtrl(self, wx.ID_ANY, "10.0")
8263
grid_sizer_1.Add(self.textCtrlCalcTo, 0, wx.ALIGN_CENTER_VERTICAL, 0)
64+
65+
self.labelRStep = wx.StaticText(self, wx.ID_ANY, "spacing", style=wx.ALIGN_RIGHT)
8366
grid_sizer_1.Add(self.labelRStep, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 5)
67+
68+
self.textCtrlRStep = wx.TextCtrl(self, wx.ID_ANY, "0.01")
8469
grid_sizer_1.Add(self.textCtrlRStep, 0, wx.ALIGN_CENTER_VERTICAL, 0)
70+
71+
self.labelScaleFactor = wx.StaticText(self, wx.ID_ANY, "Scale Factor", style=wx.ALIGN_RIGHT)
8572
grid_sizer_1.Add(self.labelScaleFactor, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 5)
73+
74+
self.textCtrlScaleFactor = wx.TextCtrl(self, wx.ID_ANY, "1.0")
8675
grid_sizer_1.Add(self.textCtrlScaleFactor, 0, wx.ALIGN_CENTER_VERTICAL, 0)
76+
77+
self.labelQmax = wx.StaticText(self, wx.ID_ANY, "Qmax", style=wx.ALIGN_RIGHT)
8778
grid_sizer_1.Add(self.labelQmax, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 20)
79+
80+
self.textCtrlQmax = wx.TextCtrl(self, wx.ID_ANY, "25.0")
8881
grid_sizer_1.Add(self.textCtrlQmax, 0, wx.ALIGN_CENTER_VERTICAL, 0)
82+
83+
self.label_1 = wx.StaticText(self, wx.ID_ANY, "")
8984
grid_sizer_1.Add(self.label_1, 0, 0, 0)
85+
86+
self.label_1_copy = wx.StaticText(self, wx.ID_ANY, "")
9087
grid_sizer_1.Add(self.label_1_copy, 0, 0, 0)
88+
89+
self.labelQdamp = wx.StaticText(self, wx.ID_ANY, "Qdamp", style=wx.ALIGN_RIGHT)
9190
grid_sizer_1.Add(self.labelQdamp, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 5)
91+
92+
self.textCtrlQdamp = wx.TextCtrl(self, wx.ID_ANY, "0.0")
9293
grid_sizer_1.Add(self.textCtrlQdamp, 0, wx.ALIGN_CENTER_VERTICAL, 0)
94+
95+
self.labelQbroad = wx.StaticText(self, wx.ID_ANY, "Qbroad", style=wx.ALIGN_RIGHT)
9396
grid_sizer_1.Add(self.labelQbroad, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT, 5)
97+
98+
self.textCtrlQbroad = wx.TextCtrl(self, wx.ID_ANY, "0.0")
9499
grid_sizer_1.Add(self.textCtrlQbroad, 0, wx.ALIGN_CENTER_VERTICAL, 0)
100+
101+
self.label_1_copy_2 = wx.StaticText(self, wx.ID_ANY, "")
95102
grid_sizer_1.Add(self.label_1_copy_2, 0, 0, 0)
103+
104+
self.label_1_copy_1 = wx.StaticText(self, wx.ID_ANY, "")
96105
grid_sizer_1.Add(self.label_1_copy_1, 0, 0, 0)
106+
107+
self.label_1_copy_6 = wx.StaticText(self, wx.ID_ANY, "")
97108
grid_sizer_1.Add(self.label_1_copy_6, 0, 0, 0)
109+
110+
self.label_1_copy_5 = wx.StaticText(self, wx.ID_ANY, "")
98111
grid_sizer_1.Add(self.label_1_copy_5, 0, 0, 0)
112+
113+
self.label_1_copy_3 = wx.StaticText(self, wx.ID_ANY, "")
99114
grid_sizer_1.Add(self.label_1_copy_3, 0, 0, 0)
115+
116+
self.label_1_copy_4 = wx.StaticText(self, wx.ID_ANY, "")
100117
grid_sizer_1.Add(self.label_1_copy_4, 0, 0, 0)
101-
outerSizer.Add(grid_sizer_1, 0, wx.ALL | wx.EXPAND, 5)
102-
sizer_1.Add(outerSizer, 1, wx.EXPAND, 0)
118+
103119
self.SetSizer(sizer_1)
104120
sizer_1.Fit(self)
121+
105122
self.Layout()
123+
124+
self.Bind(wx.EVT_RADIOBOX, self.onStype, self.radioBoxStype)
106125
# end wxGlade
126+
self.__customProperties()
107127

108128
# USER CONFIGURATION CODE #################################################
109129

0 commit comments

Comments
 (0)