midas-civil 1.0.8__tar.gz → 1.0.9__tar.gz

{midas_civil-1.0.8 → midas_civil-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midas_civil
-Version: 1.0.8
+Version: 1.0.9
 Summary: Python library for MIDAS Civil NX
 Home-page: https://github.com/MIDASIT-Co-Ltd/midas-civil-python
 Author: Sumit Shekhar

midas_civil-1.0.9/midas_civil/__init__.py

@@ -0,0 +1,48 @@
+import requests
+from colorama import Fore,Style
+from ._mapi import *
+_version_ = "1.0.9"
+
+
+print('\n╭────────────────────────────────────────────────────────────────────────────────────╮')
+print(Style.BRIGHT+f'│                      MIDAS CIVIL-NX PYTHON LIBRARY v{_version_}  🐍                      │')
+print('╰────────────────────────────────────────────────────────────────────────────────────╯\n'+Style.RESET_ALL)
+
+if NX.version_check:
+    resp =  requests.get("https://pypi.org/pypi/midas_civil/json").json()
+    latest_ver =  resp["info"]["version"]
+    if _version_ != latest_ver:        
+        print(Fore.YELLOW +'╭─ ⚠️   ──────────────────────────────────────────────────────────────────────────────╮')
+        print(f"│    Warning: You are using v{_version_}, but the latest available version is v{latest_ver}.      │")
+        print(f"│    Run 'pip install midas_civil --upgrade' to update.                              │")
+        print('╰────────────────────────────────────────────────────────────────────────────────────╯\n'+Style.RESET_ALL)
+
+
+from ._model import *
+from ._boundary import *
+from ._utils import *
+from ._node import *
+from ._element import *
+from ._load import *
+from ._group import *
+from ._result import *
+
+#--- TESTING IMPORTS ---
+from ._material import *
+
+# from ._section import *
+from ._section import *
+
+from ._result_extract import *
+from ._construction import *
+from ._thickness import *
+from ._temperature import *
+
+from ._tendon import *
+from ._view import *
+
+from ._movingload import *
+from ._settlement import *
+from ._analysiscontrol import *
+from ._BoundaryChangeAssignment import*
+

{midas_civil-1.0.8 → midas_civil-1.0.9}/midas_civil/_element.py

@@ -8,7 +8,7 @@ from math import hypot
 import math
 
 
-def _interpolateAlignment(pointsArray,n_seg=10,deg=1,mSize=0,includePoint:bool=True,yEcc=0,zEcc=0) -> list:
+def _interpolateAlignment(pointsArray,n_seg=10,deg=1,mSize=0,includePoint:bool=True) -> list:
     ''' Returns point list and beta angle list'''
     pointsArray = np.array(pointsArray)
     x_p, y_p , z_p  = pointsArray[:,0] , pointsArray[:,1] , pointsArray[:,2]
@@ -110,7 +110,7 @@ def _triangleAREA(a:Node,b:Node,c:Node):
     mag = np.linalg.norm(np.cross(v1, v2))
     return float(0.5 * mag) , np.cross(v1, v2)/mag
 
-def _calcVector(deltaLocation):
+def _calcVector(deltaLocation,angle=0): # Returns normalised local X,Y,Z for line
     Z_new = np.array([0.000001,0,1])
     X_new = np.array(deltaLocation)
     Y_new = np.cross(Z_new, X_new)
@@ -121,22 +121,45 @@ def _calcVector(deltaLocation):
     Y_new = Y_new / (np.linalg.norm(Y_new)+0.000001)
     Z_new = Z_new / (np.linalg.norm(Z_new)+0.000001)
 
-    return [X_new,Y_new,Z_new]
+    from scipy.spatial.transform import Rotation as R
+    p_y = np.array(Y_new)
+    p_z = np.array(Z_new)
+
+    axis = np.array(X_new)
+    theta = np.deg2rad(angle)               # or radians directly
+    rot = R.from_rotvec(axis * theta)           # axis-angle as rotation vector
+    
+    rt_y = rot.apply(p_y)                         # rotated point around axis through origin
+    rt_z = rot.apply(p_z)  
+    
+    return [X_new,rt_y,rt_z]
+
+def _rotatePT(pt,axis,deg):
+    from scipy.spatial.transform import Rotation as R
+    p = np.array(pt)
+    axis = np.array(axis)
+    theta = np.deg2rad(deg)               # or radians directly
+    rot = R.from_rotvec(axis * theta)           # axis-angle as rotation vector
+    return rot.apply(p)                         # rotated point around axis through origin
+
+def _pointOffset(pts,yEcc=0,zEcc=0,angle=0):
+    from ._utils import _matchArray
+
+    angle2 = _matchArray(pts,angle)
 
-def _pointOffset(pts,yEcc,zEcc):
     norm = []
-    norm.append(_calcVector(np.subtract(pts[1],pts[0])))
+    norm.append(_calcVector(np.subtract(pts[1],pts[0]),angle2[0]))    # first X- along vector
 
-    for i in range(len(pts)-2):
+    for i in range(len(pts)-2): # Averaged X- along vector for middle points
         X_new1 = np.array(np.subtract(pts[i+1],pts[i]))
         X_new2 = np.array(np.subtract(pts[i+2],pts[i+1]))
 
         X_new1 = X_new1 / (np.linalg.norm(X_new1)+0.000001)
         X_new2 = X_new2 / (np.linalg.norm(X_new2)+0.000001)
 
-        norm.append(_calcVector(np.add(X_new1,X_new2)))
+        norm.append(_calcVector(np.add(X_new1,X_new2),angle2[i+1]))
 
-    norm.append(_calcVector(np.subtract(pts[-1],pts[-2])))
+    norm.append(_calcVector(np.subtract(pts[-1],pts[-2]),angle2[-1])) # last X- along vector
 
     # print(norm)
 
@@ -440,6 +463,10 @@ class Element:
                     i_loc = points_loc
                 else:
                     i_loc = _interpolateAlignment(points_loc,n_div,deg,0,includePoint)
+
+                from ._utils import _matchArray
+                angle = _matchArray(i_loc,angle)
+
                 for i in i_loc:
                     Enode=Node(i[0],i[1],i[2])
                     beam_nodes.append(Enode.ID)
@@ -447,29 +474,36 @@ class Element:
                 for i in range(len(i_loc)-1):
                     if id == 0 : id_new = 0
                     else: id_new = id+i
-                    beam_obj.append(Element.Beam(beam_nodes[i],beam_nodes[i+1],mat,sect,angle,group,id_new,bLocalAxis))
+                    beam_obj.append(Element.Beam(beam_nodes[i],beam_nodes[i+1],mat,sect,angle[i],group,id_new,bLocalAxis))
                 
                 return beam_obj
         
         @staticmethod
         def PLine2(points_loc:list,n_div:int=0,deg:int=1,includePoint:bool=True,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0,bLocalAxis=False,yEcc=0,zEcc=0):
-
+                
+                
                 beam_nodes =[]
                 beam_obj = []
                 if n_div == 0 :
                     i_loc = points_loc
                 else:
-                    i_loc = _interpolateAlignment(points_loc,n_div,deg,0,includePoint,yEcc,zEcc)
+                    i_loc = _interpolateAlignment(points_loc,n_div,deg,0,includePoint)
+                
+                from ._utils import _matchArray
+                angle = _matchArray(i_loc,angle)
 
-                i_loc2 = _pointOffset(i_loc,yEcc,zEcc)
+                i_loc2 = _pointOffset(i_loc,yEcc,zEcc,angle)
                 for i in i_loc2:
                     Enode=Node(i[0],i[1],i[2])
                     beam_nodes.append(Enode.ID)
+
+                
                 
+
                 for i in range(len(i_loc2)-1):
                     if id == 0 : id_new = 0
                     else: id_new = id+i
-                    beam_obj.append(Element.Beam(beam_nodes[i],beam_nodes[i+1],mat,sect,angle,group,id_new,bLocalAxis))
+                    beam_obj.append(Element.Beam(beam_nodes[i],beam_nodes[i+1],mat,sect,angle[i],group,id_new,bLocalAxis))
                 
                 return beam_obj
 

{midas_civil-1.0.8 → midas_civil-1.0.9}/midas_civil/_mapi.py

@@ -1,5 +1,6 @@
 import requests
 import sys
+from colorama import Fore, Style
 try:import winreg
 except: pass
 
@@ -8,10 +9,9 @@ except: pass
 
 def Midas_help():
     """MIDAS Documnetation : https://midas-rnd.github.io/midasapi-python """
-    print("---"*22)
-    print("|   HELP MANUAL : https://midas-rnd.github.io/midasapi-python/   |")
-    print("---"*22,"\n")
-
+    print('\n╭────────────────────────────────────────────────────────────────────────────────────╮')
+    print("│         HELP MANUAL   :     https://midas-rnd.github.io/midasapi-python/           │")
+    print('╰────────────────────────────────────────────────────────────────────────────────────╯\n')
 
 
 
@@ -94,7 +94,6 @@ class MAPI_KEY:
                 my_key = value[0]
                 MAPI_KEY(my_key)
                 print(f' 🔑   MAPI-KEY is taken from Registry entry.  >>  {my_key[:35]}...')
-                print("-"*85)
             except:
                 print(f"🔑   MAPI KEY is not defined. Click on Apps > API Settings to copy the MAPI Key.\n Define it using MAPI_KEY('xxxx')")
                 sys.exit(0)
@@ -134,16 +133,21 @@ def MidasAPI(method:str, command:str, body:dict={})->dict:
     elif method == "DELETE":
         response = requests.delete(url=url, headers=headers)
 
-    if response.status_code == 404: 
-        print(f"⚠️  Civil NX model is not connected.  Click on 'Apps> Connect' in Civil NX. \nMake sure the MAPI Key in python code is matching with the MAPI key in Civil NX.\n\n")
-        sys.exit(0)
-
     if NX.debug_print:
         print(method, command, response.status_code , "✅")
 
+
+
     if MAPI_KEY.count == 1:
+        MAPI_KEY.count = 0
+        if response.status_code == 404:
+            print(Fore.RED +'\n╭─ 💀   ─────────────────────────────────────────────────────────────────────────────╮')
+            print(f"│  Civil NX model is not connected.  Click on 'Apps > Connect' in Civil NX.          │")
+            print(f"│  Make sure the MAPI Key in python code is matching with the MAPI key in Civil NX.  │")
+            print('╰────────────────────────────────────────────────────────────────────────────────────╯\n'+Style.RESET_ALL)
+            sys.exit(0)
+
         if NX.user_print:
-            MAPI_KEY.count = 0
             _checkUSER()
     
 
@@ -168,8 +172,25 @@ def _setUNIT(unitJS):
 def _checkUSER():
     try:
         resp =  MidasAPI('GET','/config/ver',{})['VER']
-        print(f"Connected to {resp['NAME']}   🟢")
-        print(f"USER : {resp['USER']}    |   COMPANY : {resp['COMPANY']}")
-        print("-"*85)
+
+        # print(f"{' '*15}Connected to {resp['NAME']}")
+        # print(f"{' '*15}USER : {resp['USER']}          COMPANY : {resp['COMPANY']}")
+
+        ln1 = f"Connected to {resp['NAME']}"
+        ln2 = f"USER : {resp['USER']}          COMPANY : {resp['COMPANY']}"
+
+        lg_ln1 = 63-len(ln1)
+        lg_ln2 = 67-len(ln2)
+
+        line1 = f"│{' '*15} {ln1} {' '*lg_ln1} 🟢 │"
+        line2 = f"│{' '*15} {ln2} {' '*lg_ln2}│"
+        print(Fore.GREEN+'\n╭─ 🔔  ──────────────────────────────────────────────────────────────────────────────╮')
+        print(line1)
+        print(line2)
+        print('╰────────────────────────────────────────────────────────────────────────────────────╯\n'+Style.RESET_ALL)
+
+
+        # print('─'*86)
+
     except:
-        print("")
+        pass

{midas_civil-1.0.8 → midas_civil-1.0.9}/midas_civil/_tendon.py

@@ -761,7 +761,7 @@ class Tendon:
                             array_temp.append({
                                     'PT' : [self.P_XYZ[j].X,self.P_XYZ[j].Y,self.P_XYZ[j].Z],
                                     'bFIX' : self.bFIX[j],
-                                    'R' : self.RADIUS[j]
+                                    'RADIUS' : self.RADIUS[j]
                             })
                     else:
                         for j in range(len(self.P_XYZ)):
@@ -772,6 +772,8 @@ class Tendon:
                             })
                     
                     
