midas-civil 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

midas_civil/__init__.py

@@ -1,3 +1,21 @@
+import requests
+_version_ = "1.0.3"
+
+
+print('')
+print('*'*20,'  MIDAS CIVIL-NX PYTHON LIBRARY v',_version_,' 🐍 ','*'*20)
+print('')
+
+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 ._mapi import *
 from ._model import *
 from ._boundary import *
@@ -23,9 +41,3 @@ from ._view import *
 from ._movingload import*
 from ._settlement import*
 
-
-
-print('')
-print('*'*20,'  MIDAS CIVIL-NX PYTHON LIBRARY  🐍 ','*'*20)
-print('')
-

midas_civil/_element.py

@@ -2,9 +2,85 @@ from ._mapi import *
 from ._node import *
 from ._group import _add_elem_2_stGroup
 from ._group import _add_node_2_stGroup
-
 import numpy as np
+from scipy.interpolate import splev, splprep
+from math import hypot
+
+
+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]
+
+    if deg < 1 :
+        deg = 1
+    if deg > len(pointsArray)-1:
+        deg = len(pointsArray)-1
+
+    #-- Actual length ----
+    dxq = np.diff(x_p)
+    dyq = np.diff(y_p)
+    dzq = np.diff(z_p)
+    dlq=[0]
+
+    for i in range(len(dxq)):
+        dlq.append(hypot(dxq[i],dyq[i],dzq[i]))
+
+    tck, u = splprep([x_p, y_p, z_p], s=0, k=deg)
+
+    u_fine = np.linspace(0, 1, 500)
+    x_den, y_den, z_den = splev(u_fine, tck)
+
+    dx = np.diff(x_den)
+    dy = np.diff(y_den)
+    dz = np.diff(z_den)
+    dl=[]
+    for i in range(len(dx)):
+        dl.append(hypot(dx[i],dy[i],dz[i]))
+
+    cum_l = np.insert(np.cumsum(dl),0,0)
+    total_l = cum_l[-1]
+
+
+    if n_seg==0 or mSize!=0:
+        n_seg=int(total_l/mSize)
+
+
+    eq_len = np.linspace(0,total_l,n_seg+1)
+
+    interp_u = np.interp(eq_len,cum_l,u_fine)
+
+    if includePoint:
+        interp_u = np.sort(np.append(interp_u,u[1:-1])).tolist()
+
+        eq_u = 1/n_seg # for filtering close points
+    
+        new_u = []
+        skip=0
+        for i in range(len(interp_u)-1):
+            if skip == 1:
+                skip = 0 
+                continue
+            if interp_u[i+1]-interp_u[i] < 0.2*eq_u:
+                if interp_u[i] in u:
+                    new_u.append(interp_u[i])
+                    skip=1
+                else:
+                    new_u.append(interp_u[i+1])
+                    skip=1
+            else:
+                new_u.append(interp_u[i])
+        new_u.append(interp_u[-1])
+    else:
+        new_u = interp_u
+
+
+    interp_x, interp_y , interp_z = splev(new_u, tck)
+
 
+    align_fine_points  = [ [round(x,6), round(y,6), round(z,6)] for x, y, z in zip(interp_x, interp_y , interp_z) ]
+
+    return align_fine_points
 
 
 
@@ -273,6 +349,26 @@ class Element:
                     beam_obj.append(Element.Beam(beam_nodes[i],beam_nodes[i+1],mat,sect,angle,group,id_new))
                 
                 return beam_obj
+        
+        @staticmethod
+        def PLine(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):
+
+                beam_nodes =[]
+                beam_obj = []
+                if n_div == 0 :
+                    i_loc = points_loc
+                else:
+                    i_loc = _interpolateAlignment(points_loc,n_div,deg,0,includePoint)
+                for i in i_loc:
+                    Enode=Node(i[0],i[1],i[2])
+                    beam_nodes.append(Enode.ID)
+                
+                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))
+                
+                return beam_obj
 
     class Truss(_common):
         def __init__(self, i: int, j: int, mat: int = 1, sect: int = 1, angle: float = 0, group = "" , id: int = 0):

midas_civil/_mapi.py

@@ -15,7 +15,7 @@ class MAPI_COUNTRY:
     
     country = "US"
 
