civil-tools-v 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

CivilTools/ReportGenerator/UtilFunctions.py

@@ -3,6 +3,7 @@ from docx.oxml.ns import qn, nsdecls
 from CivilTools.YDBLoader.BuildingDefine.StairPart import StairPart, Component
 import numpy as np
 
+
 # 网上找的代码，有点东西
 # https://stackoverflow.com/questions/33069697/how-to-setup-cell-borders-with-python-docx
 # 这个是github上的讨论帖，在讨论帖中找到的
@@ -26,14 +27,14 @@ def set_cell_border(cell, **kwargs):
     # check for tag existnace, if none found, then create one
     tc_borders = tc_pr.first_child_found_in("w:tcBorders")
     if tc_borders is None:
-        tc_borders = BaseOxmlElement('w:tcBorders')
+        tc_borders = BaseOxmlElement("w:tcBorders")
         tc_pr.append(tc_borders)
 
     # list over all available tags
-    for edge in ('start', 'top', 'end', 'bottom', 'insideH', 'insideV'):
+    for edge in ("start", "top", "end", "bottom", "insideH", "insideV"):
         edge_data = kwargs.get(edge)
         if edge_data:
-            tag = 'w:{}'.format(edge)
+            tag = "w:{}".format(edge)
 
             # check for tag existnace, if none found, then create one
             element = tc_borders.find(qn(tag))
@@ -44,9 +45,10 @@ def set_cell_border(cell, **kwargs):
             # looks like order of attributes is important
             for key in ["sz", "val", "color", "space", "shadow"]:
                 if key in edge_data:
-                    element.set(qn('w:{}'.format(key)), str(edge_data[key]))
-            
-def analysis_sub_and_super_script(context:str):
+                    element.set(qn("w:{}".format(key)), str(edge_data[key]))
+
+
+def analysis_sub_and_super_script(context: str):
     """根据字符串中的'_'与'^'标志的上下标（上下标需要被{}包围起来），将字符串分隔并返回上下标结果
     返回的sub_or_super列表中，0代表常规字符，1代表下标，2代表上标，3代表highlighted
     Args:
@@ -58,168 +60,170 @@ def analysis_sub_and_super_script(context:str):
     j = 0
     length = len(context)
     flag = False
-    index_for_flag = {
-        "_" : 1,
-        "^" : 2,
-        "*" : 3
-    }
-    
+    index_for_flag = {"_": 1, "^": 2, "*": 3}
+
     for c in context:
-        if (c in index_for_flag.keys()) and (j <length and context[j+1] =='{'):
+        if (c in index_for_flag.keys()) and (j < length and context[j + 1] == "{"):
             flag = True
             contexts.append(context[i:j])
             sub_or_super.append(index_for_flag[c])
-            i = j  + 2
+            i = j + 2
         if flag and c == "}":
             contexts.append(context[i:j])
             sub_or_super.append(0)
-            i = j+1
+            i = j + 1
             flag = False
-        j+=1
+        j += 1
     contexts.append(context[i:j])
     return contexts, sub_or_super
 
-def add_comma_in_num_str(num:int):
+
+def add_comma_in_num_str(num: int):
     if not isinstance(num, int):
         raise ValueError("Only int number can be added.")
     num_str = str(num)[::-1]
     result = ""
     for i in range(len(num_str)):
-        if i>0 and i%3 == 0 and num_str[i] !="-":
+        if i > 0 and i % 3 == 0 and num_str[i] != "-":
             result = "," + result
         result = num_str[i] + result
     return result
 
 
 class MatrixSolver:
-    def __init__(self,stair: StairPart):
+    def __init__(self, stair: StairPart):
         self.stair = stair
         self.cut_point = 0.5
-    
-    def set_load(self, q1,q2,q3):
+
+    def set_load(self, q1, q2, q3):
         self.q1 = q1
         self.q2 = q2
         self.q3 = q3
-    
+
     def pre_analysis(self):
         concrete_e = 30000
         uniform_b = 1000
-        top_y = self.stair.position.higher_elevation - self.stair.position.lower_elevation
+        top_y = (
+            self.stair.position.higher_elevation - self.stair.position.lower_elevation
+        )
         if self.stair.stair_type == "AT":
             self.point_num = 3
-            self.boundary = np.array([ 0, 0, 1, 1, 1, 1, 0, 0, 1])
-            
-            point1 = [0,0]
-            point2 = [self.stair.total_horizental_length,top_y]
-            point_middle = self.calculate_middle_point(point1,point2,self.cut_point)
-            comp1 = Component(point1,point_middle)
-            comp2 = Component(point_middle,point2)
+            self.boundary = np.array([0, 0, 1, 1, 1, 1, 0, 0, 1])
+
+            point1 = [0, 0]
+            point2 = [self.stair.total_horizental_length, top_y]
+            point_middle = self.calculate_middle_point(point1, point2, self.cut_point)
+            comp1 = Component(point1, point_middle)
+            comp2 = Component(point_middle, point2)
             comp1.set_vertical_q(self.q2)
-            comp1.set_comp_attr(concrete_e,uniform_b,self.stair.main_thick)
+            comp1.set_comp_attr(concrete_e, uniform_b, self.stair.main_thick)
             comp2.set_vertical_q(self.q2)
-            comp2.set_comp_attr(concrete_e,uniform_b,self.stair.main_thick)
-            self.comp_list = [comp1,comp2]
+            comp2.set_comp_attr(concrete_e, uniform_b, self.stair.main_thick)
+            self.comp_list = [comp1, comp2]
 
         elif self.stair.stair_type == "BT":
             self.point_num = 4
-            self.q_list = [self.q1,self.q2,self.q2]
-            self.boundary = np.array([ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1])
-            point0 = [0,0]
-            point1 = [self.stair.left_extend_length,0]
-            point2 = [self.stair.total_horizental_length,top_y]
-            point_middle = self.calculate_middle_point(point1,point2,self.cut_point)
-            comp1 = Component(point0,point1)
-            comp2 = Component(point1,point_middle)
-            comp3 = Component(point_middle,point2)
+            self.q_list = [self.q1, self.q2, self.q2]
+            self.boundary = np.array([0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1])
+            point0 = [0, 0]
+            point1 = [self.stair.left_extend_length, 0]
+            point2 = [self.stair.total_horizental_length, top_y]
+            point_middle = self.calculate_middle_point(point1, point2, self.cut_point)
+            comp1 = Component(point0, point1)
+            comp2 = Component(point1, point_middle)
+            comp3 = Component(point_middle, point2)
             comp1.set_vertical_q(self.q1)
-            comp1.set_comp_attr(concrete_e,uniform_b,self.stair.left_thick)
+            comp1.set_comp_attr(concrete_e, uniform_b, self.stair.left_thick)
             comp2.set_vertical_q(self.q2)
-            comp2.set_comp_attr(concrete_e,uniform_b,self.stair.main_thick)
+            comp2.set_comp_attr(concrete_e, uniform_b, self.stair.main_thick)
             comp3.set_vertical_q(self.q2)
-            comp3.set_comp_attr(concrete_e,uniform_b,self.stair.main_thick)
-            self.comp_list = [comp1,comp2,comp3]
-            
+            comp3.set_comp_attr(concrete_e, uniform_b, self.stair.main_thick)
+            self.comp_list = [comp1, comp2, comp3]
+
         elif self.stair.stair_type == "CT":
             self.point_num = 4
-            self.q_list = [self.q2,self.q2,self.q3]
-            self.boundary = np.array([ 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1])
-            
-            point1 = [0,0]
-            point2 = [self.stair.total_horizental_length-self.stair.right_extend_length,top_y]
-            point3 = [self.stair.total_horizental_length,top_y  ]
-            point_middle = self.calculate_middle_point(point1,point2,self.cut_point)
-            comp1 = Component(point1,point_middle)
-            comp2 = Component(point_middle,point2)
-            comp3 = Component(point2,point3)
+            self.q_list = [self.q2, self.q2, self.q3]
+            self.boundary = np.array([0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1])
+
+            point1 = [0, 0]
+            point2 = [
+                self.stair.total_horizental_length - self.stair.right_extend_length,
+                top_y,
+            ]
+            point3 = [self.stair.total_horizental_length, top_y]
+            point_middle = self.calculate_middle_point(point1, point2, self.cut_point)
+            comp1 = Component(point1, point_middle)
+            comp2 = Component(point_middle, point2)
+            comp3 = Component(point2, point3)
             comp1.set_vertical_q(self.q2)
-            comp1.set_comp_attr(concrete_e,uniform_b,self.stair.main_thick)
-            
+            comp1.set_comp_attr(concrete_e, uniform_b, self.stair.main_thick)
+
             comp2.set_vertical_q(self.q2)
-            comp2.set_comp_attr(concrete_e,uniform_b,self.stair.main_thick)
-            
+            comp2.set_comp_attr(concrete_e, uniform_b, self.stair.main_thick)
+
             comp3.set_vertical_q(self.q3)
-            comp3.set_comp_attr(concrete_e,uniform_b,self.stair.right_thick)
-            self.comp_list = [comp1,comp2,comp3]
-            
-            
+            comp3.set_comp_attr(concrete_e, uniform_b, self.stair.right_thick)
+            self.comp_list = [comp1, comp2, comp3]
+
         else:
             self.point_num = 5
-            self.q_list = [self.q1,self.q2,self.q2,self.q3]
+            self.q_list = [self.q1, self.q2, self.q2, self.q3]
             self.boundary = np.array([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1])
-            
-            point0 = [0,0]
-            point1 = [self.stair.left_extend_length,0]
-            point2 = [self.stair.total_horizental_length - self.stair.right_extend_length,top_y]
-            point3 = [self.stair.total_horizental_length,top_y]
-            point_middle = self.calculate_middle_point(point1,point2,self.cut_point)
-            comp1 = Component(point0,point1)
-            comp2 = Component(point1,point_middle)
-            comp3 = Component(point_middle,point2)
-            comp4 = Component(point2,point3)
+
+            point0 = [0, 0]
+            point1 = [self.stair.left_extend_length, 0]
+            point2 = [
+                self.stair.total_horizental_length - self.stair.right_extend_length,
+                top_y,
+            ]
+            point3 = [self.stair.total_horizental_length, top_y]
+            point_middle = self.calculate_middle_point(point1, point2, self.cut_point)
+            comp1 = Component(point0, point1)
+            comp2 = Component(point1, point_middle)
+            comp3 = Component(point_middle, point2)
+            comp4 = Component(point2, point3)
 
             comp1.set_vertical_q(self.q1)
-            comp1.set_comp_attr(concrete_e,uniform_b,self.stair.left_thick)
+            comp1.set_comp_attr(concrete_e, uniform_b, self.stair.left_thick)
             comp2.set_vertical_q(self.q2)
-            comp2.set_comp_attr(concrete_e,uniform_b,self.stair.main_thick)
+            comp2.set_comp_attr(concrete_e, uniform_b, self.stair.main_thick)
             comp3.set_vertical_q(self.q2)
-            comp3.set_comp_attr(concrete_e,uniform_b,self.stair.main_thick)
+            comp3.set_comp_attr(concrete_e, uniform_b, self.stair.main_thick)
             comp4.set_vertical_q(self.q3)
-            comp4.set_comp_attr(concrete_e,uniform_b,self.stair.right_thick)
-            self.comp_list = [comp1,comp2,comp3,comp4]
-             
-    def calculate_middle_point(self, p1, p2,cut_point):
-        x = p1[0] + (p2[0]-p1[0])*cut_point
-        y = p1[1] + (p2[1]-p1[1])*cut_point
-        return [x,y]
-    
+            comp4.set_comp_attr(concrete_e, uniform_b, self.stair.right_thick)
+            self.comp_list = [comp1, comp2, comp3, comp4]
+
+    def calculate_middle_point(self, p1, p2, cut_point):
+        x = p1[0] + (p2[0] - p1[0]) * cut_point
+        y = p1[1] + (p2[1] - p1[1]) * cut_point
+        return [x, y]
+
     def submit_problem(self):
         self.pre_analysis()
         comp_num = len(self.comp_list)
-        total_k = np.zeros((comp_num*3+3,comp_num*3+3))
-        total_f = np.zeros((comp_num*3+3,1))
+        total_k = np.zeros((comp_num * 3 + 3, comp_num * 3 + 3))
+        total_f = np.zeros((comp_num * 3 + 3, 1))
         for i in range(len(self.comp_list)):
             comp = self.comp_list[i]
             temp_k = comp.create_k()
             temp_f = comp.create_f()
-            total_k[i*3:i*3+6,i*3:i*3+6] += temp_k
-            total_f[i*3:i*3+6,:] += temp_f
+            total_k[i * 3 : i * 3 + 6, i * 3 : i * 3 + 6] += temp_k
+            total_f[i * 3 : i * 3 + 6, :] += temp_f
         # 生成缩减矩阵并计算
-        new_k = np.delete(total_k,np.nonzero(self.boundary == 0),axis=0)
-        new_k = np.delete(new_k,np.nonzero(self.boundary == 0),axis=1)
-        new_f = np.delete(total_f,np.nonzero(self.boundary == 0),axis=0)
-        new_u = np.dot(np.linalg.inv(new_k),new_f)
-        
-        total_u = self.boundary.copy().reshape(-1,1).astype(float)
+        new_k = np.delete(total_k, np.nonzero(self.boundary == 0), axis=0)
+        new_k = np.delete(new_k, np.nonzero(self.boundary == 0), axis=1)
+        new_f = np.delete(total_f, np.nonzero(self.boundary == 0), axis=0)
+        new_u = np.dot(np.linalg.inv(new_k), new_f)
+
+        total_u = self.boundary.copy().reshape(-1, 1).astype(float)
         total_u[np.nonzero(total_u == 1)[0]] = new_u
-        
+
         # 计算每个构件端点的数据
         for i in range(len(self.comp_list)):
             comp = self.comp_list[i]
-            comp_u = total_u[i*3:i*3+6]
-            comp_f = np.dot(comp.create_k(),comp_u)
+            comp_u = total_u[i * 3 : i * 3 + 6]
+            comp_f = np.dot(comp.create_k(), comp_u)
             comp_f -= comp.create_f()
-            comp.set_f(comp_f[0][0],comp_f[1][0],comp_f[3][0],comp_f[4][0])
-            comp.set_m(comp_f[2][0],comp_f[5][0])
+            comp.set_f(comp_f[0][0], comp_f[1][0], comp_f[3][0], comp_f[4][0])
+            comp.set_m(comp_f[2][0], comp_f[5][0])
         return self.comp_list
-        
-        

CivilTools/ReportGenerator/__init__.py

@@ -1,7 +1,7 @@
 from .BasicGenerator import BasicGenerator, PageSize
-from .SeismicReport import SeismicReport
+from .SeismicReport import SeismicReport, SeismicReportData
 from .DocParagraph import DocParagraph
 from .DocTable import DocTable
 from .DocPicture import DocPicture
 from .UtilFunctions import add_comma_in_num_str
-from .StairCalculationReport import StairCalculationReport
+from .StairCalculationReport import StairCalculationReport

CivilTools/YDBLoader/BuildingDefine/Beam/Beam.py

@@ -1,26 +1,23 @@
-from ..Section import Section,ShapeEnum
+from ..Section import Section, ShapeEnum
 from ..Geometry import Joint
 
+
 class Beam:
-    def __init__(
-        self,
-        id:int,
-        start_joint:Joint,
-        end_joint:Joint,
-        section:Section
-        ):
-        self.id = id 
+    def __init__(self, id: int, start_joint: Joint, end_joint: Joint, section: Section):
+        self.id = id
         self.start_joint = start_joint
         self.end_joint = end_joint
         self.section = section
         self.std_flr_id = self.start_joint.std_flr_id
-        
-        
+
     def get_data_for_plot(self):
-        return [[self.start_joint.x,self.end_joint.x],[self.start_joint.y,self.end_joint.y]]
-    
+        return [
+            [self.start_joint.x, self.end_joint.x],
+            [self.start_joint.y, self.end_joint.y],
+        ]
+
     def __str__(self):
         return f"Beam:{self.id}-{str(self.section)}"
-    
+
     def __repr__(self):
-        return self.__str__()
+        return self.__str__()

CivilTools/YDBLoader/BuildingDefine/Column/Column.py

@@ -1,16 +1,16 @@
-from ..Section import Section,ShapeEnum
+from ..Section import Section, ShapeEnum
 from ..Geometry import Joint
 
+
 class Column:
-    def __init__(self,id:int,joint:Joint,section:Section):
+    def __init__(self, id: int, joint: Joint, section: Section):
         self.id = id
         self.joint = joint
         self.std_flr_id = joint.std_flr_id
         self.section = section
-    
 
     def __str__(self):
         return f"Column:{self.id}-{str(self.section)}"
-    
+
     def __repr__(self):
-        return self.__str__()
+        return self.__str__()

CivilTools/YDBLoader/BuildingDefine/ComponentType.py

@@ -1,5 +1,6 @@
 from enum import Enum
 
+
 class ComponentType(Enum):
     Beam = 1
     Column = 2
@@ -7,4 +8,3 @@ class ComponentType(Enum):
     Slab = 4
     Brace = 5
     SlabHole = 6
-    

CivilTools/YDBLoader/BuildingDefine/Geometry/Grid.py

@@ -1,21 +1,17 @@
-
 from .Joint import Joint
 
+
 class Grid:
-    def __init__(
-        self,
-        id:int,
-        s_joint:Joint,
-        e_joint:Joint
-        ):
-        if s_joint.std_flr_id!= e_joint.std_flr_id:
-            raise ValueError("The standard-floor-ids of two Joints is not same! " +
-                             "Please check the data!")
+    def __init__(self, id: int, s_joint: Joint, e_joint: Joint):
+        if s_joint.std_flr_id != e_joint.std_flr_id:
+            raise ValueError(
+                "The standard-floor-ids of two Joints is not same! "
+                + "Please check the data!"
+            )
         self.id = id
         self.start_joint = s_joint
         self.end_joint = e_joint
         self.std_flr_id = s_joint.std_flr_id
-        
+
     def get_length(self):
         return self.start_joint.distance_to_joint(self.end_joint)
-        

CivilTools/YDBLoader/BuildingDefine/Geometry/Joint.py

@@ -1,25 +1,26 @@
 import math
 
+
 class Joint:
-    def __init__(self,id:int,x:float,y:float,std_flr_id:int):
+    def __init__(self, id: int, x: float, y: float, std_flr_id: int):
         self.id = id
         self.x = x
         self.y = y
         self.std_flr_id = std_flr_id
 
-    def distance_to_joint(self,other)-> float:
+    def distance_to_joint(self, other) -> float:
         if not isinstance(other, Joint):
             raise ValueError("Input should be Joint")
-        dis_square = (self.x - other.x)**2 + (self.y - other.y)**2
+        dis_square = (self.x - other.x) ** 2 + (self.y - other.y) ** 2
         return math.sqrt(dis_square)
-    
+
     def __str__(self):
         return f"Joint(id:{self.id}):[x:{self.x:.4f},y:{self.y:.4f}]:stdFlrId:{self.std_flr_id}"
-    
+
     def __repr__(self):
-        return str(self) 
-    
-    
+        return str(self)
+
+
 if __name__ == "__main__":
-    j = Joint(1,3.1,36.6513246534313)
-    print(j)
+    j = Joint(1, 3.1, 36.6513246534313)
+    print(j)

CivilTools/YDBLoader/BuildingDefine/Geometry/StandFloor.py

@@ -1,2 +1,2 @@
 class StandFloor:
-    pass
+    pass

CivilTools/YDBLoader/BuildingDefine/GlobalResult/BasicResult.py

@@ -1,45 +1,65 @@
 from typing import List
 
+
 class SingleMassResult:
-    def __init__(self,
-                 floor_num:int,
-                 tower_num:int,
-                 dead_load:float, 
-                 live_load:float, 
-                 slab_area:float,
+    def __init__(
+        self,
+        floor_num: int,
+        tower_num: int,
+        dead_load: float,
+        live_load: float,
+        slab_area: float,
     ):
         self.floor_num = floor_num
         self.tower_num = tower_num
-        self.dead_load = dead_load
-        """单层恒载，没有折减"""
-        self.live_load = live_load
-        """单层活载，没有折减"""
-        self.slab_area = slab_area
-        """单层楼板面积"""
-    
+        self.dead_load = round(dead_load, 4)
+        """单层恒载，单位kN，没有折减"""
+        self.live_load = round(live_load, 4) * 2
+        """单层活载，单位kN，没有折减"""
+        self.slab_area = round(slab_area)
+        """单层楼板面积，单位m2"""
+
     @property
-    def mass(self):
+    def total_load(self):
         """单层质量，恒+0.5活"""
-        return self.dead_load + 0.5 * self.live_load
+        return round(self.dead_load + 0.5 * self.live_load, 4)
+
+    def to_json(self):
+        return {
+            "floor_num": self.floor_num,
+            "tower_num": self.tower_num,
+            "dead_load": self.dead_load,
+            "live_load": self.live_load,
+        }
+
 
 class MassResult:
-    def __init__(self, mass_list:List[SingleMassResult]):
+    def __init__(self, mass_list: List[SingleMassResult]):
         self.mass_list = mass_list
-    
+
     @property
     def total_slab_area(self):
         return sum([i.slab_area for i in self.mass_list])
-    
+
     @property
     def total_dead_load(self):
         return sum([i.dead_load for i in self.mass_list])
-    
+
     @property
     def total_live_load(self):
         return sum([i.live_load for i in self.mass_list])
-    
+
     @property
-    def total_mass(self):
-        return sum([i.mass for i in self.mass_list])
-    
-    
+    def total_load(self):
+        return sum([i.total_load for i in self.mass_list])
+
+    @classmethod
+    def mock_data(cls):
+        mass_list = []
+        for i in range(5):
+            mass_list.append(SingleMassResult(i + 1, 1, 5000, 2000, 350))
+
+        return MassResult(mass_list)
+
+    def to_json(self):
+        return {"mass_list": [i.to_json() for i in self.mass_list]}