functionize field creation

Commit
0e6e5f026ed443e40af2d20d37e90f6e16a0e722
Author
Marius Peter <blendoit@gmail.com>
Author date
Committer
Marius Peter <blendoit@gmail.com>
Committer date
gui.py
index 51e6aee7..483cc0cb 100644..100644
@@ -23,44 +23,69 @@
23 23 FigureCanvasTkAgg, NavigationToolbar2Tk)
24 24
25 25
26 Removed: def main():
27 Removed: root = tk.Tk()
28 Removed: root.wm_title('MAE 154B - Airfoil Design, Evaluation, Optimization')
29 Removed: # root.geometry('1000x400')
26 Added: # def main():
30 27
31 Removed: # Object definition
32 Removed: # User inputs
33 Removed: frame_1 = ttk.Frame(root)
34 Removed: l_naca = ttk.Label(frame_1, text='NACA Number')
35 Removed: naca = tk.StringVar()
36 Removed: e_naca = ttk.Entry(frame_1, textvariable=naca)
37 Removed: l_chord = ttk.Label(frame_1, text='Chord Length')
38 Removed: e_chord = ttk.Entry(frame_1)
39 Removed: af = generator.default_airfoil()
40 Removed: # Graph window
41 Removed: frame_2 = ttk.Frame(root)
42 Removed: fig, ax = creator.plot_geom(af, False)
43 Removed: plot = FigureCanvasTkAgg(fig, frame_2)
44 Removed: # plot.draw()
45 Removed: toolbar = NavigationToolbar2Tk(plot, frame_2)
46 Removed: # toolbar.update()
28 Added: def new_field(parent, name):
29 Added: """Add a new user input field."""
47 30
48 Removed: # Layout
49 Removed: # User input
50 Removed: l_naca.grid(row=0, column=0)
51 Removed: e_naca.grid(row=0, column=1, padx=4)
52 Removed: l_chord.grid(row=1, column=0)
53 Removed: e_chord.grid(row=1, column=1, padx=4)
54 Removed: frame_1.pack(side=tk.LEFT)
55 Removed: # Graph window
56 Removed: plot.get_tk_widget().pack(expand=1, fill=tk.BOTH)
57 Removed: toolbar.pack()
58 Removed: frame_2.pack(side=tk.LEFT)
31 Added: label = ttk.Label(parent, text=name)
32 Added: entry = ttk.Entry(parent)
33 Added: return label, entry
59 34
60 Removed: # plot.get_tk_widget().pack()
61 35
62 Removed: root.mainloop()
36 Added: def set_naca(name):
37 Added: naca_num = name.get()
38 Added: print(naca_num)
63 39
64 40
65 Removed: if __name__ == '__main__':
66 Removed: main()
41 Added: def set_chord(name):
42 Added: chord = name.get()
43 Added: print(chord)
44 Added:
45 Added:
46 Added: def set_semi_span(name):
47 Added: semi_span = name.get()
48 Added: print(semi_span)
49 Added:
50 Added:
51 Added: root = tk.Tk()
52 Added: root.wm_title('MAE 154B - Airfoil Design, Evaluation, Optimization')
53 Added: # root.geometry('1000x400')
54 Added:
55 Added: # Object definition
56 Added: # User inputs
57 Added: frame_1 = ttk.Frame(root)
58 Added: l_naca, e_naca = new_field(frame_1, 'naca')
59 Added: l_chord, e_chord = new_field(frame_1, 'chord')
60 Added: l_semi_span, e_semi_span = new_field(frame_1, 'semi_span')
61 Added: af = generator.default_airfoil()
62 Added: # Graph window
63 Added: frame_2 = ttk.Frame(root)
64 Added: fig, ax = creator.plot_geom(af, False)
65 Added: plot = FigureCanvasTkAgg(fig, frame_2)
66 Added: # plot.draw()
67 Added: toolbar = NavigationToolbar2Tk(plot, frame_2)
68 Added: # toolbar.update()
69 Added:
70 Added: # Layout
71 Added: # User input
72 Added: l_naca.grid(row=0, column=0)
73 Added: e_naca.grid(row=0, column=1, padx=4)
74 Added: # b_naca.grid(row=0, column=2)
75 Added: l_chord.grid(row=1, column=0)
76 Added: e_chord.grid(row=1, column=1, padx=4)
77 Added: l_semi_span.grid(row=2, column=0, padx=4)
78 Added: e_semi_span.grid(row=2, column=1, padx=4)
79 Added: frame_1.pack(side=tk.LEFT)
80 Added: # Graph window
81 Added: plot.get_tk_widget().pack(expand=1, fill=tk.BOTH)
82 Added: toolbar.pack()
83 Added: frame_2.pack(side=tk.LEFT)
84 Added:
85 Added: # plot.get_tk_widget().pack()
86 Added:
87 Added: root.mainloop()
88 Added:
89 Added:
90 Added: # if __name__ == '__main__':
91 Added: # main()