+                    
+                    
                     # --- 3D Main ----
 
                     json_prof = {

{midas_civil-1.0.8 → midas_civil-1.0.9}/midas_civil/_utils.py

@@ -86,4 +86,12 @@ def zz_add_to_dict(dictionary, key, value):
 def _convItem2List(item):
     if isinstance(item,list):
         return item
-    return [item]
+    return [item]
+
+def _matchArray(A,B):
+    A = _convItem2List(A)
+    B = _convItem2List(B)
+    n = len(A)
+    if len(B) >= n:
+        return B[:n]
+    return B + [B[-1]] * (n - len(B))

{midas_civil-1.0.8 → midas_civil-1.0.9}/midas_civil.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midas_civil
-Version: 1.0.8
+Version: 1.0.9
 Summary: Python library for MIDAS Civil NX
 Home-page: https://github.com/MIDASIT-Co-Ltd/midas-civil-python
 Author: Sumit Shekhar

{midas_civil-1.0.8 → midas_civil-1.0.9}/setup.py

@@ -5,7 +5,7 @@ with open('README.md','r') as f:
 
 
 setup(name='midas_civil',
-    version='1.0.8',
+    version='1.0.9',
     description='Python library for MIDAS Civil NX',
     author='Sumit Shekhar',
     author_email='sumit.midasit@gmail.com',

midas_civil-1.0.8/midas_civil/__init__.py

@@ -1,49 +0,0 @@
-import requests
-from ._mapi import *
-_version_ = "1.0.8"
-
-
-print('')
-print('*'*20,'  MIDAS CIVIL-NX PYTHON LIBRARY v',_version_,' 🐍 ','*'*20)
-print('')
-
-if NX.version_check:
-    resp =  requests.get("https://pypi.org/pypi/midas_civil/json").json()
-    latest_ver =  resp["info"]["version"]
-    if _version_ != latest_ver:
-        print(
-                f"⚠️  Warning: You are using v{_version_}, "
-                f"but the latest available version is v{latest_ver}.\n"
-                f" Run 'pip install midas_civil --upgrade' to update."
-            )
-        print("-"*85)
-
-
-from ._model import *
-from ._boundary import *
-from ._utils import *
-from ._node import *
-from ._element import *
-from ._load import *
-from ._group import *
-from ._result import *
-
-#--- TESTING IMPORTS ---
-from ._material import *
-
-# from ._section import *
-from ._section import *
-
-from ._result_extract import *
-from ._construction import *
-from ._thickness import *
-from ._temperature import *
-
-from ._tendon import *
-from ._view import *
-
-from ._movingload import *
-from ._settlement import *
-from ._analysiscontrol import *
-from ._BoundaryChangeAssignment import*
-