civil-tools-v 0.0.2__py3-none-any.whl → 0.0.4__py3-none-any.whl

CivilTools/FigureGenerator/BasicPltPlotter.py

@@ -2,6 +2,33 @@ from typing import List
 import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 import io
+import numpy as np
+
+plt.rcParams["font.sans-serif"] = ["SimHei"]  # 用来正常显示中文标签
+plt.rcParams["axes.unicode_minus"] = False
+plt.rcParams["font.size"] = 14
+
+
+def GetTicks(n_max=1):
+    if n_max == 0:
+        n_max = 100
+    m = int(np.log10(n_max))
+    if m <= 0 and n_max <= 1:
+        m -= 1
+    p = n_max / (10**m)
+    if p <= 2.2:
+        result = [i * 1 * 10**m for i in range(3)]
+    elif p <= 3.5:
+        result = [i * 2 * 10**m for i in range(3)]
+    elif p <= 5:
+        result = [i * 2.5 * 10**m for i in range(3)]
+    elif p <= 6.9:
+        result = [i * 3 * 10**m for i in range(4)]
+    elif p <= 8:
+        result = [i * 2 * 10**m for i in range(5)]
+    else:
+        result = [i * 2 * 10**m for i in range(6)]
+    return result
 
 
 class BasicPltPlotter:
@@ -11,6 +38,9 @@ class BasicPltPlotter:
             self.axes = [_axes]
         else:
             self.axes = _axes
+        self.fig.patch.set_facecolor("none")
+        for ax in self.axes:
+            ax.patch.set_facecolor("none")
         self.axes: List[Axes]
         self.__remove_border()
 
@@ -22,7 +52,7 @@ class BasicPltPlotter:
     def save_to_stream(self):
         # 将图片保存到内存中的 BytesIO 对象
         img_buffer = io.BytesIO()
-        self.fig.savefig(img_buffer, format="png", dpi=300)  # 保存为 PNG 格式
+        self.fig.savefig(img_buffer, format="png", dpi=150)  # 保存为 PNG 格式
         plt.close()  # 关闭图形，释放内存
         # 将指针重置到流的开头，以便后续读取
         img_buffer.seek(0)
@@ -38,21 +68,50 @@ class SeismicPlotter(BasicPltPlotter):
         else:
             fig_size = (6, 5)
         super().__init__(fig_num, fig_size)
+        self.kwargs_x = {
+            "label": "X",
+            "ls": "-",
+            "color": "k",
+            "marker": "o",
+            "ms": 3,
+        }
+        self.kwargs_y = {
+            "label": "X",
+            "ls": "-",
+            "color": "r",
+            "marker": "o",
+            "ms": 3,
+        }
         self.floor_num = floor_num
-        self.__y_values = [i + 1 for i in range(self.floor_num)]
-        self.__ax1_x = [i for i in range(self.floor_num)]
-        self.__ax1_y = [i * 0.5 for i in range(self.floor_num)]
-        self.__ax2_x = [i for i in range(self.floor_num)]
-        self.__ax2_y = [i * 0.5 for i in range(self.floor_num)]
+        self.y_label = "层号"
+        self._y_values = [i + 1 for i in range(self.floor_num)]
+        self._y_major_ticks = self.__create_y_ticks()
+        self._y_minor_ticks = [i + 1 for i in range(self.floor_num)]
+        self._ax1_x = [i for i in range(self.floor_num)]
+        self._ax1_y = [i * 0.5 for i in range(self.floor_num)]
+        self._ax2_x = [i for i in range(self.floor_num)]
+        self._ax2_y = [i * 0.5 for i in range(self.floor_num)]
 
     def test_plot(self):
         self.__plot()
 
     def __plot(self):
