gui tk frames

Commit
a36cfd1ef6c4ae72403795f6d12883e36d962b08
Author
Marius Peter <blendoit@gmail.com>
Author date
Committer
Marius Peter <blendoit@gmail.com>
Committer date
gui.py
index bc91597a..97d4e7a9 100644..100644
@@ -13,36 +13,60 @@
13 13 # You should have received a copy of the GNU General Public License
14 14 # along with this program. If not, see <https://www.gnu.org/licenses/>.
15 15
16 Removed:
16 Added: import creator
17 17 import tkinter as tk
18 Removed: from tkinter import ttk
18 Added: import tkinter.ttk as ttk
19 19
20 Added: import matplotlib.pyplot as plt
21 Added: from matplotlib.backends.backend_tkagg import (
22 Added: FigureCanvasTkAgg, NavigationToolbar2Tk)
23 Added: import numpy as np
20 24
21 Removed: class Input:
22 Removed: '''User inputs.'''
23 25
24 Removed: def __init__(self, master):
25 Removed: ttk.Frame(master).grid(row=0, column=0)
26 Removed: ttk.Label(master, text='NACA Number').grid(row=0, sticky='W')
27 Removed: ttk.Label(master, text='Chord Length').grid(row=1, sticky='W')
28 Removed: ttk.Entry(master).grid(row=0, column=1)
29 Removed: ttk.Entry(master).grid(row=1, column=1)
26 Added: def main():
27 Added: root = tk.Tk()
28 Added: root.title('MAE 154B - Airfoil Design, Evaluation, Optimization')
29 Added: root.geometry('1000x400')
30 30
31 Added: frame = ttk.Frame(root).grid(row=0, column=0)
32 Added: ttk.Label(frame, text='NACA Number').grid(row=0, sticky='W')
33 Added: ttk.Entry(frame).grid(row=0, column=1)
34 Added: ttk.Label(frame, text='Chord Length').grid(row=1, sticky='W')
35 Added: ttk.Entry(frame).grid(row=1, column=1)
31 36
32 Removed: class Graph:
33 Removed: '''Graph airfoil.'''
37 Added: # Create airfoil instance
38 Added: creator.Coordinates(68, 200)
39 Added: af = creator.Airfoil()
40 Added: af.add_naca(2412)
41 Added: af.add_mass(10)
34 42
35 Removed: def __init__(self, master):
36 Removed: ttk.Frame(master).grid(row=0, column=1)
43 Added: af.spar = creator.Spar()
44 Added: af.spar.add_coord(af, 0.20)
45 Added: af.spar.add_coord(af, 0.65)
46 Added: af.spar.add_spar_caps(0.03)
47 Added: af.spar.add_mass(0.04)
48 Added: af.spar.add_webs(0.02)
37 49
50 Added: af.stringer = creator.Stringer()
51 Added: af.stringer.add_coord(af, 3, 6, 5, 4)
52 Added: af.stringer.add_area(0.1)
53 Added: af.stringer.add_mass(0.02)
54 Added: af.stringer.add_webs(0.03)
38 55
39 Removed: def main():
40 Removed: root = tk.Tk()
41 Removed: root.title('MAE 154B - Airfoil Design, Evaluation, Optimization')
42 Removed: root.geometry('1000x400')
56 Added: frame = ttk.Frame(root).grid(row=0, column=1)
43 57
44 Removed: Input(root)
45 Removed: Graph(root)
58 Added: fig = plt.Figure(figsize=(5, 4), dpi=100)
59 Added: t = np.arange(0, 3, .01)
60 Added: fig.add_subplot(111).plot(af.x, af.z)
61 Added:
62 Added: canvas = FigureCanvasTkAgg(fig, master=frame) # A tk.DrawingArea.
63 Added: # canvas.draw()
64 Added: canvas.get_tk_widget().grid(row=0, column=1)
65 Added:
66 Added: # toolbar = NavigationToolbar2Tk(canvas, master)
67 Added: # toolbar.update()
68 Added: # canvas.get_tk_widget().grid(row=0, column=1)
69 Added:
46 70 root.mainloop()
47 71 return None
48 72