Prechádzať zdrojové kódy

Refactor section property calculations to include thickness adjustments in point generation

dacowars 2 týždňov pred
rodič
commit
413bab04ff
1 zmenil súbory, kde vykonal 25 pridanie a 32 odobranie
  1. 25 32
      Sweep_SAP2000/main.py

+ 25 - 32
Sweep_SAP2000/main.py

@@ -572,29 +572,24 @@ class SAPSectionDesignerGUI:
         h_alma = H - 2*tf
         x_alma_ini = (b - .3) / 2
         x_alma_fin = (b + .3) / 2
-        x = (0.169 - tf) * e_ref / (b - x_alma_fin) + tf
 
         points = np.array([
             [0, 0],
             [b, 0],
-            [b, L_ref],
-            [b - e_ref, L_ref],
-            [b - e_ref, x],
+            [b, L_ref + tf],
+            [b - e_ref, L_ref + tf],
             [x_alma_fin, 0.169],
             [x_alma_fin, H - .169],
-            [b - e_ref, H - x],
-            [b - e_ref, H - L_ref],
-            [b, H - L_ref],
+            [b - e_ref, H - L_ref - tf],
+            [b, H - L_ref - tf],
             [b, H],
             [0, H],
-            [0, H - L_ref],
-            [e_ref, H - L_ref],
-            [e_ref, H - x],
+            [0, H - L_ref - tf],
+            [e_ref, H - L_ref - tf],
             [x_alma_ini, H - 0.169],
             [x_alma_ini, 0.169],
-            [e_ref, x],
-            [e_ref, L_ref],
-            [0, L_ref],
+            [e_ref, L_ref + tf],
+            [0, L_ref + tf],
         ])
 
         return points
@@ -628,16 +623,16 @@ class SAPSectionDesignerGUI:
         points = np.array([
             [0, 0],
             [b, 0],
-            [b, L_ref],
-            [b - e_ref, L_ref],
+            [b, L_ref + tf],
+            [b - e_ref, L_ref + tf],
             [b - e_ref, tf],
             [x_alma_fin, tf],
             [x_alma_fin, H -.36 - .169],
             [x_alma_ini, H - .36 - .169],
             [x_alma_ini, tf],
             [e_ref, tf],
-            [e_ref, L_ref],
-            [0, L_ref],
+            [e_ref, L_ref + tf],
+            [0, L_ref + tf],
         ])
 
         return points
@@ -671,12 +666,12 @@ class SAPSectionDesignerGUI:
             [x_alma_fin, H - .169],
             [x_alma_fin, H - tf],
             [b - e_ref, H - tf],
-            [b - e_ref, H - L_ref],
-            [b, H - L_ref],
+            [b - e_ref, H - L_ref - tf],
+            [b, H - L_ref - tf],
             [b, H],
             [0, H],
-            [0, H - L_ref],
-            [e_ref, H - L_ref],
+            [0, H - L_ref - tf],
+            [e_ref, H - L_ref - tf],
             [e_ref, H - tf],
             [x_alma_ini, H - tf],
             [x_alma_ini, H - .169],
@@ -716,24 +711,24 @@ class SAPSectionDesignerGUI:
         points = np.array([
             [0, 0],
             [b, 0],
-            [b, L_ref],
-            [b - e_ref, L_ref],
+            [b, L_ref + tf],
+            [b - e_ref, L_ref + tf],
             [b - e_ref, tf],
             [x_alma_fin, tf],
             [x_alma_fin, H - tf],
             [b - e_ref, H - tf],
-            [b - e_ref, H - L_ref],
-            [b, H - L_ref],
+            [b - e_ref, H - L_ref - tf],
+            [b, H - L_ref - tf],
             [b, H],
             [0, H],
-            [0, H - L_ref],
-            [e_ref, H - L_ref],
+            [0, H - L_ref - tf],
+            [e_ref, H - L_ref - tf],
             [e_ref, H - tf],
             [x_alma_ini, H - tf],
             [x_alma_ini, tf],
             [e_ref, tf],
-            [e_ref, L_ref],
-            [0, L_ref],
+            [e_ref, L_ref + tf],
+            [0, L_ref + tf],
         ])
 
         return points
@@ -762,9 +757,7 @@ class SAPSectionDesignerGUI:
 
             if e_ref > 0.3:
                 return False
-            if L_ref > 0.169:
-                return False
-            if L_ref < tf:
+            if L_ref + tf > 0.169:
                 return False
         
         return True