-        kwargs_x = {"label": "X", "ls": "-", "color": "k", "marker": "o", "ms": 3}
-        kwargs_y = {"label": "X", "ls": "-", "color": "r", "marker": "o", "ms": 3}
+        self.axes[0].plot(self._ax1_x, self._y_values, **self.kwargs_x)
+        self.axes[0].plot(self._ax1_y, self._y_values, **self.kwargs_y)
+        self.axes[1].plot(self._ax2_x, self._y_values, **self.kwargs_x)
+        self.axes[1].plot(self._ax2_y, self._y_values, **self.kwargs_y)
+
+    def __create_y_ticks(self):
+        floor_num = self.floor_num
+        return range(0, int(floor_num) + 1, int(floor_num // 5) + 1)
 
-        self.axes[0].plot(self.__ax1_x, self.__y_values, **kwargs_x)
-        self.axes[0].plot(self.__ax1_y, self.__y_values, **kwargs_y)
-        self.axes[1].plot(self.__ax2_x, self.__y_values, **kwargs_x)
-        self.axes[1].plot(self.__ax2_y, self.__y_values, **kwargs_y)
+    def _validate_list_length(self, data_list, name):
+        """
+        验证列表长度是否与楼层数相等
+        :param data_list: 待验证的列表
+        :param name: 列表的名称，用于异常信息
+        """
+        if len(data_list) != self.floor_num:
+            raise ValueError(
+                f"Length of {name} is not equal to floor number: {self.floor_num}!"
+            )

CivilTools/FigureGenerator/SeismicReport/Drift.py

@@ -0,0 +1,66 @@
+from ..BasicPltPlotter import SeismicPlotter, GetTicks
+from typing import List
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+class DriftPlotter(SeismicPlotter):
+    def __init__(self, floor_num=8, fig_num=2):
+        super().__init__(fig_num, floor_num)
+        self.__limit = None
+        self.type = "层间位移角"
+
+    def set_data(
+        self,
+        wind_x: List[float],
+        wind_y: List[float],
+        seismic_x: List[float],
+        seismic_y: List[float],
+    ):
+        # 验证数据长度
+        data_dict = {
+            "wind_x": wind_x,
+            "wind_y": wind_y,
+            "seismic_x": seismic_x,
+            "seismic_y": seismic_y,
+        }
+        for name, data_list in data_dict.items():
+            self._validate_list_length(data_list, name)
+
+        self._ax1_x = 1 / np.array(wind_x)
+        self._ax1_y = 1 / np.array(wind_y)
+        self._ax2_x = 1 / np.array(seismic_x)
+        self._ax2_y = 1 / np.array(seismic_y)
+
+    def plot(self):
+        if self.__limit:
+            self.__plot_limit()
+        kwargs_x = self.kwargs_x.copy()
+        kwargs_x["label"] = "X风"
+        kwargs_y = self.kwargs_y.copy()
+        kwargs_y["label"] = "Y风"
+        self.axes[0].plot(self._ax1_x, self._y_values, **kwargs_x)
+        self.axes[0].plot(self._ax1_y, self._y_values, **kwargs_y)
+        kwargs_x["label"] = "X小震"
+        kwargs_y["label"] = "Y小震"
+        self.axes[1].plot(self._ax2_x, self._y_values, **kwargs_x)
+        self.axes[1].plot(self._ax2_y, self._y_values, **kwargs_y)
+        self.__adjust_lim()
+        self.__add_titles()
+
+    def __adjust_lim(self):
+        xmaxs = [self._ax1_x.max(), self._ax2_x.max()]
+        for i in range(2):
+            self.axes[i].set_xlim(left=0, right=xmaxs[i] * 1.2)
+            self.axes[i].set_yticks(self._y_major_ticks)
+            self.axes[i].set_yticks(self._y_minor_ticks, minor=True)
+            x_ticks = GetTicks(xmaxs[i])
+            self.axes[i].set_xticks(x_ticks)
+            # self.axes[i].set_xticklabels([f"{i*100:.1f}%" for i in x_ticks])
+
+    def __add_titles(self):
+        self.axes[0].set_ylabel(self.y_label)
+        self.axes[0].set_xlabel(f"风下{self.type}")
+        self.axes[1].set_xlabel(f"小震下{self.type}")
+        self.axes[0].legend(framealpha=0, fontsize=12, loc=1)
+        self.axes[1].legend(framealpha=0, fontsize=12, loc=1)

CivilTools/FigureGenerator/SeismicReport/ShearMassRatio.py

@@ -0,0 +1,73 @@
+from ..BasicPltPlotter import SeismicPlotter, GetTicks
+from typing import List
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+class ShearMassRatioPlotter(SeismicPlotter):
+    def __init__(self, fig_num=2, floor_num=8):
+        super().__init__(fig_num, floor_num)
+        self.__limit = None
+        self.type = "剪重比"
+
+    def set_data(self, shear_x: List[float], shear_y: List[float], mass: List[float]):
+        if len(shear_x) != self.floor_num:
+            raise ValueError(
+                f"Lenght of shear_x is not equal to floor number: {self.floor_num}!"
+            )
+        if len(shear_y) != self.floor_num:
+            raise ValueError(
+                f"Lenght of shear_y is not equal to floor number: {self.floor_num}!"
+            )
+        if len(mass) != self.floor_num:
+            raise ValueError(
+                f"Lenght of mass is not equal to floor number: {self.floor_num}!"
+            )
+
+        self._ax1_x = np.array(shear_x) / np.array(mass)
+        self._ax2_x = np.array(shear_y) / np.array(mass)
+
+    def set_limit(self, limit: float):
+        self.__limit = limit
+
+    def plot(self):
+        if self.__limit:
+            self.__plot_limit()
+        kwargs_x = self.kwargs_x.copy()
+        kwargs_x["label"] = "X"
+        kwargs_y = self.kwargs_x.copy()
+        kwargs_y["label"] = "Y"
+        self.axes[0].plot(self._ax1_x, self._y_values, **kwargs_x)
+        self.axes[1].plot(self._ax2_x, self._y_values, **kwargs_y)
+        self.__adjust_lim()
+        self.__add_titles()
+
+    def __plot_limit(self):
+        limitation = self.__limit
+        for ax in self.axes:
+            ax.vlines(
+                x=limitation,
+                ymin=0,
+                ymax=self.floor_num,
+                color="r",
+                linewidth=3,
+                ls="--",
+                label=f"限值{limitation*100:.1f}%",
+            )
+
+    def __adjust_lim(self):
+        xmaxs = [self._ax1_x.max(), self._ax2_x.max()]
+        for i in range(2):
+            self.axes[i].set_xlim(left=0, right=xmaxs[i] * 1.2)
+            self.axes[i].set_yticks(self._y_major_ticks)
+            self.axes[i].set_yticks(self._y_minor_ticks, minor=True)
+            x_ticks = GetTicks(xmaxs[i])
+            self.axes[i].set_xticks(x_ticks)
+            self.axes[i].set_xticklabels([f"{i*100:.1f}%" for i in x_ticks])
+
+    def __add_titles(self):
+        self.axes[0].set_ylabel(self.y_label)
+        self.axes[0].set_xlabel(f"X小震下{self.type}")
+        self.axes[1].set_xlabel(f"Y小震下{self.type}")
+        self.axes[0].legend(framealpha=0, fontsize=12, loc=4)
+        self.axes[1].legend(framealpha=0, fontsize=12, loc=4)

CivilTools/FigureGenerator/SeismicReport/ShearMoment.py

@@ -0,0 +1,71 @@
+from ..BasicPltPlotter import SeismicPlotter, GetTicks
+from typing import List
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+class ShearMomentPlotter(SeismicPlotter):
+    def __init__(self, floor_num=8, type="Shear", fig_num=2):
+        super().__init__(fig_num, floor_num)
+        self.__limit = None
+        if type.lower() == "shear":
+            self.type = "楼层剪力 kN"
+        elif type.lower() == "moment":
+            self.type = "倾覆力矩 MN·m"
+        else:
+            raise ValueError("Only shear or moment is supported for type.")
+
+    def set_data(
+        self,
+        wind_x: List[float],
+        wind_y: List[float],
+        seismic_x: List[float],
+        seismic_y: List[float],
+    ):
+        # 验证数据长度
+        data_dict = {
+            "wind_x": wind_x,
+            "wind_y": wind_y,
+            "seismic_x": seismic_x,
+            "seismic_y": seismic_y,
+        }
+        for name, data_list in data_dict.items():
+            self._validate_list_length(data_list, name)
+
+        self._ax1_x = np.array(wind_x)
+        self._ax1_y = np.array(wind_y)
+        self._ax2_x = np.array(seismic_x)
+        self._ax2_y = np.array(seismic_y)
+
+    def plot(self):
+        if self.__limit:
+            self.__plot_limit()
+        kwargs_x = self.kwargs_x.copy()
+        kwargs_x["label"] = "X风"
+        kwargs_y = self.kwargs_y.copy()
+        kwargs_y["label"] = "Y风"
+        self.axes[0].plot(self._ax1_x, self._y_values, **kwargs_x)
+        self.axes[0].plot(self._ax1_y, self._y_values, **kwargs_y)
+        kwargs_x["label"] = "X小震"
+        kwargs_y["label"] = "Y小震"
+        self.axes[1].plot(self._ax2_x, self._y_values, **kwargs_x)
+        self.axes[1].plot(self._ax2_y, self._y_values, **kwargs_y)
+        self.__adjust_lim()
+        self.__add_titles()
+
+    def __adjust_lim(self):
+        xmaxs = [self._ax1_x.max(), self._ax2_x.max()]
+        for i in range(2):
+            self.axes[i].set_xlim(left=0, right=xmaxs[i] * 1.2)
+            self.axes[i].set_yticks(self._y_major_ticks)
+            self.axes[i].set_yticks(self._y_minor_ticks, minor=True)
+            x_ticks = GetTicks(xmaxs[i])
+            self.axes[i].set_xticks(x_ticks)
+            # self.axes[i].set_xticklabels([f"{i*100:.1f}%" for i in x_ticks])
+
+    def __add_titles(self):
+        self.axes[0].set_ylabel(self.y_label)
+        self.axes[0].set_xlabel(f"风下{self.type}")
+        self.axes[1].set_xlabel(f"小震下{self.type}")
+        self.axes[0].legend(framealpha=0, fontsize=12, loc=1)
+        self.axes[1].legend(framealpha=0, fontsize=12, loc=1)

CivilTools/FigureGenerator/SeismicReport/__init__.py

@@ -0,0 +1,3 @@
+from .ShearMassRatio import ShearMassRatioPlotter
+from .ShearMoment import ShearMomentPlotter
+from .Drift import DriftPlotter

CivilTools/YDBLoader/BuildingDefine/GlobalResult/BasicResult.py

@@ -12,17 +12,25 @@ class SingleMassResult:
     ):
         self.floor_num = floor_num
         self.tower_num = tower_num
-        self.dead_load = dead_load
+        self.dead_load = round(dead_load, 4)
         """单层恒载，单位kN，没有折减"""
-        self.live_load = live_load
+        self.live_load = round(live_load, 4) * 2
         """单层活载，单位kN，没有折减"""
-        self.slab_area = slab_area
+        self.slab_area = round(slab_area)
         """单层楼板面积，单位m2"""
 
     @property
     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:
@@ -52,3 +60,6 @@ class MassResult:
             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]}

