Merge pull request #123 from audunarn/move_dir_2

Various
audunarn · Feb 15, 2023 · e0a335a · e0a335a
2 parents 04b621d + c913223
commit e0a335a
Show file tree

Hide file tree

Showing 95 changed files with 253 additions and 229 deletions.
diff --git a/ANYstructure_install.ifp b/ANYstructure_install.ifp
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,46 +5,46 @@ include images\fls_button.gif
 include images\img_axial_stresses.gif
 include images\img_ext_pressure_button.gif
 include images\img_ext_pressure_button_def.gif
-include images\img_fixation_parameters.gif
-include images\img_generate_report.gif
-include images\img_int_pressure_button.gif
-include images\img_int_pressure_button_search.gif
-include images\img_multi_opt.gif
-include images\img_optimize.gif
-include images\img_plate_and_stiffener.gif
-include images\img_stf_button.gif
-include images\img_stiffener.gif
-include images\img_stress_button.gif
-include images\img_T_L_FB.gif
-include images\img_title.gif
-include images\img_transverse_stress.gif
-include images\ANYstructure_logo.jpg
-include images\current_comps_NONE.png
-include images\Buckling_Strength_of_Shells.png
-include images\Panel_geometry_definitions.png
-include ship_section_example.txt
-include ANYstructure_documentation.pdf
-include sections.csv
-include bulb_anglebar_tbar_flatbar.csv
-include ml_files\CL_output_cl_buc_predictor_In-plane_support_cl_1_SP.pickle
-include ml_files\CL_output_cl_buc_scaler_In-plane_support_cl_1_SP.pickle
-include ml_files\CL_output_cl_ult_predictor_In-plane_support_cl_1_SP.pickle
-include ml_files\CL_output_cl_ult_scaler_In-plane_support_cl_1_SP.pickle
-include ml_files\CL_output_cl_buc_predictor_In-plane_support_cl_2,_3_SP.pickle
-include ml_files\CL_output_cl_buc_scaler_In-plane_support_cl_2,_3_SP.pickle
-include ml_files\CL_output_cl_ult_predictor_In-plane_support_cl_2,_3_SP.pickle
-include ml_files\CL_output_cl_ult_scaler_In-plane_support_cl_2,_3_SP.pickle
-include ml_files\CL_output_cl_buc_predictor_In-plane_support_cl_1_UP.pickle
-include ml_files\CL_output_cl_buc_scaler_In-plane_support_cl_1_UP.pickle
-include ml_files\CL_output_cl_ult_predictor_In-plane_support_cl_1_UP.pickle
-include ml_files\CL_output_cl_ult_scaler_In-plane_support_cl_1_UP.pickle
-include ml_files\CL_output_cl_buc_predictor_In-plane_support_cl_2,_3_UP.pickle
-include ml_files\CL_output_cl_buc_scaler_In-plane_support_cl_2,_3_UP.pickle
-include ml_files\CL_output_cl_ult_predictor_In-plane_support_cl_2,_3_UP.pickle
-include ml_files\CL_output_cl_ult_scaler_In-plane_support_cl_2,_3_UP.pickle
-include ml_files\CL_CSR-Tank_req_cl_predictor.pickle
-include ml_files\CL_CSR-Tank_req_cl_UP_scaler.pickle
-include ml_files\CL_CSR_plate_cl,_CSR_web_cl,_CSR_web_flange_cl,_CSR_flange_cl_predictor.pickle
-include ml_files\CL_CSR_plate_cl,_CSR_web_cl,_CSR_web_flange_cl,_CSR_flange_cl_SP_scaler.pickle
+include any_files\images\img_fixation_parameters.gif
+include any_files\images\img_generate_report.gif
+include any_files\images\img_int_pressure_button.gif
+include any_files\images\img_int_pressure_button_search.gif
+include any_files\images\img_multi_opt.gif
+include any_files\images\img_optimize.gif
+include any_files\images\img_plate_and_stiffener.gif
+include any_files\images\img_stf_button.gif
+include any_files\images\img_stiffener.gif
+include any_files\images\img_stress_button.gif
+include any_files\images\img_T_L_FB.gif
+include any_files\images\img_title.gif
+include any_files\images\img_transverse_stress.gif
+include any_files\images\ANYstructure_logo.jpg
+include any_files\images\current_comps_NONE.png
+include any_files\images\Buckling_Strength_of_Shells.png
+include any_files\images\Panel_geometry_definitions.png
+include any_files\ship_section_example.txt
+include any_files\ANYstructure_documentation.pdf
+include any_files\sections.csv
+include any_files\bulb_anglebar_tbar_flatbar.csv
+include any_files\ml_files\CL_output_cl_buc_predictor_In-plane_support_cl_1_SP.pickle
+include any_files\ml_files\CL_output_cl_buc_scaler_In-plane_support_cl_1_SP.pickle
+include any_files\ml_files\CL_output_cl_ult_predictor_In-plane_support_cl_1_SP.pickle
+include any_files\ml_files\CL_output_cl_ult_scaler_In-plane_support_cl_1_SP.pickle
+include any_files\ml_files\CL_output_cl_buc_predictor_In-plane_support_cl_2,_3_SP.pickle
+include any_files\ml_files\CL_output_cl_buc_scaler_In-plane_support_cl_2,_3_SP.pickle
+include any_files\ml_files\CL_output_cl_ult_predictor_In-plane_support_cl_2,_3_SP.pickle
+include any_files\ml_files\CL_output_cl_ult_scaler_In-plane_support_cl_2,_3_SP.pickle
+include any_files\ml_files\CL_output_cl_buc_predictor_In-plane_support_cl_1_UP.pickle
+include any_files\ml_files\CL_output_cl_buc_scaler_In-plane_support_cl_1_UP.pickle
+include any_files\ml_files\CL_output_cl_ult_predictor_In-plane_support_cl_1_UP.pickle
+include any_files\ml_files\CL_output_cl_ult_scaler_In-plane_support_cl_1_UP.pickle
+include any_files\ml_files\CL_output_cl_buc_predictor_In-plane_support_cl_2,_3_UP.pickle
+include any_files\ml_files\CL_output_cl_buc_scaler_In-plane_support_cl_2,_3_UP.pickle
+include any_files\ml_files\CL_output_cl_ult_predictor_In-plane_support_cl_2,_3_UP.pickle
+include any_files\ml_files\CL_output_cl_ult_scaler_In-plane_support_cl_2,_3_UP.pickle
+include any_files\ml_files\CL_CSR-Tank_req_cl_predictor.pickle
+include any_files\ml_files\CL_CSR-Tank_req_cl_UP_scaler.pickle
+include any_files\ml_files\CL_CSR_plate_cl,_CSR_web_cl,_CSR_web_flange_cl,_CSR_flange_cl_predictor.pickle
+include any_files\ml_files\CL_CSR_plate_cl,_CSR_web_cl,_CSR_web_flange_cl,_CSR_flange_cl_SP_scaler.pickle
 
 
diff --git a/README.md b/README.md
@@ -2,10 +2,11 @@
 ANYstructure is the ultimate steel structure design tool for plate fields and cylinders! 
 Weight optimization for all structures with machine learning capabilities. 
 Calculations are based on DNV standards and rules
-### What's new in 4.6 ###
+### What's new in 4.7 ###
 * Corrected error on girder caluculation for cylinder buckling.
 * Added 1.10 load factor option for cylinder buckling.
-* Better compability with linux
+* Better compability with linux.
+* Python 3.11 based.
 ### What's new in 4.4 ###
 * Backup and restore feature added.
 ### What's new in 4.3 ###

diff --git a/__main__.py b/__main__.py
@@ -1,9 +1,6 @@
 import sys, multiprocessing, ctypes
 import tkinter as tk
-try:
-    from main_application import Application
-except ModuleNotFoundError:
-    from ANYstructure.main_application import Application
+from any_files.main_application import Application
 
 def main(args=None):
     """The main routine."""
@@ -23,4 +20,4 @@ def main(args=None):
     # you want your project to do.
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/ANYstructure_documentation.pdf → any_files/ANYstructure_documentation.pdf b/ANYstructure_documentation.pdf → any_files/ANYstructure_documentation.pdf
diff --git a/SN_curve_parameters.py → any_files/SN_curve_parameters.py b/SN_curve_parameters.py → any_files/SN_curve_parameters.py
diff --git a/images/__init__.py → any_files/__init__.py b/images/__init__.py → any_files/__init__.py
diff --git a/any_files/__main__.py b/any_files/__main__.py
@@ -0,0 +1,24 @@
+import sys, multiprocessing, ctypes, os
+import tkinter as tk
+from any_files.main_application import Application
+
+def main(args=None):
+    """The main routine."""
+
+    if args is None:
+        args = sys.argv[1:]
+
+    multiprocessing.freeze_support()
+    errorCode = ctypes.windll.shcore.SetProcessDpiAwareness(2)
+    root = tk.Tk()
+    width = root.winfo_screenwidth()
+    height = root.winfo_screenheight()
+    root.geometry(f'{width}x{height}')
+    my_app = Application(root)
+    root.mainloop()
+
+    # Do argument parsing here (eg. with argparse) and anything else
+    # you want your project to do.
+
+if __name__ == "__main__":
+    main()
diff --git a/bulb_anglebar_tbar_flatbar.csv → any_files/bulb_anglebar_tbar_flatbar.csv b/bulb_anglebar_tbar_flatbar.csv → any_files/bulb_anglebar_tbar_flatbar.csv
diff --git a/calc_loads.py → any_files/calc_loads.py b/calc_loads.py → any_files/calc_loads.py
diff --git a/calc_structure.py → any_files/calc_structure.py b/calc_structure.py → any_files/calc_structure.py
@@ -7,11 +7,11 @@
 from scipy.optimize import minimize
 
 try:
-    import helper as hlp
-    import SN_curve_parameters as snc
+    import any_files.helper as hlp
+    import any_files.SN_curve_parameters as snc
 except ModuleNotFoundError:
-    import ANYstructure.helper as hlp
-    import ANYstructure.SN_curve_parameters as snc
+    import ANYstructure.any_files.helper as hlp
+    import ANYstructure.any_files.SN_curve_parameters as snc
 
 
 class Structure():

diff --git a/compartment_window.py → any_files/compartment_window.py b/compartment_window.py → any_files/compartment_window.py
@@ -5,9 +5,9 @@
 from matplotlib import pyplot as plt
 from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg
 try:
-    import test
+    import any_files.test
 except ModuleNotFoundError:
-    import ANYstructure.test
+    import ANYstructure.any_files.test
 import numpy as np
 
 class CreateCompartmentWindow():

diff --git a/example_data.py → any_files/example_data.py b/example_data.py → any_files/example_data.py
@@ -1,14 +1,13 @@
 # This scripts provide dtat to be used for testing the code
 
-
 try:
-    import calc_loads as load
-    import calc_structure as calc_structure
-    import make_grid_numpy as grid
+    import any_files.calc_loads as load
+    import any_files.calc_structure as calc_structure
+    import any_files.make_grid_numpy as grid
 except ModuleNotFoundError:
-    import ANYstructure.calc_loads as load
-    import ANYstructure.calc_structure as calc_structure
-    import ANYstructure.make_grid_numpy as grid
+    import ANYstructure.any_files.calc_loads as load
+    import ANYstructure.any_files.calc_structure as calc_structure
+    import ANYstructure.any_files.make_grid_numpy as grid
 
 import random
 
@@ -375,7 +374,7 @@ def get_line_to_struc(geo = False):
         Stiffener = get_structure_object(line)
         Girder = None  # CalcScantlings(ex.obj_dict_heavy)
         initial_calc_obj = calc_structure.AllStructure(Plate=Plate, Stiffener=Stiffener, Girder=Girder,
-                                              main_dict=prescriptive_main_dict)
+                                                       main_dict=prescriptive_main_dict)
         to_return[line]=[initial_calc_obj, None, None, [None], {}]
     return to_return
 

diff --git a/example_data_puls.py → any_files/example_data_puls.py b/example_data_puls.py → any_files/example_data_puls.py
diff --git a/excel_inteface.py → any_files/excel_inteface.py b/excel_inteface.py → any_files/excel_inteface.py
diff --git a/fatigue_window.py → any_files/fatigue_window.py b/fatigue_window.py → any_files/fatigue_window.py
@@ -2,11 +2,11 @@
 import tkinter as tk
 
 try:
-    import example_data as test
-    import SN_curve_parameters as sn
+    import any_files.example_data as test
+    import any_files.SN_curve_parameters as sn
 except ModuleNotFoundError:
-    import ANYstructure.example_data as test
-    import ANYstructure.SN_curve_parameters as sn
+    import ANYstructure.any_files.example_data as test
+    import ANYstructure.any_files.SN_curve_parameters as sn
 
 
 class CreateFatigueWindow():

diff --git a/grid_window.py → any_files/grid_window.py b/grid_window.py → any_files/grid_window.py
@@ -6,10 +6,11 @@
 import copy
 import matplotlib.animation as animation
 
+
 try:
-    import example_data as test
+    import any_files.example_data as test
 except ModuleNotFoundError:
-    import ANYstructure.example_data as test
+    import ANYstructure.any_files.example_data as test
 
 
 def dist(p, q):

diff --git a/helper.py → any_files/helper.py b/helper.py → any_files/helper.py
diff --git a/images/ANYstructure screenshot.png → any_files/images/ANYstructure screenshot.png b/images/ANYstructure screenshot.png → any_files/images/ANYstructure screenshot.png
diff --git a/images/ANYstructure_logo.jpg → any_files/images/ANYstructure_logo.jpg b/images/ANYstructure_logo.jpg → any_files/images/ANYstructure_logo.jpg
diff --git a/images/Buckling_Strength_of_Shells.png → ...es/images/Buckling_Strength_of_Shells.png b/images/Buckling_Strength_of_Shells.png → ...es/images/Buckling_Strength_of_Shells.png
diff --git a/images/Cylinder-Load_distribution.png → ...les/images/Cylinder-Load_distribution.png b/images/Cylinder-Load_distribution.png → ...les/images/Cylinder-Load_distribution.png
diff --git a/images/Definition_of_parameters_L_and_LH.png → ...ges/Definition_of_parameters_L_and_LH.png b/images/Definition_of_parameters_L_and_LH.png → ...ges/Definition_of_parameters_L_and_LH.png
diff --git a/images/Panel_geometry_definitions.png → ...les/images/Panel_geometry_definitions.png b/images/Panel_geometry_definitions.png → ...les/images/Panel_geometry_definitions.png
diff --git a/any_files/images/__init__.py b/any_files/images/__init__.py
diff --git a/images/current_comps_NONE.png → any_files/images/current_comps_NONE.png b/images/current_comps_NONE.png → any_files/images/current_comps_NONE.png
diff --git a/images/cylinder_opt.png → any_files/images/cylinder_opt.png b/images/cylinder_opt.png → any_files/images/cylinder_opt.png
diff --git a/images/fls_button.gif → any_files/images/fls_button.gif b/images/fls_button.gif → any_files/images/fls_button.gif
diff --git a/images/img_T_L_FB.gif → any_files/images/img_T_L_FB.gif b/images/img_T_L_FB.gif → any_files/images/img_T_L_FB.gif
diff --git a/images/img_axial_stresses.gif → any_files/images/img_axial_stresses.gif b/images/img_axial_stresses.gif → any_files/images/img_axial_stresses.gif
diff --git a/images/img_dnv_load_combinations.gif → ...iles/images/img_dnv_load_combinations.gif b/images/img_dnv_load_combinations.gif → ...iles/images/img_dnv_load_combinations.gif
diff --git a/images/img_ext_pressure_button.gif → any_files/images/img_ext_pressure_button.gif b/images/img_ext_pressure_button.gif → any_files/images/img_ext_pressure_button.gif
diff --git a/images/img_ext_pressure_button_def.gif → ...es/images/img_ext_pressure_button_def.gif b/images/img_ext_pressure_button_def.gif → ...es/images/img_ext_pressure_button_def.gif
diff --git a/images/img_fixation_parameters.gif → any_files/images/img_fixation_parameters.gif b/images/img_fixation_parameters.gif → any_files/images/img_fixation_parameters.gif
diff --git a/images/img_generate_report.gif → any_files/images/img_generate_report.gif b/images/img_generate_report.gif → any_files/images/img_generate_report.gif
diff --git a/images/img_int_pressure_button.gif → any_files/images/img_int_pressure_button.gif b/images/img_int_pressure_button.gif → any_files/images/img_int_pressure_button.gif
diff --git a/images/img_int_pressure_button_search.gif → ...images/img_int_pressure_button_search.gif b/images/img_int_pressure_button_search.gif → ...images/img_int_pressure_button_search.gif
diff --git a/images/img_multi_opt.gif → any_files/images/img_multi_opt.gif b/images/img_multi_opt.gif → any_files/images/img_multi_opt.gif
diff --git a/images/img_optimize.gif → any_files/images/img_optimize.gif b/images/img_optimize.gif → any_files/images/img_optimize.gif
diff --git a/images/img_plate_and_stiffener.gif → any_files/images/img_plate_and_stiffener.gif b/images/img_plate_and_stiffener.gif → any_files/images/img_plate_and_stiffener.gif
diff --git a/images/img_stf_button.gif → any_files/images/img_stf_button.gif b/images/img_stf_button.gif → any_files/images/img_stf_button.gif
diff --git a/images/img_stiffened_plate_panel.gif → ...iles/images/img_stiffened_plate_panel.gif b/images/img_stiffened_plate_panel.gif → ...iles/images/img_stiffened_plate_panel.gif
diff --git a/images/img_stiffener.gif → any_files/images/img_stiffener.gif b/images/img_stiffener.gif → any_files/images/img_stiffener.gif
diff --git a/images/img_stress_button.gif → any_files/images/img_stress_button.gif b/images/img_stress_button.gif → any_files/images/img_stress_button.gif
diff --git a/images/img_title.gif → any_files/images/img_title.gif b/images/img_title.gif → any_files/images/img_title.gif
diff --git a/images/img_transverse_stress.gif → any_files/images/img_transverse_stress.gif b/images/img_transverse_stress.gif → any_files/images/img_transverse_stress.gif
diff --git a/load_factor_window.py → any_files/load_factor_window.py b/load_factor_window.py → any_files/load_factor_window.py
diff --git a/load_window.py → any_files/load_window.py b/load_window.py → any_files/load_window.py
@@ -1,12 +1,15 @@
-
-try:
-    import example_data as test
-    from calc_loads import *
-    from helper import *
-except ModuleNotFoundError:
-    import ANYstructure.example_data as test
-    from ANYstructure.calc_loads import *
-    from ANYstructure.helper import *
+import any_files.example_data as test
+from any_files.calc_loads import *
+from any_files.helper import *
+
+# try:
+#     import any_files.example_data as test
+#     from any_files.calc_loads import *
+#     from any_files.helper import *
+# except ModuleNotFoundError:
+#     import ANYstructure.any_files.example_data as test
+#     from ANYstructure.any_files.calc_loads import *
+#     from ANYstructure.any_files.helper import *
 
 import tkinter as tk
 from tkinter import messagebox