-    def __init__(self,country:str):
+    def __init__(self,country:str="US"):
         ''' Define Civil NX country to automatically set Base URL and MAPI Key from registry.
         ```
         MAPI_COUNTRY('US') # For english version
@@ -35,7 +35,7 @@ class MAPI_COUNTRY:
 class MAPI_BASEURL:
     baseURL = "https://moa-engineers.midasit.com:443/civil"
     
-    def __init__(self, baseURL:str):
+    def __init__(self, baseURL:str = "https://moa-engineers.midasit.com:443/civil"):
         ''' Define the Base URL for API connection.
         ```
         MAPI_BASEURL('https://moa-engineers.midasit.com:443/civil')
@@ -81,13 +81,15 @@ class MAPI_KEY:
                 registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, key_path, 0, winreg.KEY_READ)
                 value = winreg.QueryValueEx(registry_key, "Key")
                 my_key = value[0]
-                print(f' 🔑   MAPI-KEY is taken from Registry entry.  >>  {my_key[:35]}...')
                 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)
         else:
             my_key = MAPI_KEY.data
+        
         return my_key
 #---------------------------------------------------------------------------------------------------------------
 
@@ -130,3 +132,22 @@ def MidasAPI(method:str, command:str, body:dict={})->dict:
     return response.json()
 
 
+#--------------------------------------------------------------------
+
+def _getUNIT():
+    return MidasAPI('GET','/db/UNIT',{})['UNIT']['1']
+
+def _setUNIT(unitJS):
+    js = {
+        "Assign" : {
+            "1" : unitJS
+        }
+    }
+    MidasAPI('PUT','/db/UNIT',js)
+
+
+
+resp =  MidasAPI('GET','/config/ver',{})['VER']
+print(f"Connected to {resp["NAME"]}   🟢")
+print(f"USER : {resp["USER"]}    |   COMPANY : {resp["COMPANY"]}")
+print("-"*85)

midas_civil/_model.py

@@ -19,10 +19,19 @@ class Model:
     @staticmethod
     def analyse():
         """Checkes whether a model is analyzed or not and then performs analysis if required."""
-        r = (MidasAPI("POST","/post/TABLE",{"Argument": {"TABLE_NAME": "Reaction(Global)","TABLE_TYPE": "REACTIONG",}}))
-        if 'error' in r.keys():
-            MidasAPI("POST","/doc/SAVE",{"Argument":{}})
-            MidasAPI("POST","/doc/ANAL",{"Assign":{}})
+        json_body = {
+        "Argument": {
+            "HEIGHT" : 1,
+            "WIDTH" : 1,
+            "SET_MODE": "post"
+        }
+        }
+        resp = MidasAPI('POST','/view/CAPTURE',json_body)
+
+        if 'message' in resp or 'error' in resp:
+                MidasAPI("POST","/doc/ANAL",{"Assign":{}})
+                return True
+        print(" ⚠️   Model ananlysed. Switching to post-processing mode.")
 
     #9 Function to remove duplicate nodes and elements from Node & Element classes\
     @staticmethod

midas_civil/_result_extract.py

@@ -3,6 +3,9 @@ import json
 import xlsxwriter
 from ._mapi import *
 from ._model import *
+
+from ._mapi import _getUNIT
+from ._mapi import _setUNIT
 # js_file = open('JSON_Excel Parsing\\test.json','r')
 
 # print(js_file)
@@ -136,8 +139,10 @@ class Result :
                 }
             }
         }
+        currUNIT = _getUNIT()
         Model.units(force=force_unit,length=len_unit)
         ss_json = MidasAPI("POST","/post/TABLE",js_dat)
+        _setUNIT(currUNIT)
         return _JSToDF_UserDefined(tableName,ss_json,summary)
     
     # ---------- LIST ALL USER DEFINED TABLE ------------------------------
@@ -194,8 +199,9 @@ class Result :
 
         if loadcase!=[]: js_dat["Argument"]['LOAD_CASE_NAMES'] = loadcase
 
-
+        currUNIT = _getUNIT()
         Model.units(force=force_unit,length=len_unit)
         ss_json = MidasAPI("POST","/post/table",js_dat)
+        _setUNIT(currUNIT)
         return _JSToDF_ResTable(ss_json)
 

{midas_civil-1.0.1.dist-info → midas_civil-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midas_civil
-Version: 1.0.1
+Version: 1.0.3
 Summary: Python library for MIDAS Civil NX
 Home-page: https://github.com/MIDASIT-Co-Ltd/midas-civil-python
 Author: Sumit Shekhar
@@ -13,6 +13,7 @@ Requires-Dist: numpy
 Requires-Dist: polars
 Requires-Dist: xlsxwriter
 Requires-Dist: requests
+Requires-Dist: scipy
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{midas_civil-1.0.1.dist-info → midas_civil-1.0.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
-midas_civil/__init__.py,sha256=t0XkmZiEBYodUkU2gJWLQmqrpQdZc8ikPM3Z0xrSVPg,575
+midas_civil/__init__.py,sha256=cNRskckAnVa-yPS6WsAoT7rEPldE1XyuNljYmCSKg-c,997
 midas_civil/_boundary.py,sha256=s5mgZIc1b0-P7AdWuaPAQ5cIbHL5CR1YRKJA7KE4W_U,32958
 midas_civil/_construction.py,sha256=q9C3gGdvky5t7jCDzd6lBRv6pm8cMycI91xfkgDV37Y,40673
 midas_civil/_construction_backup.py,sha256=Pj7V-NYCkkT-aMjKXfs1jKa9klsGh48UXDLwn3BLYTY,18225
-midas_civil/_element.py,sha256=hlH6NZfSBOrKQO7R22wZYbmLA20MB8rX7g_Td6G4mgo,27544
+midas_civil/_element.py,sha256=O6PBn5yWI_EFpHpCMOVoo8zsA5fup1pwdY058LSc0pY,30411
 midas_civil/_group.py,sha256=Go4If-cwdKMfIDlNi1MYYq4jPYOa3MlVvNkX2pTkyCs,9864
 midas_civil/_load.py,sha256=TltWAjDaeC5MNW8IIPKgpLahDQgJR3J6SzinkCrJS7A,30171
-midas_civil/_mapi.py,sha256=Fabn3QX6OHJeV_s_01KMvOwkSye0kfgpiUUgPplAzxA,4597
+midas_civil/_mapi.py,sha256=b6-ZRUMLvOedhdgIfzW3byG9hXjEdqJetAwayJWGtKc,5136
 midas_civil/_material.py,sha256=uJEIHJM9OhwTRWUI2mtd_0BQSxdlYhATYJu9P7tNNBA,69511
-midas_civil/_model.py,sha256=G5Kh7u2DSodvKGQ0fOzAUx4Ilj8-rn-nGDTFeI6AkUU,16442
+midas_civil/_model.py,sha256=I7lzMsOhqWcDcBYtPSqBUs97sBEf5M1mJ0KLftyGGB4,16597
 midas_civil/_movingload.py,sha256=kzTbi4vFjOnUYOyhDDTmSHFU-sDGb_MgMBNXUmFmUZc,80001
 midas_civil/_node.py,sha256=wRttDbebQWT6aZWeNd72AgzVWUETyNzMng5kJQmV3WM,4760
 midas_civil/_result copy.py,sha256=siTMENLIwF_6rvydSjP9aQAWaIlt0pReiqNyDhDevGk,24290
 midas_civil/_result.py,sha256=ZJf2CQG2ZjlTKuWo3zBnG7W8EwI1UkhWhWJVWRzlXUU,7640
-midas_civil/_result_extract.py,sha256=J-9eeWDbFeaDL-C41TAynYuooiHYsayAe3WbfGRO8sM,5537
+midas_civil/_result_extract.py,sha256=cZgWMxvZV9Pc-Ec0KzGrerDRv1Sj3AJKqlZwj_uVi9w,5707
 midas_civil/_section.py,sha256=-mpGOYceus_dURE80lsGExSBDDpqDKqsNjBeOE3kZEM,36433
 midas_civil/_settlement.py,sha256=U7lJYBqGbuCv7qziEEznDyA4M_SCjJeIjc0lDeGfE4Y,5125
 midas_civil/_temperature.py,sha256=EfvivFWfxyM8yFCvWJgXLhaCofGwLKEBGFUuW8yHnfQ,24209
@@ -20,8 +20,8 @@ midas_civil/_tendon.py,sha256=mXNJeLikFsBpgn8u9fED2qx9oqnKh3XtIpYwp3moEfk,33395
 midas_civil/_thickness.py,sha256=4xQsLA3Q_gIGCwLc_glFmiErdWdQUSwhlEhJ_IPJseA,3248
 midas_civil/_utils.py,sha256=GR9cj-mgRPmtwmgqEj4JeEjMlRS6zmvhcxFV5IHbpRk,2708
 midas_civil/_view.py,sha256=o7rkfoQzmgAb3dT0ujPIQLVwVlveo3rMRIbZU1UosZo,849
-midas_civil-1.0.1.dist-info/licenses/LICENSE,sha256=zrL4RwZC4rb-by_ZHKXwKdIwcs6ATy59TPZ9HxPHCrs,1071
-midas_civil-1.0.1.dist-info/METADATA,sha256=Ts49ALWXNRTNfpF9G7jSqaf1WirpMN1l34b1Fy7UmZA,2064
-midas_civil-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-midas_civil-1.0.1.dist-info/top_level.txt,sha256=_NFmrlN5V9OxJ-PAO4s_om8OA8uupXho3QqZcSsnbuI,12
-midas_civil-1.0.1.dist-info/RECORD,,
+midas_civil-1.0.3.dist-info/licenses/LICENSE,sha256=zrL4RwZC4rb-by_ZHKXwKdIwcs6ATy59TPZ9HxPHCrs,1071
+midas_civil-1.0.3.dist-info/METADATA,sha256=eTANjSQcccpH8UvxKCrjExV7olqV30r47d0MaZRh-tM,2085
+midas_civil-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+midas_civil-1.0.3.dist-info/top_level.txt,sha256=_NFmrlN5V9OxJ-PAO4s_om8OA8uupXho3QqZcSsnbuI,12
+midas_civil-1.0.3.dist-info/RECORD,,