CivilTools/YDBLoader/BuildingDefine/GlobalResult/SeismicResult.py

@@ -64,6 +64,9 @@ class SinglePeriod:
     def __repr__(self):
         return str(self)
 
+    def to_json(self):
+        return {"index": self.index, "time": self.time}
+
 
 class Period:
     def __init__(self, periods: List[SinglePeriod], model_type=None):
@@ -144,6 +147,9 @@ class Period:
             )
         return Period(single_period_list)
 
+    def to_json(self):
+        return {"periods": [i.to_json() for i in self.periods]}
+
 
 class ValuePeer:
     def __init__(self, x: float, y: float):
@@ -158,6 +164,41 @@ class ValuePeer:
         else:
             return f"X:{self.x:.3f}\tY:{self.y:.3f}"
 
+    def to_json(self):
+        return {"X": self.x, "Y": self.y}
+
+
+class FloorDrift:
+    def __init__(
+        self,
+        floor_height: float,
+        drift_max_disp_x: float,
+        drift_max_disp_y: float,
+        drift_min_disp_x: float,
+        drift_min_disp_y: float,
+        max_disp_x: float,
+        ave_disp_x: float,
+        max_disp_y: float,
+        ave_disp_y: float,
+    ):
+        self.floor_height = floor_height
+        self.drift_max_disp_x = drift_max_disp_x
+        self.drift_max_disp_y = drift_max_disp_y
+        self.drift_min_disp_x = drift_min_disp_x
+        self.drift_min_disp_y = drift_min_disp_y
+        self.max_disp_x = max_disp_x
+        self.ave_disp_x = ave_disp_x
+        self.max_disp_y = max_disp_y
+        self.ave_disp_y = ave_disp_y
+
+    @property
+    def drift_x(self):
+        return round(self.floor_height / self.drift_max_disp_x)
+
+    @property
+    def drift_y(self):
+        return round(self.floor_height / self.drift_max_disp_y)
+
 
 class FloorSeismicResult:
     def __init__(
@@ -168,8 +209,9 @@ class FloorSeismicResult:
         shear: ValuePeer = None,
         moment: ValuePeer = None,
         disp: ValuePeer = None,
-        stiffness: ValuePeer = None,
+        stiffness: List[ValuePeer] = [],
         shear_capacity: ValuePeer = None,
+        drifts: List[FloorDrift] = [],
     ):
         self.floor_num = floor_num
         self.tower_num = tower_num
@@ -179,6 +221,7 @@ class FloorSeismicResult:
         self.disp = disp
         self.stiffness = stiffness
         self.shear_capacity = shear_capacity
+        self.drifts = drifts
 
     def __str__(self):
         return f"Flr.{self.floor_num}:Fx={self.force.x};Fy={self.force.y}"
@@ -186,6 +229,13 @@ class FloorSeismicResult:
     def __repr__(self):
         return self.__str__()
 
+    def to_json(self):
+        return {
+            "floor_num": self.floor_num,
+            "tower_num": self.tower_num,
+            "shear": self.shear.to_json(),
+        }
+
 
 class SeismicResult:
     def __init__(self, floor_result: List[FloorSeismicResult]):
@@ -214,6 +264,9 @@ class SeismicResult:
     def __repr__(self):
         return self.__str__()
 
+    def to_json(self):
+        return {"floor_result": [i.to_json() for i in self.floor_result]}
+
 
 if __name__ == "__main__":
     p_list = []

CivilTools/YDBLoader/BuildingDefine/GlobalResult/__init__.py

@@ -1,2 +1,9 @@
-from .SeismicResult import SinglePeriod, Period, ValuePeer, FloorSeismicResult, SeismicResult
+from .SeismicResult import (
+    SinglePeriod,
+    Period,
+    ValuePeer,
+    FloorSeismicResult,
+    SeismicResult,
+    FloorDrift,
+)
 from .BasicResult import SingleMassResult, MassResult

CivilTools/YDBLoader/BuildingDefine/__init__.py

@@ -1,9 +1,9 @@
 from .Beam import Beam
 from .Section import Section
-from .Geometry import Joint,Grid,StandFloor
+from .Geometry import Joint, Grid, StandFloor
 from .Column import Column
 from .Slab import Slab
 
 from .ComponentType import ComponentType
 from .GlobalResult import SingleMassResult, MassResult, Period, SinglePeriod
-from .GlobalResult import ValuePeer, FloorSeismicResult, SeismicResult
+from .GlobalResult import ValuePeer, FloorSeismicResult, SeismicResult, FloorDrift

CivilTools/YDBLoader/SQLiteConnector/Connector.py

@@ -65,6 +65,22 @@ class Connector:
             print(f"从表 {table_name} 提取数据时出错: {e}")
             return []
 
+    def extract_table_by_columns_and_filter(
+        self, table_name, column_list: List[str], limit_column: str, target_value
+    ):
+        if self.cursor is None:
+            self.connect()
+        try:
+            column_list_sql = ",".join(column_list)
+            self.cursor.execute(
+                f"SELECT {column_list_sql} FROM {table_name} WHERE {limit_column}=={target_value}"
+            )
+            rows = self.cursor.fetchall()
+            return rows
+        except sqlite3.Error as e:
+            print(f"从表 {table_name} 提取数据时出错: {e}")
+            return []
+
     def is_table_in_db(self, table_name: str):
 
         if self.cursor is None:

CivilTools/YDBLoader/SQLiteConnector/YDBTableName.py

@@ -15,6 +15,7 @@ ROTATION = "Rotation"
 
 FLOOR_NUM = "FlrNo"
 TOWER_NUM = "TowNo"
+LOAD_CASE_ID = "LDCase"
 
 
 class YDBTableName:
@@ -84,7 +85,7 @@ class YDBTableName:
     """
 
     RESULT_FLOOR_DATA_TABLE = "dsnStatFlrData"
-    """包含了大多数楼层计算结果，包括风、地震的各类外力、承载力、刚度等"""
+    """包含了大多数楼层计算结果，包括风、地震的各类外力、承载力、刚度等等"""
     RESULT_FLOOR_DATA_USEFUL_COLUMNS_SEISMIC = [
         FLOOR_NUM,
         TOWER_NUM,
@@ -94,6 +95,8 @@ class YDBTableName:
         "FlrVYInf",
         "FlrMXInf",
         "FlrMYInf",  # 4 5 6 7
+        "CZLXInf",
+        "CZLYInf",
     ]
     """ 
     0-floor_num , 
@@ -104,4 +107,81 @@ class YDBTableName:
     5-Y方向地震层间剪力,
     6-X方向地震倾覆力矩,
     7-Y方向地震倾覆力矩,
