diff --git a/Analysis/Section_Props_GUI.py b/Analysis/Section_Props_GUI.py index 71e5eaa..4676c8e 100644 --- a/Analysis/Section_Props_GUI.py +++ b/Analysis/Section_Props_GUI.py @@ -14,16 +14,15 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import matplotlib matplotlib.use('TKAgg') from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg from matplotlib.figure import Figure import matplotlib.pyplot as plt -import Tkinter as tk +import tkinter as tk import os import math -import tkMessageBox +import tkinter.messagebox as tkMessageBox def path_exists(path): res_folder_exist = os.path.isdir(path) @@ -345,40 +344,40 @@ def run_file(self): i=0 for i in range(0,num_vertices): i_x =i_x + (vertices_y[i]**2+vertices_y[i]*vertices_y[i+1]+vertices_y[i+1]**2)*(vertices_x[i]*vertices_y[i+1]-vertices_x[i+1]*vertices_y[i]) - print str(i_x) + print (str(i_x)) i_x = i_x/12 i_x = i_x i=0 for i in range(0,num_vertices): i_y = i_y + (vertices_x[i]**2+vertices_x[i]*vertices_x[i+1]+vertices_x[i+1]**2)*(vertices_x[i]*vertices_y[i+1]-vertices_x[i+1]*vertices_y[i]) - print str(i_y) + print (str(i_y)) i_y = i_y/12 i_y = i_y i=0 for i in range(0,num_vertices): i_xy = i_xy + (vertices_x[i]*vertices_y[i+1]+2*vertices_x[i]*vertices_y[i]+2*vertices_x[i+1]*vertices_y[i+1]+vertices_x[i+1]*vertices_y[i])*(vertices_x[i]*vertices_y[i+1]-vertices_x[i+1]*vertices_y[i]) - print str(i_xy) + print (str(i_xy)) i_xy = i_xy/24 i_xy = i_xy i=0 for i in range(0,num_vertices): area = area + (vertices_x[i]*vertices_y[i+1]-vertices_x[i+1]*vertices_y[i]) - print str(area) + print (str(area)) area = area/2 i=0 for i in range(0,num_vertices): x_bar = x_bar + (vertices_x[i]+vertices_x[i+1])*(vertices_x[i]*vertices_y[i+1]-vertices_x[i+1]*vertices_y[i]) - print str(x_bar) + print (str(x_bar)) x_bar = x_bar / (6*area) i=0 for i in range(0,num_vertices): y_bar = y_bar + (vertices_y[i]+vertices_y[i+1])*(vertices_x[i]*vertices_y[i+1]-vertices_x[i+1]*vertices_y[i]) - print str(y_bar) + print (str(y_bar)) y_bar = y_bar/(6*area) i_x_bar = i_x - area*y_bar**2 @@ -470,4 +469,4 @@ def main(): root.mainloop() if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/Analysis/beam_patterning.py b/Analysis/beam_patterning.py index 1d1c9d2..220ea1f 100644 --- a/Analysis/beam_patterning.py +++ b/Analysis/beam_patterning.py @@ -1,14 +1,13 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 -from __future__ import division import matplotlib matplotlib.use('TKAgg') from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg from matplotlib.figure import Figure -import Tkinter as tk -from Tkinter import PhotoImage -import tkFileDialog -import tkFont +import tkinter as tk +from tkinter import PhotoImage +import tkinter.filedialog as tkFileDialog +import tkinter.font as tkFont import numpy as np from numpy.linalg import inv from numpy import unravel_index @@ -18,7 +17,7 @@ import os import itertools import math -import tkMessageBox +import tkinter.messagebox as tkMessageBox import time def load_pattern(num_spans): @@ -730,7 +729,7 @@ def __init__(self, master): self.per_span_res_frame = tk.Frame(self.frame_selection,relief='sunken') stations = Main_window.stations - print stations + print (stations) self.span_res_scale = tk.Scale(self.per_span_res_frame, from_=0, to=stations, orient=tk.HORIZONTAL, label = "Location in Span:", length = 300, command=self.span_res_run) self.span_res_scale.pack(side=tk.TOP, padx=5, pady=5) self.span_res_b_plus = tk.Button(self.per_span_res_frame,text='+', command = self.set_span_res_plus) @@ -2412,7 +2411,7 @@ def run_file(self): wind_y.append(holder) Main_window.load_exist[10]=1 else: - print 'no load kind' + print ('no load kind') else: pass @@ -2509,7 +2508,7 @@ def run_file(self): Main_window.total_deflection_goal.append(span/240) startt = time.time() - print 'Perform analysis for all load types defined....' + print ('Perform analysis for all load types defined....') for i in range(0,11): if i in range(5,9): if len(loads[i][1][0]) == 0: @@ -2539,14 +2538,14 @@ def run_file(self): Main_window.xs,Main_window.displace_initial_results[0],Main_window.displace_initial_results[1],Main_window.displace_initial_results[2],Main_window.displace_initial_results[3], Main_window.displace_initial_results[4], Main_window.displace_initial_results[5] = three_moment_method(beam_spans, beam_momentofinertia, cant, [[0.00,0.00,0.00,0.00,'POINT',0,0]], E, iters, displace_initial) endt = time.time() - print '**Analysis Complete** in {0:.4f} sec'.format(endt-startt) + print ('**Analysis Complete** in {0:.4f} sec'.format(endt-startt)) Main_window.load_results = loads Main_window.bm = np.zeros((iters+1,N)) # # ['D', 'Ex', 'Ey', 'F', 'H', 'L', 'Lr', 'R', 'S', 'Wx', 'Wy'] # # data structure for each non patterned load type [['D'],[loads],[shears],[moments],[slopes],[deflections],[Support Reactions],[Moments at supports]] - print 'Factoring Loads and Generating Graphs...' + print ('Factoring Loads and Generating Graphs...') fi = float(self.fi_lrfd.get()) fy = float(self.fy_lrfd.get()) @@ -2618,7 +2617,7 @@ def run_file(self): #Factor and combine loads and Print Results to text File - print 'LRFD Combinations...' + print ('LRFD Combinations...') Main_window.lrfd_v = [] Main_window.lrfd_m = [] Main_window.lrfd_r = [] @@ -2696,7 +2695,7 @@ def run_file(self): Main_window.lrfd_m_support_env_min.append(np.minimum.reduce(m_pattern)) Main_window.lrfd_m_support_env_max.append(np.maximum.reduce(m_pattern)) - print 'ASD/BASIC Combinations...' + print ('ASD/BASIC Combinations...') Main_window.basic_v = [] Main_window.basic_m = [] Main_window.basic_s = [] @@ -2799,7 +2798,7 @@ def run_file(self): Main_window.basic_r_env_min.append(np.minimum.reduce(r_pattern)) Main_window.basic_m_support_env_min.append(np.minimum.reduce(m_pattern)) - print 'Enveloping Results...' + print ('Enveloping Results...') Main_window.lrfd_Rmax_print = np.maximum.reduce(Main_window.lrfd_r_env_max) Main_window.lrfd_Rmin_print = np.minimum.reduce(Main_window.lrfd_r_env_min) @@ -2825,7 +2824,7 @@ def run_file(self): Main_window.asd_d_min_diag = np.minimum.reduce(Main_window.basic_d_env_min) #Create CSV file of LRFD Envelope Results - print 'Writing CSV Files...' + print ('Writing CSV Files...') file = open(os.path.join(path,bmlabel+'_04_LRFD_Envelope_Results.csv'),'w') file.write('LRFD Envelope Results\n') file.write('Spans:,'+str(N)) @@ -2869,7 +2868,7 @@ def run_file(self): cad_points = iters #Create DXF of Envelope Results - print 'Creating DXF of Results ...' + print ('Creating DXF of Results ...') file = open(os.path.join(path,bmlabel+'_02_Envelope_Results.dxf'),'w') file.write(' 0\nSECTION\n 2\nENTITIES\n') file.write(' 0\nPOLYLINE\n 8\nspans\n 66\n1\n 10\n0.0\n 20\n0.0\n 30\n0.0\n 70\n8\n') @@ -3349,7 +3348,7 @@ def run_file(self): file.write(' 0\nENDSEC\n 0\nEOF') file.close() - print 'Done!' + print ('Done!') self.brun.configure(bg='green') self.bresults.configure(state="normal", bg='green') self.menu.entryconfig(4, state="normal") diff --git a/Analysis/integration_test.py b/Analysis/integration_test.py index ad16757..a92596c 100644 --- a/Analysis/integration_test.py +++ b/Analysis/integration_test.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import scipy as sci import scipy.integrate import numpy as np diff --git a/Analysis/load_combo_test.py b/Analysis/load_combo_test.py index 3ab198c..f76f558 100644 --- a/Analysis/load_combo_test.py +++ b/Analysis/load_combo_test.py @@ -74,8 +74,8 @@ max_ind = np.unravel_index(np.argmax(combined), combined.shape) -print basic_combos[max_ind[0]] -print xs[max_ind[1]] +print (basic_combos[max_ind[0]]) +print (xs[max_ind[1]]) max_flat = np.max(combined, axis=0).reshape(501,1) min_flat = np.min(combined, axis=0).reshape(501,1) diff --git a/Analysis/pin_pin_beam_equations_classes.py b/Analysis/pin_pin_beam_equations_classes.py index 724fca0..46ae1eb 100644 --- a/Analysis/pin_pin_beam_equations_classes.py +++ b/Analysis/pin_pin_beam_equations_classes.py @@ -12,7 +12,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division from numpy import sign from numpy import zeros import numpy as np diff --git a/Analysis/simple_beam.py b/Analysis/simple_beam.py index 05e5cb0..311b3a8 100644 --- a/Analysis/simple_beam.py +++ b/Analysis/simple_beam.py @@ -14,10 +14,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division -import Tkinter as tk -import ttk -import tkFont +import tkinter as tk +import tkinter.ttk as ttk +import tkinter.font as tkFont import pin_pin_beam_equations_classes as ppbeam from numpy import zeros import numpy as np @@ -25,7 +24,7 @@ import math import os import webbrowser -import tkMessageBox +import tkinter.messagebox as tkMessageBox # import matplotlib.pyplot as plt class Master_window: diff --git a/Analysis/testing_file.py b/Analysis/testing_file.py index d83dabc..6399325 100644 --- a/Analysis/testing_file.py +++ b/Analysis/testing_file.py @@ -81,5 +81,5 @@ results_3mm = test_3mm.res() -print 'Analysis: {0}'.format(analysis_time) -print 'Analysis - 3mm: {0}'.format(analysis_3mm_time) \ No newline at end of file +print ('Analysis: {0}'.format(analysis_time)) +print ('Analysis - 3mm: {0}'.format(analysis_3mm_time)) diff --git a/Analysis/three_moment_method.py b/Analysis/three_moment_method.py index 68b5922..e6a3bd5 100644 --- a/Analysis/three_moment_method.py +++ b/Analysis/three_moment_method.py @@ -14,7 +14,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import numpy as np from numpy.linalg import inv import scipy as sci diff --git a/Analysis/three_moment_method_e.py b/Analysis/three_moment_method_e.py index c5c97d7..73be213 100644 --- a/Analysis/three_moment_method_e.py +++ b/Analysis/three_moment_method_e.py @@ -14,7 +14,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import numpy as np from numpy.linalg import inv import scipy as sci diff --git a/Code/line_helper_gui.py b/Code/line_helper_gui.py index 9a0e727..a2ff8cb 100644 --- a/Code/line_helper_gui.py +++ b/Code/line_helper_gui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,8 +14,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division -import Tkinter as tk +import tkinter as tk class Main_window: @@ -173,4 +172,4 @@ def main(): root.mainloop() if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/Code/snow_drift by polygons.py b/Code/snow_drift by polygons.py index 6b89207..f6d1694 100644 --- a/Code/snow_drift by polygons.py +++ b/Code/snow_drift by polygons.py @@ -18,7 +18,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math import numpy as np import matplotlib.pyplot as plt @@ -646,16 +645,16 @@ def line_closest_to_point_and_point_on_line(point, lines): calc_log, perp_lines, intersect_points, points_x, points_y = drift_all(lines,snow_density_pcf,pg_psf,25,1) s_x, s_y, mx, my = lines_transformation_to_origin(lines) -print s_x -print s_y -print mx -print my +print (s_x) +print (s_y) +print (mx) +print (my) test1, test2, segment, segment_point = line_closest_to_point_and_point_on_line([35.5,9.4],lines) -print test1 -print test2 -print segment -print segment_point +print (test1) +print (test2) +print (segment) +print (segment_point) colors = ['r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k'] i=0 diff --git a/Code/snow_drift_by_polygons.py b/Code/snow_drift_by_polygons.py index f569fad..f533b22 100644 --- a/Code/snow_drift_by_polygons.py +++ b/Code/snow_drift_by_polygons.py @@ -18,7 +18,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math import numpy as np import matplotlib.pyplot as plt @@ -712,16 +711,16 @@ def export_dxf(path, lines): calc_log, perp_lines, intersect_points, points_x, points_y = drift_all(lines,snow_density_pcf,pg_psf,25,1) s_x, s_y, mx, my = lines_transformation_to_origin(lines) -print s_x -print s_y -print mx -print my +print (s_x) +print (s_y) +print (mx) +print (my) test1, test2, segment, segment_point = line_closest_to_point_and_point_on_line([35.5,9.4],lines) -print test1 -print test2 -print segment -print segment_point +print (test1) +print (test2) +print (segment) +print (segment_point) colors = ['r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k','r','b','g','c','m','y','k'] i=0 diff --git a/Code/snow_drift_gui.py b/Code/snow_drift_gui.py index 2ed9f17..987c949 100644 --- a/Code/snow_drift_gui.py +++ b/Code/snow_drift_gui.py @@ -14,13 +14,12 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math as m -import Tkinter as tk -import tkMessageBox -import ttk -import tkFont -import tkFileDialog +import tkinter as tk +import tkinter.messagebox as tkMessageBox +import tkinter.ttk as ttk +import tkinter.font as tkFont +import tkinter.filedialog as tkFileDialog import snow_drift_by_polygons as snow_drift class main_window: diff --git a/Concrete/concrete_T_beam_any_steel_gui.py b/Concrete/concrete_T_beam_any_steel_gui.py index f0c6b7e..a870c46 100644 --- a/Concrete/concrete_T_beam_any_steel_gui.py +++ b/Concrete/concrete_T_beam_any_steel_gui.py @@ -14,7 +14,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division #Import Python Modules import matplotlib @@ -22,11 +21,11 @@ from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg from matplotlib.figure import Figure import matplotlib.pyplot as plt -import Tkinter as tk -import tkFileDialog -import tkMessageBox +import tkinter as tk +import tkinter.filedialog as tkFileDialog +import tkinter.messagebox as tkMessageBox import math -import tkFont +import tkinter.font as tkFont import os #Import my modules diff --git a/Concrete/concrete_T_beam_gui.py b/Concrete/concrete_T_beam_gui.py index a7ee6a0..f69c748 100644 --- a/Concrete/concrete_T_beam_gui.py +++ b/Concrete/concrete_T_beam_gui.py @@ -14,7 +14,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division #Import Python Modules import matplotlib @@ -22,11 +21,11 @@ from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg from matplotlib.figure import Figure import matplotlib.pyplot as plt -import Tkinter as tk -import tkFileDialog -import tkMessageBox +import tkinter as tk +import tkinter.filedialog as tkFileDialog +import tkinter.messagebox as tkMessageBox import math -import tkFont +import tkinter.font as tkFont import os #Import my modules diff --git a/Concrete/concrete_beam_classes.py b/Concrete/concrete_beam_classes.py index ff5d40b..13a48f5 100644 --- a/Concrete/concrete_beam_classes.py +++ b/Concrete/concrete_beam_classes.py @@ -12,7 +12,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math class reinforcement: @@ -212,8 +211,8 @@ def moment_capacity_inlbs(self,bars_as_array,bars_d_array,bars_cg,c_in,fy_psi,Es concrete_moment_component_inlbs = concrete_compression_force_lbs * concrete_moment_arm_in nominal_moment_inlbs = concrete_moment_component_inlbs + steel_moment_component_inlbs - #print phi,concrete_moment_component_inlbs,steel_moment_component_inlbs,concrete_moment_arm_in - #print concrete_compression_force_lbs, steel_tension_force_layer_lbs + #print (phi,concrete_moment_component_inlbs,steel_moment_component_inlbs,concrete_moment_arm_in) + #print (concrete_compression_force_lbs, steel_tension_force_layer_lbs) return phi,nominal_moment_inlbs,phi*nominal_moment_inlbs @@ -273,7 +272,7 @@ def cracked_moment_of_inertia_in4(self,bars_as_array,bars_d_array,Es_psi): else: a = c loop+=1 - #print na + #print (na) i_crack_in4 = (self.b_in*na**3)/3 for i in range(len(bars_as_array)): @@ -515,8 +514,8 @@ def find_pna(self,bars_as_array,bars_d_array,bars_cg,fy_psi,Es_psi): else: a = c loop+=1 - print tension_c - print pna + print (tension_c) + print (pna) return pna def moment_capacity_inlbs(self,bars_as_array,bars_d_array,bars_cg,c_in,fy_psi,Es_psi): @@ -769,12 +768,12 @@ def cracked_moment_of_inertia_in4(self,bars_as_array,bars_d_array,Es_psi): # flexural_top_bars_per_layer = [3] -# print bm.max_bars_layer(flexural_bottom_bars[0], cover_in, shear_bar, aggregate_size_in) -# print bm.min_bars_bottom_layer(flexural_bottom_bars[0], cover_in, shear_bar, flexural_bars.fy_psi) +# print (bm.max_bars_layer(flexural_bottom_bars[0], cover_in, shear_bar, aggregate_size_in)) +# print (bm.min_bars_bottom_layer(flexural_bottom_bars[0], cover_in, shear_bar, flexural_bars.fy_psi)) # bars_as,bars_d,tension_bars_cg = bm.flexural_bottom_bars_automatic_by_layers(flexural_bottom_bars,flexural_bottom_bars_per_layer,cover_in,shear_bar) # top_bars_as,top_bars_d = bm.flexural_top_bars_automatic_by_layers(flexural_top_bars,flexural_top_bars_per_layer,cover_in,shear_bar) -# print bars_as,bars_d,tension_bars_cg -# print top_bars_as, top_bars_d +# print (bars_as,bars_d,tension_bars_cg) +# print (top_bars_as, top_bars_d) # flexural_bars_as = bars_as + top_bars_as # flexural_bars_d = bars_d + top_bars_d # total_as = sum(flexural_bars_as) @@ -785,9 +784,9 @@ def cracked_moment_of_inertia_in4(self,bars_as_array,bars_d_array,Es_psi): # flexural_bars_cg = total_as_d/total_as # minas = bm.as_min(tension_bars_cg,flexural_bars.fy_psi) # c_in = bm.find_pna(flexural_bars_as,flexural_bars_d,flexural_bars_cg,flexural_bars.fy_psi,flexural_bars.Es_psi) -# print c_in -# print bm.strain_compatibility_steel(flexural_bars_as,flexural_bars_d,c_in,flexural_bars.fy_psi,flexural_bars.Es_psi) -# print bm.moment_capacity_inlbs(flexural_bars_as,flexural_bars_d,flexural_bars_cg,c_in,flexural_bars.fy_psi,flexural_bars.Es_psi) -# print bm.concrete_shear_capacity_lbs(tension_bars_cg) -# print bm.cracked_moment_of_inertia_in4(flexural_bars_as,flexural_bars_d,flexural_bars.Es_psi) -# print bm.Ig_in4 +# print (c_in) +# print (bm.strain_compatibility_steel(flexural_bars_as,flexural_bars_d,c_in,flexural_bars.fy_psi,flexural_bars.Es_psi)) +# print (bm.moment_capacity_inlbs(flexural_bars_as,flexural_bars_d,flexural_bars_cg,c_in,flexural_bars.fy_psi,flexural_bars.Es_psi)) +# print (bm.concrete_shear_capacity_lbs(tension_bars_cg)) +# print (bm.cracked_moment_of_inertia_in4(flexural_bars_as,flexural_bars_d,flexural_bars.Es_psi)) +# print (bm.Ig_in4) diff --git a/Steel/AISC Shapes Databases/aisc_steel_shapes.py b/Steel/AISC Shapes Databases/aisc_steel_shapes.py index 39d4f4e..2e9201e 100644 --- a/Steel/AISC Shapes Databases/aisc_steel_shapes.py +++ b/Steel/AISC Shapes Databases/aisc_steel_shapes.py @@ -19,9 +19,9 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import Tkinter as tk -import tkFont -import tkMessageBox +import tkinter as tk +import tkinter.font as tkFont +import tkinter.messagebox as tkMessageBox class Master_window: diff --git a/Steel/AISC Shapes Databases/aisc_steel_shapes_historic.py b/Steel/AISC Shapes Databases/aisc_steel_shapes_historic.py index 1d4ab84..6731712 100644 --- a/Steel/AISC Shapes Databases/aisc_steel_shapes_historic.py +++ b/Steel/AISC Shapes Databases/aisc_steel_shapes_historic.py @@ -19,9 +19,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import Tkinter as tk -import tkFont -import tkMessageBox +import tkinter as tk +import tkinter.font as tkFont +import tkinter.messagebox as tkMessageBox class Master_window: diff --git a/Steel/AISC Shapes Databases/steel_calculator.py b/Steel/AISC Shapes Databases/steel_calculator.py index 5f2fa84..996010e 100644 --- a/Steel/AISC Shapes Databases/steel_calculator.py +++ b/Steel/AISC Shapes Databases/steel_calculator.py @@ -18,13 +18,12 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math import aisc_database_class -import Tkinter as tk -import ttk -import tkFont -import tkMessageBox +import tkinter as tk +import tkinter.ttk as ttk +import tkinter.font as tkFont +import tkinter.messagebox as tkMessageBox class Master_window: diff --git a/Steel/bolt_group_istantaneous_center.py b/Steel/bolt_group_istantaneous_center.py index c18b774..30b0fff 100644 --- a/Steel/bolt_group_istantaneous_center.py +++ b/Steel/bolt_group_istantaneous_center.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math as m def build_bolt_group(numCols, numRows, Colspacing, Rowspacing): diff --git a/Steel/bolts_IC_gui.py b/Steel/bolts_IC_gui.py index aaceab4..3a931d0 100644 --- a/Steel/bolts_IC_gui.py +++ b/Steel/bolts_IC_gui.py @@ -14,13 +14,12 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math as m -import Tkinter as tk -import tkMessageBox -import ttk -import tkFont -import tkFileDialog +import tkinter as tk +import tkinter.messagebox as tkMessageBox +import tkinter.ttk as ttk +import tkinter.font as tkFont +import tkinter.filedialog as tkFileDialog import bolt_group_istantaneous_center as bolt_ic class main_window: diff --git a/Steel/welds_elastic_method.py b/Steel/welds_elastic_method.py index 2285ecb..c221e85 100644 --- a/Steel/welds_elastic_method.py +++ b/Steel/welds_elastic_method.py @@ -14,7 +14,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math def center_of_two_points(p1=[0,0],p2=[1,1]): @@ -559,4 +558,4 @@ def aisc_weld_check(self, resultant, Fexx, Fy_base1, Fu_base1, base_thickness1, # log = weld_group.log - \ No newline at end of file + diff --git a/Steel/welds_gui.py b/Steel/welds_gui.py index 739e0bf..9239a02 100644 --- a/Steel/welds_gui.py +++ b/Steel/welds_gui.py @@ -21,11 +21,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math -import Tkinter as tk -import ttk -import tkFont +import tkinter as tk +import tkinter.ttk as ttk +import tkinter.font as tkFont import welds_elastic_method as wem class Master_window: @@ -447,4 +446,4 @@ def main(): root.mainloop() if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/Wood/wood_classes.py b/Wood/wood_classes.py index 5f2596e..9a6ba27 100644 --- a/Wood/wood_classes.py +++ b/Wood/wood_classes.py @@ -19,7 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division #import matplotlib.pyplot as plt class wood_stud_wall: @@ -628,9 +627,9 @@ def cap_at_common_spacing(self, cd,lateral_w_psf, e_in, crush=1): fc_prime = wall.fc_prime_calc(1.0) cp = wall.cp -print '---Warnings--\n' -print wall.warning -print wall.assumptions +print ('---Warnings--\n') +print (wall.warning) +print (wall.assumptions) fig, ax1 = plt.subplots() ax1.minorticks_on() diff --git a/Wood/wood_stud_wall_gui.py b/Wood/wood_stud_wall_gui.py index f74f00e..ab9f7cc 100644 --- a/Wood/wood_stud_wall_gui.py +++ b/Wood/wood_stud_wall_gui.py @@ -14,17 +14,17 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import Tkinter as tk -import tkMessageBox -import ttk -import tkFont +import tkinter as tk +import tkinter.messagebox as tkMessageBox +import tkinter.ttk as ttk +import tkinter.font as tkFont import wood_classes as wood import matplotlib matplotlib.use('TKAgg') from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg from matplotlib.figure import Figure import matplotlib.pyplot as plt -import tkFileDialog +import tkinter.filedialog as tkFileDialog import os import math diff --git a/strap_beam_gui.py b/strap_beam_gui.py index 0f1ec23..3c43000 100644 --- a/strap_beam_gui.py +++ b/strap_beam_gui.py @@ -19,17 +19,16 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division import math as m import Analysis.pin_pin_beam_equations_classes as ppbeam import Concrete.concrete_beam_classes as concbeam from numpy import zeros import numpy as np -import Tkinter as tk -import tkMessageBox -import ttk -import tkFont -import tkFileDialog +import tkinter as tk +import tkinter.messagebox as tkMessageBox +import tkinter.ttk as ttk +import tkinter.font as tkFont +import tkinter.filedialog as tkFileDialog class main_window: