implemented save cad file functionality

1 files changed, 29 insertions, 6 deletions

diff --git a/Connections/Shear/Finplate/finplate_calc1.py b/Connections/Shear/Finplate/finplate_calc1.py
index 24d152d..5f934c8 100644
--- a/Connections/Shear/Finplate/finplate_calc1.py
+++ b/Connections/Shear/Finplate/finplate_calc1.py
@@ -152,9 +152,10 @@ def finConn(uiObj):
             web_plate_l = max_plate_height ; 
               
         elif min_plate_height > max_plate_height:
-            logger.error(": Height of plate is more than the clear depth of the beam")
+            logger.error(": Minimum required plate height is more than the clear depth of the beam")
+            logger.warning(": Minimum plate height required is %2.2f mm " % (min_plate_height))
             logger.warning(": Maximum plate height allowed is %2.2f mm " % (max_plate_height))
-            
+            logger.info(": Increase the plate thickness")
             #print "Error: Height of plate is more than the clear depth of the beam"
             #print" Maximum plate height allowed is " + str(max_plate_height) + " mm"
             web_plate_l = max_plate_height;
@@ -276,7 +277,7 @@ def finConn(uiObj):
         else:
             logger.error(": Bolt strength is insufficient to carry the shear force")
             logger.warning (": Increase bolt diameter and/or bolt grade")
-        
+            moment_demand=0.0
     ####################################################################################
     # Design of plate:
     
@@ -404,9 +405,11 @@ def finConn(uiObj):
     outputObj['Plate']['momentcapacity'] = moment_capacity
     outputObj['Plate']['height'] = web_plate_l
     outputObj['Plate']['width'] = web_plate_w
+    
+    
     #return outputObj
     
-    if web_plate_l == min_plate_height+10 or web_plate_l == (max_plate_height-10)//10*10:
+    if web_plate_l == (min_plate_height+10) or web_plate_l == ((max_plate_height-10)//10*10):
         if bolt_line==2:
             if pitch < min_pitch:
                 for k in outputObj.keys():
@@ -414,6 +417,22 @@ def finConn(uiObj):
                         outputObj[k][key] = ""
         else:
             return outputObj
+        
+    elif web_plate_l == (min_plate_height+10) or web_plate_l == ((max_plate_height-10)//10*10):
+        if web_plate_l == min_plate_height or web_plate_l == max_plate_height or web_plate_l < web_plate_l_req or web_plate_w < web_plate_w_req:
+            for k in outputObj.keys():
+                for key in outputObj[k].keys():
+                    outputObj[k][key] = ""
+        elif moment_capacity < moment_demand:
+            for k in outputObj.keys():
+                for key in outputObj[k].keys():
+                    outputObj[k][key] = ""
+        elif bolt_line==2:
+            if pitch < min_pitch:
+                for k in outputObj.keys():
+                    for key in outputObj[k].keys():
+                        outputObj[k][key] = ""
+    
     else:
         if web_plate_l == min_plate_height or web_plate_l == max_plate_height or web_plate_l < web_plate_l_req or web_plate_w < web_plate_w_req:
             for k in outputObj.keys():
@@ -428,14 +447,18 @@ def finConn(uiObj):
                 for k in outputObj.keys():
                     for key in outputObj[k].keys():
                         outputObj[k][key] = ""
-                
+                        
 # if web_plate_l == min_plate_height or web_plate_l == max_plate_height or web_plate_l < web_plate_l_req or web_plate_w < web_plate_w_req:
 #     outputObj = {}
 #     
 # elif moment_capacity < moment_demand:
 #     outputObj = {}
+    if  outputObj['Bolt']['status'] == True:
         
-  
+        logger.info(": Overall finplate connection design is safe")
+    else:
+        logger.error(": Design is not safe")
+    
     return outputObj