+    8-X方向抗剪承载力,
+    9-Y方向抗剪承载力,
+    """
+
+    RESULT_FLOOR_DATA_USEFUL_COLUMNS_STIFFNESS = [
+        "StiffShearCutXInf",
+        "StiffShearCutYInf",
+        "StiffShearDisXInf",
+        "StiffShearDisYInf",
+        "StiffBendXInf",
+        "StiffBendYInf",
+    ]
+    """ 
+    包含了楼层的各类刚度，剪切刚度、剪力位移计算刚度、剪弯刚度
+    0-剪切刚度X , 
+    1-剪切刚度Y , 
+    2-剪力位移计算刚度X,
+    3-剪力位移计算刚度Y,
+    4-剪弯刚度X,
+    5-剪弯刚度Y,
+    """
+
+    RESULT_FLOOR_DATA_USEFUL_COLUMNS_WIND = [
+        FLOOR_NUM,
+        TOWER_NUM,
+        "FlrWindFInf",
+        "FlrWindVInf",  # 0 1 2 3
+        "FlrWindMInf",
+    ]
+    """ 
+    0-floor_num , 
+    1-tower_num , 
+    2-XY方向顺风外力,
+    3-XY方向顺风剪力,
+    4-XY方向顺风弯矩,
+    """
+
+    DISP_FLOOR_DATA_TABLE = "dsnStatDis"
+    """包含了楼层在不同工况下的楼层位移"""
+
+    DISP_FLOOR_DATA_USEFUL_COLUMNS_WIND = [
+        FLOOR_NUM,
+        TOWER_NUM,
+        LOAD_CASE_ID,
+        "MaxFlrAngleDis",
+        "MinFlrAngleDis",
+        "MaxD",
+        "MassAveD",
+    ]
+    """
+    0-floor_num , 
+    1-tower_num , 
+    2-loadCaseID，需要做筛选
+    3-最大层间位移,
+    4-最小层间位移,
+    5-最大位移,
+    6-平均位移,
+    """
+
+    ADJUST_COEF_TABLE = "dsnStatFlrAdjCoe"
+    """楼层调整系数表格"""
+    ADJUST_COEF_USEFUL_COLUMN = [FLOOR_NUM, TOWER_NUM, "JZBCoeXInf", "JZBCoeYInf"]
+    """
+    0-floor_num , 
+    1-tower_num , 
+    2-X方向剪重比调整系数
+    3-Y方向剪重比调整系数
+    """
+
+    REAL_FLOOR_TABLE = "pmFlrAssembly"
+    """楼层调整系数表格"""
+    REAL_FLOOR_USEFUL_COLUMN = ["No", STD_FLR_ID, "Level", "Height"]
+    """
+    0-楼层编号 , 
+    1-标准层ID , 
+    2-层底高度
+    3-楼层高度
     """

CivilTools/YDBLoader/YDBLoader.py

@@ -1,6 +1,6 @@
 from .BuildingDefine import Beam, Column, Joint, ComponentType, Grid
 from .BuildingDefine import SinglePeriod, Period, MassResult, SingleMassResult
-from .BuildingDefine import ValuePeer, FloorSeismicResult, SeismicResult
+from .BuildingDefine import ValuePeer, FloorSeismicResult, SeismicResult, FloorDrift
 from .BuildingDefine.Section import Section, ShapeEnum
 from .SQLiteConnector import Connector, YDBTableName, RowDataFactory
 from .YDBType import YDBType
@@ -153,8 +153,8 @@ class YDBLoader:
         row_data = self.connector.extract_table_by_columns(table_name, useful_columns)
         mass_list = []
         for temp_mass in row_data:
-            floor_num = RowDataFactory.convert_to_int(temp_mass, 0)
-            tower_num = RowDataFactory.convert_to_int(temp_mass, 1)
+            floor_num = RowDataFactory.convert_to_int(temp_mass[0])
+            tower_num = RowDataFactory.convert_to_int(temp_mass[1])
             mass_info = RowDataFactory.extract_list(temp_mass, 2)
             dead_load = RowDataFactory.convert_to_float(mass_info[1])
             live_load = RowDataFactory.convert_to_float(mass_info[2])
@@ -199,9 +199,33 @@ class YDBLoader:
         self.__check_result_model("seismic")
         table_name = YDBTableName.RESULT_FLOOR_DATA_TABLE
         useful_columns = YDBTableName.RESULT_FLOOR_DATA_USEFUL_COLUMNS_SEISMIC
+        useful_columns_stiffness = (
+            YDBTableName.RESULT_FLOOR_DATA_USEFUL_COLUMNS_STIFFNESS
+        )
         row_data = self.connector.extract_table_by_columns(table_name, useful_columns)
+        stiffness_row_data = self.connector.extract_table_by_columns(
+            table_name, useful_columns_stiffness
+        )
+
+        table_disp_name = YDBTableName.DISP_FLOOR_DATA_TABLE
+        useful_columns_disp = YDBTableName.DISP_FLOOR_DATA_USEFUL_COLUMNS_WIND
+
+        seismic_load_cases = self.__get_seismic_loadcase_numbers()
+
+        seismic_disp_x_row_data = self.connector.extract_table_by_columns_and_filter(
+            table_disp_name, useful_columns_disp, "LDCase", seismic_load_cases[0]
+        )
+        seismic_disp_y_row_data = self.connector.extract_table_by_columns_and_filter(
+            table_disp_name, useful_columns_disp, "LDCase", seismic_load_cases[1]
+        )
+        jzb_coeff = self.__get_JZBCoe()
+        floor_height = self.__get_floor_height()
         floor_result_list = []
-        for temp_floor in row_data:
+        for i in range(len(row_data)):
+            temp_floor = row_data[i]
+            temp_floor_stiffness = stiffness_row_data[i]
+            temp_disp_x = seismic_disp_x_row_data[i]
+            temp_disp_y = seismic_disp_y_row_data[i]
             floor_num = RowDataFactory.extract_int(temp_floor, 0)
             tower_num = RowDataFactory.extract_int(temp_floor, 1)
             force_x = RowDataFactory.convert_to_float(
@@ -222,17 +246,206 @@ class YDBLoader:
             moment_y = RowDataFactory.convert_to_float(
                 RowDataFactory.extract_list(temp_floor, 7)[1]
             )
+            shear_cap_x = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor, 8)[1]
+            )
+            shear_cap_y = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor, 9)[1]
+            )
+            stiff_x_shear_cut = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor_stiffness, 0)[1]
+            )
+            stiff_y_shear_cut = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor_stiffness, 1)[1]
+            )
+            stiff_x_shear_dis = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor_stiffness, 2)[1]
+            )
+            stiff_y_shear_dis = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor_stiffness, 3)[1]
+            )
+            stiff_x_shear_bend = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor_stiffness, 4)[1]
+            )
+            stiff_y_shear_bend = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor_stiffness, 5)[1]
+            )
+
+            max_drift_disp_x = RowDataFactory.convert_to_float(temp_disp_x[3])
+            max_drift_disp_y = RowDataFactory.convert_to_float(temp_disp_y[3])
+
+            min_drift_disp_x = RowDataFactory.convert_to_float(temp_disp_x[4])
+            min_drift_disp_y = RowDataFactory.convert_to_float(temp_disp_y[4])
+
+            max_disp_x = RowDataFactory.convert_to_float(temp_disp_x[5])
+            max_disp_y = RowDataFactory.convert_to_float(temp_disp_y[5])
+
+            ave_disp_x = RowDataFactory.convert_to_float(temp_disp_x[6])
+            ave_disp_y = RowDataFactory.convert_to_float(temp_disp_y[6])
+
             force = ValuePeer(force_x, force_y)
             shear = ValuePeer(shear_x, shear_y)
             moment = ValuePeer(moment_x, moment_y)
-
+            disp = ValuePeer(
+                max_disp_x * jzb_coeff[floor_num][0],
+                max_disp_y * jzb_coeff[floor_num][1],
+            )
+            stiffness_list = [
+                ValuePeer(stiff_x_shear_cut, stiff_y_shear_cut),
+                ValuePeer(stiff_x_shear_dis, stiff_y_shear_dis),
+                ValuePeer(stiff_x_shear_bend, stiff_y_shear_bend),
+            ]
+            shear_capacity = ValuePeer(shear_cap_x, shear_cap_y)
+            drifts = [
+                FloorDrift(
+                    floor_height[floor_num],
+                    max_drift_disp_x * jzb_coeff[floor_num][0],
+                    max_drift_disp_y * jzb_coeff[floor_num][1],
+                    min_drift_disp_x * jzb_coeff[floor_num][0],
+                    min_drift_disp_y * jzb_coeff[floor_num][1],
+                    max_disp_x * jzb_coeff[floor_num][0],
+                    max_disp_y * jzb_coeff[floor_num][1],
+                    ave_disp_x * jzb_coeff[floor_num][0],
+                    ave_disp_y * jzb_coeff[floor_num][1],
+                )
+            ]
             temp_floor_result = FloorSeismicResult(
-                floor_num, tower_num, force, shear, moment
+                floor_num,
+                tower_num,
+                force,
+                shear,
+                moment,
+                disp,
+                stiffness_list,
+                shear_capacity,
+                drifts,
             )
             floor_result_list.append(temp_floor_result)
 
         return SeismicResult(floor_result_list)
 
+    def get_wind_result(self) -> SeismicResult:
+        self.__check_result_model("wind")
+        table_name = YDBTableName.RESULT_FLOOR_DATA_TABLE
+        useful_columns = YDBTableName.RESULT_FLOOR_DATA_USEFUL_COLUMNS_WIND
+        row_data = self.connector.extract_table_by_columns(table_name, useful_columns)
+
+        table_disp_name = YDBTableName.DISP_FLOOR_DATA_TABLE
+        useful_columns_disp = YDBTableName.DISP_FLOOR_DATA_USEFUL_COLUMNS_WIND
+
+        wind_load_cases = self.__get_wind_loadcase_numbers()
+
+        wind_disp_x_row_data = self.connector.extract_table_by_columns_and_filter(
+            table_disp_name, useful_columns_disp, "LDCase", wind_load_cases[0]
+        )
+        wind_disp_y_row_data = self.connector.extract_table_by_columns_and_filter(
+            table_disp_name, useful_columns_disp, "LDCase", wind_load_cases[1]
+        )
+
+        floor_result_list = []
+        floor_height = self.__get_floor_height()
+
+        for i in range(len(row_data)):
+            temp_floor = row_data[i]
+            temp_disp_x = wind_disp_x_row_data[i]
+            temp_disp_y = wind_disp_y_row_data[i]
+            floor_num = RowDataFactory.extract_int(temp_floor, 0)
+            tower_num = RowDataFactory.extract_int(temp_floor, 1)
+            force_x = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor, 2)[1]
+            )
+            force_y = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor, 2)[3]
+            )
+            shear_x = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor, 3)[1]
+            )
+            shear_y = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor, 3)[3]
+            )
+            moment_x = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor, 4)[1]
+            )
+            moment_y = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_floor, 4)[3]
+            )
+
+            max_drift_disp_x = RowDataFactory.convert_to_float(temp_disp_x[3])
+            max_drift_disp_y = RowDataFactory.convert_to_float(temp_disp_y[3])
+
+            min_drift_disp_x = RowDataFactory.convert_to_float(temp_disp_x[4])
+            min_drift_disp_y = RowDataFactory.convert_to_float(temp_disp_y[4])
+
+            max_disp_x = RowDataFactory.convert_to_float(temp_disp_x[5])
+            max_disp_y = RowDataFactory.convert_to_float(temp_disp_y[5])
+
+            ave_disp_x = RowDataFactory.convert_to_float(temp_disp_x[6])
+            ave_disp_y = RowDataFactory.convert_to_float(temp_disp_y[6])
+
+            force = ValuePeer(abs(force_x), abs(force_y))
+            shear = ValuePeer(abs(shear_x), abs(shear_y))
+            moment = ValuePeer(abs(moment_x), abs(moment_y))
+            disp = ValuePeer(123, 245)
+            drifts = [
+                FloorDrift(
+                    floor_height[floor_num],
+                    max_drift_disp_x,
+                    max_drift_disp_y,
+                    min_drift_disp_x,
+                    min_drift_disp_y,
+                    max_disp_x,
+                    max_disp_y,
+                    ave_disp_x,
+                    ave_disp_y,
+                )
+            ]
+            temp_floor_result = FloorSeismicResult(
+                floor_num, tower_num, force, shear, moment, disp, drifts=drifts
+            )
+
+            floor_result_list.append(temp_floor_result)
+        return SeismicResult(floor_result_list)
+
+    def __get_wind_loadcase_numbers(self):
+        return [2, 4]
+
+    def __get_seismic_loadcase_numbers(self):
+        return [9, 10]
+
+    def __get_JZBCoe(self):
+        if hasattr(self, "jzb_coeff"):
+            return self.jzb_coeff
+        table_name = YDBTableName.ADJUST_COEF_TABLE
+        useful_column = YDBTableName.ADJUST_COEF_USEFUL_COLUMN
+        row_data = self.connector.extract_table_by_columns(table_name, useful_column)
+        jzb_coeff = {}
+        for temp_data in row_data:
+            floor_num = RowDataFactory.extract_int(temp_data, 0)
+            # tower_num = RowDataFactory.extract_int(temp_data, 1)
+            coeff_x = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_data, 2)[1]
+            )
+            coeff_y = RowDataFactory.convert_to_float(
+                RowDataFactory.extract_list(temp_data, 3)[1]
+            )
+            jzb_coeff[floor_num] = [coeff_x, coeff_y]
+        self.jzb_coeff = jzb_coeff
+        return self.jzb_coeff
+
+    def __get_floor_height(self):
+        if hasattr(self, "floor_height"):
+            return self.floor_height
+        table_name = YDBTableName.REAL_FLOOR_TABLE
+        useful_column = YDBTableName.REAL_FLOOR_USEFUL_COLUMN
+        row_data = self.connector.extract_table_by_columns(table_name, useful_column)
+        floor_height = {}
+        for temp_data in row_data:
+            floor_num = RowDataFactory.extract_int(temp_data, 0)
+            height = RowDataFactory.extract_float(temp_data, 3)
+            floor_height[floor_num] = height
+        self.floor_height = floor_height
+        return self.floor_height
+
 
 if __name__ == "__main__":
     file_path = "testfiles/dtlmodel1.ydb"

{civil_tools_v-0.0.2.dist-info → civil_tools_v-0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: civil_tools_v
-Version: 0.0.2
+Version: 0.0.4
 Summary: A powerful tool for civil engineer in their work.
 Home-page: https://github.com/VincentXGao/civil-tools
 Author: Xinyu Gao (Vincent)

{civil_tools_v-0.0.2.dist-info → civil_tools_v-0.0.4.dist-info}/RECORD

@@ -9,9 +9,13 @@ CivilTools/DXFGenerator/DrawingAttribs.py,sha256=F3CElw80JVKxh9zYMAeQDKJSsmq-GRq
 CivilTools/DXFGenerator/LayerManager.py,sha256=_FelBJNUsnDn66ZdVqBdnfYHvQ7roAO6irgFf2mDkjQ,664
 CivilTools/DXFGenerator/__init__.py,sha256=0jtyx5QnPbhauFfgjj4I5uqCwTy-nSuKtT-tbyEUiwQ,147
 CivilTools/FigureGenerator/BasicPNGPlotter.py,sha256=7PjRuArFc4y-NYy6WQCyfkpCahVCwtipJYEKk1My1D4,1982
-CivilTools/FigureGenerator/BasicPltPlotter.py,sha256=4Fup44jHQfzlfsLX4PQWcitcp-nEOFeyNLxLqR79oa0,2210
+CivilTools/FigureGenerator/BasicPltPlotter.py,sha256=DNuBgg5qwi0kbttrNLcnAr1G1rYNunNCOaLwc5_8dzk,4002
 CivilTools/FigureGenerator/StairCalculationSheetPNGPlotter.py,sha256=iVOEY3MXu7x9D1d3W6fofPCUOHaR06lT9CsssNGqeBI,200
 CivilTools/FigureGenerator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+CivilTools/FigureGenerator/SeismicReport/Drift.py,sha256=aYzTm2hDcnpLQ_I-EPctQ2MIdjLHRE9Lr89Ns9mRYBQ,2437
+CivilTools/FigureGenerator/SeismicReport/ShearMassRatio.py,sha256=XpmPA9PeRED4Xzl_5LgJVgm9jEHuTda2GAFs5zMfVP8,2731
+CivilTools/FigureGenerator/SeismicReport/ShearMoment.py,sha256=dYa4SK20u6MJXDsLAkpGk8t2U2tu3bEmBheu5D5nHek,2660
+CivilTools/FigureGenerator/SeismicReport/__init__.py,sha256=QPYbo9DvhHmTwccgcZfsV7_TWephS_F44xbWgry9WXg,129
 CivilTools/ReportGenerator/BasicGenerator.py,sha256=h5FDZvk0X0BozZrLFWxdvcUd2JjERIVUauTscdpi8zw,11329
 CivilTools/ReportGenerator/DocParagraph.py,sha256=xJ9VWbi3IFu5nwJAS56ooQ49bCk4EBvme6IaY46DRP4,428
 CivilTools/ReportGenerator/DocPicture.py,sha256=9bJ6Zjw7Z6yB_h_H1_2wL9KZxA14zW-jmsKb_EEGxAc,246
@@ -21,11 +25,11 @@ CivilTools/ReportGenerator/SeismicReportTemplate.py,sha256=TxgRBCT0vW25AMYvuAtrV
 CivilTools/ReportGenerator/StairCalculationReport.py,sha256=gr2fafvYjTJCM4_JIiE9G5xbiy4W30TfmEjj3DW882Q,21566
 CivilTools/ReportGenerator/UtilFunctions.py,sha256=7qvAsZvoJN9pakENjBMYhrqP73xj5T4FuhSHa1t8lSA,9398
 CivilTools/ReportGenerator/__init__.py,sha256=1FVcNtNFstmE8zEFABs9oVw7rHiulvUKx0tD1GNFJ58,332
-CivilTools/YDBLoader/YDBLoader.py,sha256=zwd7TBbo4UR2JsP60XON7gGkhCASjoaRlGoxqBGqBPc,11111
+CivilTools/YDBLoader/YDBLoader.py,sha256=4-s4qvdB5gp1SF0nchOYEYJId9dqgfXgPyVaJ89J4jw,20634
 CivilTools/YDBLoader/YDBType.py,sha256=KVk_qpOwp4yAsHn96L5PAVTMMO8SU4lFOnnTMsH_qP0,109
 CivilTools/YDBLoader/__init__.py,sha256=dOomroeul9yiQQ3FZQVhnfYav43sDv1hUltoA0BrmLw,144
 CivilTools/YDBLoader/BuildingDefine/ComponentType.py,sha256=soUKmSeeY6dCO4IMrLuaF3GcOj8HgzeCQOtudTSqhno,146
-CivilTools/YDBLoader/BuildingDefine/__init__.py,sha256=er4GVwvtqOI0G-vzARApPVkS1ntbUiA2d5oa8BsBTq0,343
+CivilTools/YDBLoader/BuildingDefine/__init__.py,sha256=QKph7vyA64vRrb7ZIYCdGJE4KWOiwMbYsyd6ztmT10M,359
 CivilTools/YDBLoader/BuildingDefine/Beam/Beam.py,sha256=h84shEe7Pg8k32-2ifgpKg8IqNDKxb58kKdsMflistg,673
 CivilTools/YDBLoader/BuildingDefine/Beam/__init__.py,sha256=3H9M7yiiio2q4SfdfUv2I2uhokFZv_IOkivE1PRWXus,24
 CivilTools/YDBLoader/BuildingDefine/Column/Column.py,sha256=Sqt_IiaiAgsDTR-TLF3bGiJ4KvFsFW0y7RlXCVqkEi0,423
@@ -34,9 +38,9 @@ CivilTools/YDBLoader/BuildingDefine/Geometry/Grid.py,sha256=BVhmbu8DndZYprVATKp7
 CivilTools/YDBLoader/BuildingDefine/Geometry/Joint.py,sha256=MjJ2CkNOgnQYCbmOeauiwW63ooHwHZlGzib1v2nPnE0,725
 CivilTools/YDBLoader/BuildingDefine/Geometry/StandFloor.py,sha256=lxh5l_H9dl4udvt0zjsWVkF1JLgURC5dfisfEenHnrY,29
 CivilTools/YDBLoader/BuildingDefine/Geometry/__init__.py,sha256=8eX2KQlOvtqnJqZ8QTc8HTCEuTv6xk1JeIeFdBoGpYQ,86
-CivilTools/YDBLoader/BuildingDefine/GlobalResult/BasicResult.py,sha256=11ZxUPfHXOUsH1J4qfYApQKx3tkrK5_DoQpqnyYdbBY,1458
-CivilTools/YDBLoader/BuildingDefine/GlobalResult/SeismicResult.py,sha256=pEPeTrzzZQX7Um5wmlN9Szwb5XqRy_DBeI7Azc-DCt0,6298
-CivilTools/YDBLoader/BuildingDefine/GlobalResult/__init__.py,sha256=cquJ_qevVkhpHRKKNJl8g_3WlmOhvejV4HthYhO0ZZI,150
+CivilTools/YDBLoader/BuildingDefine/GlobalResult/BasicResult.py,sha256=5M6Y0k1pvrsC9HskmPkMvEbsIESbRkjMNUttU1Y5JBc,1817
+CivilTools/YDBLoader/BuildingDefine/GlobalResult/SeismicResult.py,sha256=SuTnjog98EnWtAy-SJA8xCEIDV_h0ZPNsOreNpvV2Lk,7848
+CivilTools/YDBLoader/BuildingDefine/GlobalResult/__init__.py,sha256=aTlINh84E9QeiGXsehcnHGoJhO9OqdFGRTpyUPeH8VY,198
 CivilTools/YDBLoader/BuildingDefine/Section/Section.py,sha256=wFWHKbrf1VUeCM2fVbrCDERGvcaTqE6gmLiV2RO7cNs,1644
 CivilTools/YDBLoader/BuildingDefine/Section/ShapeEnum.py,sha256=hTHx2wnNp1hMhRDM5upxxhgTpYGFF23rolfPpUcJFiI,856
 CivilTools/YDBLoader/BuildingDefine/Section/__init__.py,sha256=lX7D2FvzQzzZ7B6F4MnXGpAxcwbyVdJreBOZMRmsQmQ,64
@@ -46,12 +50,12 @@ CivilTools/YDBLoader/BuildingDefine/StairPart/LoadDefine.py,sha256=DYYjAlndN5J--
 CivilTools/YDBLoader/BuildingDefine/StairPart/StairComponent.py,sha256=E0VL9c0WC9CPVsf3ByXn49SExx6GKFalHRauhkawaLE,3066
 CivilTools/YDBLoader/BuildingDefine/StairPart/StairPart.py,sha256=0HLLcQbjOECbWHPKtci4mNOWv7CcgO4UVrtUyPwfeQw,8537
 CivilTools/YDBLoader/BuildingDefine/StairPart/__init__.py,sha256=Z7tqd0HHG_Wg1qFTt4kiJxofz08DLBnTywpY5vtJmZk,145
-CivilTools/YDBLoader/SQLiteConnector/Connector.py,sha256=TWr8SNdYrL3WqMVC3NqLfk6JwZmEEGNwGkEKCeeQbYM,2882
+CivilTools/YDBLoader/SQLiteConnector/Connector.py,sha256=Yw0A0buUfrQDEHYNfvUNy-NjXt80ZSFF3N1YPdtPAFc,3495
 CivilTools/YDBLoader/SQLiteConnector/RowDataFactory.py,sha256=CRStFrV9ac2bi_R1CB6LW4_MrXhMtfyOFWgrT31PkI4,1537
-CivilTools/YDBLoader/SQLiteConnector/YDBTableName.py,sha256=X71ka_a4CU39_r6_jtW2BO9nQe_wiequ4ELE77rvfVA,2614
+CivilTools/YDBLoader/SQLiteConnector/YDBTableName.py,sha256=Ab5SdIx7v-gO_MfJmwSkp9HeATi3BK58zWuZi812qeI,4624
 CivilTools/YDBLoader/SQLiteConnector/__init__.py,sha256=0WWCCdLvlX0Rp-CjcVQc9oQ2b770Zd5TcMGxWBtToS4,116
-civil_tools_v-0.0.2.dist-info/LICENSE,sha256=nq3TNN3UrfULANUGIRvaZAI1jUn6HlYeLxIRjJvDxCc,1088
-civil_tools_v-0.0.2.dist-info/METADATA,sha256=sMxhmcA6TUQynwandSb3gkIJYYxd-vHsgC3Os4QvJ9U,6184
-civil_tools_v-0.0.2.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-civil_tools_v-0.0.2.dist-info/top_level.txt,sha256=AP0ng4FJ3z78LnGOjUzZaGRMMp-lDtw91Rlia8z--wM,11
-civil_tools_v-0.0.2.dist-info/RECORD,,
+civil_tools_v-0.0.4.dist-info/LICENSE,sha256=nq3TNN3UrfULANUGIRvaZAI1jUn6HlYeLxIRjJvDxCc,1088
+civil_tools_v-0.0.4.dist-info/METADATA,sha256=73P0idnOtFmp17Fa8_ToenifeUIiLPfxaHbdN_LSD1I,6184
+civil_tools_v-0.0.4.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+civil_tools_v-0.0.4.dist-info/top_level.txt,sha256=AP0ng4FJ3z78LnGOjUzZaGRMMp-lDtw91Rlia8z--wM,11
+civil_tools_v-0.0.4.dist-info/RECORD,,