feat:合并框架其他目录文件及代码

feature/Merge-Framework-20260721
lh 1 month ago
parent 129e7251fc
commit d7fa5676db

Binary file not shown.

@ -0,0 +1 @@
77u/PD94bWwgcup_mpadmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCg0KPCEtLSDnvJbovpHkvbwzy/nlKggWE1MU3B5IHYyMDA2IFUgKGh0dHA6Ly93d3cuYWx0b3ZhLmNvbSkg55SxIGFueSAoYW55KSAtLT4NCjwhLS0qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi0tPg0KPCEtLSAgICDmnKzmlofmoaPnmoTnm67nmoTmmK/kuLrmmbrog73or5XkupXpg6jliIbmj5DkvpvkuIDkuKp4bWzop6PmnpDnmoREZW1vICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KPCEtLSAgICBBdXRob3Iocyk6IHdhbmd6ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0+DQo8IS0tICAgIENyZWF0ZWQgRGF0ZTogMjAyNjA3MTMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtLT4NCjwhLS0gICAgTW9kaWZpZWQgRGF0ZTogMjAyNjA3MTMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0+DQo8IS0tKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi0tPg0KDQo8IS0tKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi0tPg0KPCEtLSBJdGVtIOivtOaYjiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtLT4NCjwhLS0gICAgTmFtZe+8miAg6Iux5paH5qCH6K+GICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KPCEtLSAgICBBbGlhc++8miDliKvlkI3vvIzkuK3mlofmoIfor4YgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KPCEtLSAgICBUYWfvvJogICDlhoXpg6jmoIfor4YgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0+DQo8IS0tICAgIFBhcmFz77yaIOWPguaVsOWIl+ihqCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtLT4NCjwhLS0gICAgUmVzQ29kZXPvvJog5rK56JeP57G75Z6L57yW56CBICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KPCEtLSAgICBBdW3vvJog5p6a5Li+57G75Z6L77yM5LiOYWlVc2VNb2Rl5a6a5LmJ5Lil5qC85a+55bqU77yMMO+8muaemuS4vjEgIDHvvJrmnprkuL4yICAy77ya5YW25LuWICAgICAgICAgICAgLS0+DQo8IS0tICAgIHNUaXBz77yaICAgIOWHveaVsOaOpeWPo+ivtOaYjuS/oeaBryAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KDQo8Um9vdD4NCjxJdGVtIE5hbWU9IkRlbW9Ob2RlMSIgVGFnPSJ0YWcxIiBQYXJhcz0iSztTIiBOdW09IjAiIC8+DQo8SXRlbSBOYW1lPSJEZW1vTm9kZTIiIEFsaWFzPSLoioLngrkyIiBUYWc9InRhZzIiIFBhcmFzPSJLO1M7cnciIEF1bT0iMSIgLz4NCjxJdGVtIE5hbWU9IkRlbW9Ob2RlMyIgQWxpYXM9IuiKgueCuTMiIFRhZz0idGFnMyIgUGFyYXM9Iks7UztydyIgQXVtPSIyIiAvPg0KPC9Sb290Pg0K

@ -0,0 +1 @@
77u/PD94bWwgcup_mpadmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCg0KPCEtLSDnvJbovpHkvbwzy/nlKggWE1MU3B5IHYyMDA2IFUgKGh0dHA6Ly93d3cuYWx0b3ZhLmNvbSkg55SxIGFueSAoYW55KSAtLT4NCjwhLS0qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi0tPg0KPCEtLSAgICDmnKzmlofmoaPnmoTnm67nmoTmmK/kuLrmmbrog73or5XkupXpg6jliIbmj5DkvpvkuIDkuKp4bWzop6PmnpDnmoREZW1vICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KPCEtLSAgICBBdXRob3Iocyk6IHdhbmd6ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0+DQo8IS0tICAgIENyZWF0ZWQgRGF0ZTogMjAyNjA3MTMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtLT4NCjwhLS0gICAgTW9kaWZpZWQgRGF0ZTogMjAyNjA3MTMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0+DQo8IS0tKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi0tPg0KDQo8IS0tKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi0tPg0KPCEtLSBJdGVtIOivtOaYjiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtLT4NCjwhLS0gICAgTmFtZe+8miAg6Iux5paH5qCH6K+GICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KPCEtLSAgICBBbGlhc++8miDliKvlkI3vvIzkuK3mlofmoIfor4YgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KPCEtLSAgICBUYWfvvJogICDlhoXpg6jmoIfor4YgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0+DQo8IS0tICAgIFBhcmFz77yaIOWPguaVsOWIl+ihqCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtLT4NCjwhLS0gICAgUmVzQ29kZXPvvJog5rK56JeP57G75Z6L57yW56CBICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KPCEtLSAgICBBdW3vvJog5p6a5Li+57G75Z6L77yM5LiOYWlVc2VNb2Rl5a6a5LmJ5Lil5qC85a+55bqU77yMMO+8muaemuS4vjEgIDHvvJrmnprkuL4yICAy77ya5YW25LuWICAgICAgICAgICAgLS0+DQo8IS0tICAgIHNUaXBz77yaICAgIOWHveaVsOaOpeWPo+ivtOaYjuS/oeaBryAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPg0KDQo8Um9vdD4NCjxJdGVtIE5hbWU9IkRlbW9Ob2RlMSIgVGFnPSJ0YWcxIiBQYXJhcz0iSztTIiBOdW09IjAiIC8+DQo8SXRlbSBOYW1lPSJEZW1vTm9kZTIiIEFsaWFzPSLoioLngrkyIiBUYWc9InRhZzIiIFBhcmFzPSJLO1M7cnciIEF1bT0iMSIgLz4NCjxJdGVtIE5hbWU9IkRlbW9Ob2RlMyIgQWxpYXM9IuiKgueCuTMiIFRhZz0idGFnMyIgUGFyYXM9Iks7UztydyIgQXVtPSIyIiAvPg0KPC9Sb290Pg0K

File diff suppressed because one or more lines are too long

@ -0,0 +1,44 @@
# 曲线配置文件
# 格式: 曲线名称=可见性,曲线类型,线条R,G,B,线宽,线型,点是否显示,点样式,点R,G,B,点半径,点填充
# ===== 实际曲线组 =====
Souce=0,14,255,0,0,0,1,1,6,0,255,0,0.3,1
Deriv=0,14,255,0,0,0,1,1,3,255,0,0,0.4,0
Souce_Raw=0,14,255,0,0,0,1,1,6,0,128,0,0.4,0
Deriv_Raw=0,14,255,0,0,0,1,1,3,128,0,0,0.4,0
NoOverlay_Deriv=0,14,255,0,0,0,1,1,3,255,0,0,0.4,0
SmallSig=0,14,255,0,0,0,1,1,7,255,0,0,0.4,0
# ===== 理论曲线组 =====
TheorySouce=1,14,255,0,0,0,1,0,0,255,0,0,0.4,0
TheoryDeriv=1,14,105,105,105,0,1,0,0,255,0,0,0.4,0
NoOverlay_TheoryDeriv=1,14,105,105,105,0,1,0,0,255,0,0,0.4,0
Ppd=0,14,255,0,255,0,1,1,3,255,0,255,0.4,0
TheorySmallSig=1,14,105,105,105,0,1,0,0,255,0,255,0.4,0
# ===== 历史曲线组 =====
HistorySouce=0,14,105,105,105,0,1,1,7,255,0,0,0.4,0
HistoryFit=1,14,0,255,0,0,1,0,0,255,0,0,0.4,0
HistorySouceF=1,16,255,0,0,0,1,0,0,255,0,0,0.4,0
# ===== 半对数曲线组 =====
SemiSouce=0,14,255,0,0,0,1,1,6,255,0,0,0.4,0
SemiTheorySouce=1,14,0,255,0,0,1,0,0,255,0,0,0.4,0
# ===== IPR曲线组 =====
IprSource=0,15,255,0,0,0,1,1,3,255,0,0,0.4,0
IprFit=1,14,0,255,0,0,1,0,3,255,0,0,0.4,0
IprFitEx=1,14,0,128,0,0,1,0,3,255,0,0,0.4,0
IprResult=1,14,0,0,255,0,1,0,3,255,0,0,0.4,0
IprResultEx=0,14,0,0,255,0,1,1,5,0,0,255,1,1
# ===== WDT曲线组 =====
WdtSource=0,15,255,0,0,0,1,1,3,255,0,0,0.6,0
WdtFit=1,14,0,255,0,0,1,1,3,255,0,0,0.6,0
WdtFitEx=1,14,0,128,0,0,1,0,3,255,0,0,0.6,0
WdtResult=1,14,0,0,255,0,1,1,3,255,0,0,0.8,1
WdtResultEx=0,14,0,0,255,0,1,1,5,0,0,255,0.8,1
# ===== 其他曲线 =====
Ppd=0,14,255,0,255,0,1,1,3,255,0,255,0.4,0
s_Ppd_Curve=1,14,255,0,255,0,1,0,0,255,0,0,0.4,0

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,8 +1,12 @@
;系统加载数据时的单位模糊匹配配置
[Global]
Date = {日}{年}{月}{Day}{Time}{Year};
Time = {时间}{time}{Time}{T};
DateTime = {时间}{Time}{T};
Date = {日}{年}{月}{Day}{Date}{Time}{Year};
Time = {时间}{time}{Time};
DateTime = {时间} {时}{Time};
Pressure = {Pressure}{Pre}{P}{压};
Fluid = {流}{率}{量};
FlowRate = {流}{率}{量};
Temprature = {Temprature}{温}{Temp};
ProdOil = {ProdOil}{油}{Oil}{O};
ProdGas = {ProdGas}{气}{Gas}{G};
ProdWater = {ProdWater}{水}{Water}{W};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

@ -3111,29 +3111,29 @@ make sure to continue?</source>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableModel.cpp" line="68"/>
<source>Total</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableModel.cpp" line="153"/>
<source>Layer Name</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableModel.cpp" line="154"/>
<source>Thickness
(m)</source>
<translation type="unfinished"></translation>
<translation>(m)</translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableModel.cpp" line="155"/>
<source>Ratio
(%)</source>
<translation type="unfinished"></translation>
<translation>(%)</translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableModel.cpp" line="156"/>
<source>Remark</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableModel.cpp" line="249"/>
@ -3146,22 +3146,22 @@ make sure to continue?</source>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableView.cpp" line="18"/>
<source>Add Layer</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableView.cpp" line="22"/>
<source>Insert Layer</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableView.cpp" line="26"/>
<source>Delete Layer</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerTableView.cpp" line="32"/>
<source>Set Row Count</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@ -3169,53 +3169,53 @@ make sure to continue?</source>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="32"/>
<source>Layer Configuration</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="67"/>
<source>Add</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="68"/>
<source>Insert</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="69"/>
<source>Delete</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="89"/>
<source>Num:</source>
<translation type="unfinished"></translation>
<translation>:</translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="125"/>
<source>OK</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="126"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="222"/>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="273"/>
<source>Cannot delete. Minimum 2 layers are required.</source>
<translation type="unfinished"></translation>
<translation>.</translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="237"/>
<source>Set Row Count</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiAnal/iLayerWx.cpp" line="238"/>
<source>Enter number of rows (2-50):</source>
<translation type="unfinished"></translation>
<translation>(2-50):</translation>
</message>
</context>
<context>
@ -13322,13 +13322,13 @@ remove this name from recent directory lists?</source>
<location filename="../../../../Src/mGui/mGuiSysManager/iWxWelcomeNewEx.cpp" line="2012"/>
<source>This project is deleted or destroyed,
remove this name from recent directory lists?</source>
<translation type="unfinished">?</translation>
<translation>?</translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiSysManager/iWxWelcomeNewEx.cpp" line="2055"/>
<source>No WTAI projects in this directory,
remove this name from recent directory lists?</source>
<translation type="unfinished">?</translation>
<translation>?</translation>
</message>
<message>
<location filename="../../../../Src/mGui/mGuiSysManager/iWxWelcomeNewEx.cpp" line="1414"/>

File diff suppressed because one or more lines are too long

@ -28,6 +28,8 @@ username = WANGZG
Password = fk20258888
SQLiteByWell = 0; 是否一口井一个db文件模式1其它
WellTestStar = 0; 新疆试井之星1其它
TempBindingP = 1; 是否支持温度数据(指的是加载压力时,是否同步考虑温度)
OgwBindingF = 0; 是否支持多相数据(指的是加载流量时,是否同步考虑油气水多相)
;项目树中的数据节点
[ProjTreeInfos]
@ -83,7 +85,8 @@ wColCountPerPage = 2; 导出word时表格数据每页多少表格并排
wLineCountPerSpan = 461e8b88f5f7119a7c45dc91a59fa029; 导出word时内部描述信息
NaviShowMode = 1; 模型导航模式1为菜单模式其它原来模式
SegMaxToTrim = 5; 一旦流动段多于该数,则仅仅对当前段进行处理
CustomThin = 1; 是否允许定制抽稀参数
CustomThin = 0; 是否允许定制抽稀参数
UnitConvert = 1; 是否允许单位转换
TailorOffset = 0; (范围0-50%)
BaseResolutionW = 1920; 基准分辨率 1024 1920
BaseResolutionH = 1080;768 1080

@ -84,10 +84,87 @@ div.block_latest
<div class='block_latest'>
<h2 class="title_latest">软件版本20260605[临时版本]</h2>
<h2 class="title_latest">软件版本20260720</h2>
<ol>
<li>优化:调整优化直井平行、交叉、矩形边界等北京模型相关内容</li>
<li>优化:规范水平井支持的边界类型,不支持变灰</li>
<li>优化:底边界默认不渗透</li>
<li>优化:表格粘贴时自动匹配标题信息</li>
<li>新增:新增 SubGroupTag显示的子项分组的名称</li>
<li>新增:温度数据加载</li>
<li class="li_important_latest">新增多相产量数据加载改变原先在选择PVT界面加载的方式</li>
<li>新增:数据加载,自动解析行列名称及单位(模糊关联)</li>
<li>新增:单位允许下拉调整,保存时自动转换为系统内部数据单位</li>
<li>新增:自动判断起始行</li>
<li>新增增加tryparse接口方便快速解析基础信息</li>
<li>新增:注册构建智能试井相关模块接口及对象</li>
<li class="li_important_latest">修复:地层压力参与自动拟合的逻辑修复(上几个版本总是需要好多次拟合)</li>
<li>修复:双对数图 滚动放大缩小时候,刻度显示不出来问题</li>
<li>修复Excel如果左侧或上侧为空的话其初始是从 m_nRowStart和m_nColStart开始的已经修复</li>
<li>修复:单位转换出现负值问题</li>
</ol>
<h2 class="title">软件版本20260703</h2>
<ol>
<li class="li_important">新增:压裂直井、水平井、压裂水平井的干扰模型</li>
<li>新增:探测半径计算功能</li>
<li>新增:干扰参数支持配置化,不完全依赖于常规解析部分</li>
<li>优化PVT高级功能界面显示隐藏逻辑</li>
<li>优化PVT右侧表格数据显示格式优化</li>
<li>优化TC/PC计算界面优化调整增加H2S/CO2/N2</li>
<li>优化:调整优化等效渗透率逻辑,不再反算</li>
<li>优化:特征线逻辑处理(干扰+无井储)</li>
<li>优化:单位配置文件更新</li>
<li>优化曲线模版改成配置模式增加CurveStyles.ini方便产能扩展</li>
<li>优化:优化刻度间隔显示,先前可能出现不等间隔</li>
<li>优化:双对数图 滚动坐标轴时候 出现不是标准的正方形网格的问题</li>
<li>优化升级ZxTableView</li>
<li>优化:优化属性控件,对于子项动态为空的优化处理</li>
<li>优化:参数显示顺序问题,比如水平渗透率/垂直渗透率隔开</li>
<li>优化:拆分器支持更多灵活接口,方便产能功能集成</li>
<li>优化:新建井,井径增加单位下拉,方便后续统一切换单位</li>
<li>优化:弹窗增加 Qt::WA_DeleteOnClose 标识,规避内存泄露</li>
<li>优化:避免流动段右键重复弹窗问题</li>
<li>优化:自动拟合界面优化,支持分级显示、与左侧输入顺序保存基本一致</li>
<li>修复:多层下地层压力显示不出来的问题</li>
<li>修复:表格中修改压力数值,出错信息</li>
<li>修复:调整凝析气/多相逻辑,确保多相数据</li>
<li>修复:打开图件时候,双对数曲线,未统一绑定</li>
<li>修复:裂缝条数子项信息序列化有误</li>
<li>修复:两段产量等,拟合崩溃问题</li>
<li>修复:可能得启动压力梯度无效问题</li>
<li>调整根据zoucm建议表格默认居中</li>
<li>调整:裂缝条数、压裂段数等不参与拟合</li>
</ol>
<h2 class="title">软件版本20260618</h2>
<ol>
<li class="li_important">更新H变井储震荡问题</li>
<li class="li_important">更新:大幅优化调整抽稀算法</li>
<li>更新:抽稀因数改为目标点数</li>
<li>更新:缝洞溶孔统一改成基质</li>
<li>更新丰富PVT多相参数获取接口供数值使用</li>
<li>更新误差函数erfc</li>
<li>新增:北京压裂模型表皮系数更改为 裂缝表皮系数限制范围0-1</li>
<li>新增mToolBatch类库、iAlgAI类库</li>
<li>新增ZxDoubleSpinBox以支持小数位数灵活显示</li>
<li>新增:劈分按钮</li>
<li>优化:多相折算</li>
<li>优化:规范公区/项目的命名</li>
<li>优化:井位坐标偏大时,边界距离绘图不准问题</li>
<li>优化个别XML解析未屏蔽注释部分</li>
<li>修复总表皮因子计算xf问题</li>
<li>修复Ribbon缩放引起的背景图片问题</li>
<li>修复Ribbon折叠个别情况下判断不准</li>
<li>修复个别机器下Debug会无法启动应用程序</li>
</ol>
<div class='block'>
<h2 class="title">软件版本20260605[临时版本]</h2>
<ol>
<li class="li_important_latest">新增:首页面更换</li>
<li class="li_important_latest">新增Ribbon支持缩放</li>
<li class="li_important">新增:首页面更换</li>
<li class="li_important">新增Ribbon支持缩放</li>
<li class="li_important">新增:北京压裂模型增加总表皮系数</li>
<li class="li_important">修复:小信号图形错误问题</li>
<li>新增:北京压裂模型表皮系数更改为 裂缝表皮系数限制范围0-1</li>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1020 B

@ -131,6 +131,8 @@
<Btn ID="713" Name="nmDeleteOneObj" Text="" CheckMode="0" Icon="InsertLine" Tips="删除" />
<Btn ID="714" Name="nmInsertRegionMark" Text="" CheckMode="0" Icon="InsertLine" Tips="标记区域" />
<Btn ID="715" Name="nmInsertObjLineMeasure" Text="" CheckMode="0" Icon="InsertLine" Tips="测量" />
<!-- PVT相关 -->
<Btn ID="800" Name="BasicOption" Text="" Icon="PvtBasicOption" Tips="基础选项" />
<Btn ID="801" Name="PhaseOil" Text="" Icon="PhaseOil" Tips="油相" />
@ -142,6 +144,12 @@
<Btn ID="807" Name="PseuPressure3" Text="" Icon="PsedoP3" Tips="计算三区拟压力" />
<Btn ID="808" Name="PseuPressureC" Text="" Icon="PsedoPC" Tips="组分含量计算拟压力" />
<!-- 智能试井相关功能 -->
<Btn ID="851" Name="aiInsertObjPoint" Text="" CheckMode="0" Icon="InsertPoint" Tips="[样例]插入点" />
<Btn ID="852" Name="aiInsertObjLine" Text="" CheckMode="0" Icon="InsertLine" Tips="[样例]插入线" />
<Btn ID="853" Name="aiInsertObjPolygon" Text="" CheckMode="0" Icon="InsertPolygon" Tips="[样例]插入多边形" />
<!-- 产液段图形相关 -->
<Btn ID="900" Name="EquLayout" Text="" Icon="EquLayout" Tips="等间隔布局" />
<Btn ID="901" Name="AllSeg" Text="" Icon="AllSeg" Tips="产液段整体操作" />
@ -228,6 +236,14 @@
<Cmds IDs="508;509;510;999" />
</Chart>
<!-- WDT数据结果图模式;102-->
<Chart Type="WDT_Result_Show">
<Cmds IDs="208;206" />
<Cmds IDs="301;310;304" />
<Cmds IDs="401;402;403;404" />
<Cmds IDs="508;509;510;999" />
</Chart>
<!-- 流量压力(处理结果的历史曲线,上下模式);105;106;102 -->
<Chart Type="HIST_Type_PF">
@ -300,6 +316,15 @@
<Cmds IDs="508;509;510;999" />
</Chart>
<!-- 智能试井2D绘图样例配置;511 -->
<Chart Type="AiDemo2DType">
<Cmds IDs="851;852;853" />
<Cmds IDs="200;201;;208" />
<Cmds IDs="301;302;303;300;310;304" />
<Cmds IDs="401;402;403;404" />
<Cmds IDs="508;509;510;999" />
</Chart>
<!-- Rst Fit配置 -->
<Chart Type="RstFitType">
<Cmds IDs="301;300;310;304" />

@ -327,7 +327,7 @@
</Tab>
<Tab ID="401" Name="IPR" Alias="产能试井(P)" >
<Tab ID="401" Name="WDT" Alias="产能试井(P)" >
<Group Name="AnalEdit" Alias="分析管理">
<Cmd ID="3006" Bounds="0,0" Name="AnalNew" Alias="新建分析" Icon="JobNew" />
@ -340,14 +340,14 @@
</Group>
<Group Name="WdtDataPreprocess" Alias="数据预处理" Visible="0">
<Cmd ID="6101" Bounds="0,0,2,1" Name="WdtDataAssn" Alias="数据归一化" ExtInfo="IPR" Icon="IPRAnal" Visible="0"/>
<Cmd ID="6101" Bounds="0,0,2,1" Name="WdtDataAssn" Alias="数据归一化" ExtInfo="WDT" Icon="IPRAnal" Visible="0"/>
<Cmd ID="6102" Bounds="0,1,2,1" Name="WdtOther" Alias="其它" Icon="WdtOther" Visible="0" />
<Cmd ID="6103" Bounds="0,3,2,1" Name="WdtWMF" Alias="井筒多相流" Icon="WdtWMF" Visible="0"/>
<Cmd ID="6104" Bounds="0,4,2,1" Name="WdtChoke" Alias="嘴流" Icon="WdtChoke" Visible="0"/>
</Group>
<Group Name="IPR" Alias="产能分析">
<Cmd ID="6201" Bounds="0,0,2,1" Name="WdtIPRCal" Alias="储层产能计算" Icon="IPRCal" />
<Cmd ID="6201" Bounds="0,0,2,1" Name="WdtIPRCal" ExtInfo="WDT" Alias="储层产能计算" Icon="IPRCal" />
<Cmd ID="6202" Bounds="0,1,2,1" Name="WellPdty" Alias="一体化产能" Icon="WellPdty" Visible="0" />
<Cmd ID="6203" Bounds="0,2,2,1" Name="WdtIPRExt" Alias="产能试井[扩展]" Icon="IPRExt"/>
<Cmd ID="6204" Bounds="0,3,2,1" Name="WdtIPRAnal" Alias="储层产能分析" Icon="IPRAnal" />
@ -355,7 +355,7 @@
</Group>
<Group Name="IPR" Alias="产能计算">
<Cmd ID="6301" Bounds="0,0,2,1" Name="WdtCal" Alias="计算" Icon="RunEx" />
<Cmd ID="6301" Bounds="0,0,2,1" Name="WdtCal" Alias="计算" ExtInfo="WDT" Icon="RunEx" />
</Group>
@ -376,7 +376,7 @@
</Tab>
<Tab ID="6" Name="AdvancedFunction" Alias="高级功能(X)" >
<Tab ID="6" Name="AdvancedFunction" Alias="试井设计(X)" >
<Group Name="Design" Alias="试井设计">
<Cmd ID="6001" Bounds="0,0,2,1" Name="TestDesign" Alias="试井设计" Icon="TestDesign" ExtInfo="PF" />
@ -427,16 +427,29 @@
</Tab>
<Tab ID="7" Name="SysTool" Alias="系统配置工具(T)" Visible="0" >
<Tab ID="7" Name="AiTest" Alias="智能试井(I)">
<Group Name="SysTool" Alias="配置工具">
<Cmd ID="7001" Bounds="0,1,2,1" Name="SysTools" Alias="系统配置工具" Icon="SysTools" />
<Group Name="Demo1" Alias="样例菜单1">
<Cmd ID="7001" Bounds="0,0,2,1" Name="ActionName1" Alias="临时测试1" Icon="TODO1" />
<Cmd ID="7002" Bounds="0,1,2,1" Name="ActionName2" Alias="临时测试2" Icon="TODO2" />
</Group>
<Group Name="ModelManager" Alias="模型管理">
<Cmd ID="7002" Bounds="0,0,2,1" Name="ModelScan" Alias="模型查看" Icon="ModelScan" />
<Group Name="Demo2" Alias="样例菜单2">
<Cmd ID="7101" Bounds="0,0,2,1" Name="ActionName3" Alias="临时测试3" Icon="TODO3" />
<Cmd ID="7102" Bounds="0,1,2,1" Name="ActionName4" Alias="临时测试4" Icon="TODO4" />
</Group>
<Group Name="Demo3" Alias="样例菜单3">
<Cmd ID="7201" Bounds="0,0,2,1" Name="ActionName4" Alias="临时测试5" Icon="TODO5" />
<Cmd ID="7202" Bounds="0,1,2,1" Name="ActionName5" Alias="临时测试6" Icon="TODO6" />
</Group>
<Group Name="NmDebug" Alias="框架测试(Debug)">
<Cmd ID="7999" Bounds="0,0,2,1" Name="NmDebug" Alias="框架代码调试" Icon="PrepareGrid" />
</Group>
</Tab>
<Tab ID="8" Name="Result" Alias="成果管理(R)" >

@ -42,6 +42,7 @@
10——具有"SubItems"属性,普通的模式,比如 层数据CO2
11——[废弃]下拉Cmb针对模型选项的进一步扩展需要动态填充的 "ItemOptions"属性可有可无
12——按钮类点击后弹出表格数据注意本身只是单纯的表格可以由外部截获消息进行自行定制
13——Double数值 扩展 按钮类,比 Double数值 多了一个按钮,点击后,由外部控制,比如重新计算该项
UseMode: 解释参数应用场合:
0——适用所有不需配置
@ -72,6 +73,7 @@
SubItems 配置子项,比如产液段数
SubGroupTag显示的子项分组的名称
Format 日期型参数,显示的样式,暂未启用
ItemOptions子项对于下拉框比如 封闭、定压等固定的内容
Text 字符串参数、或者 图像的路径
@ -193,19 +195,19 @@
<ParaItem Name="gamma" Alias="渗透率模量" Unit="1/MPa" Default="0.001" Max="1" Min="0" Scientific="1" Digit="10" Desc="stress sensitivity coefficient"/>
<ParaItem Name="delpat" Alias="裂缝半长变化因子" Unit="" Default="5" Max="1000" Min="0.1" Digit="3" Desc="fracture shrinkage coefficient"/>
<ParaItem Name="Nq" Alias="产量段数" Default="2" Max="6" Min="2" ParaType="8" Desc="number of liquid sections" SubItems="NqA;NqX;NqL;NqQ"/>
<ParaItem Name="Nq" Alias="产量段数" Default="2" Max="6" Min="2" UseMode="4" ParaType="8" Desc="number of liquid sections" SubItems="NqA;NqX;NqL;NqQ" SubGroupTag="产量段#"/>
<ParaItem Name="NqA" Alias="角度" Min="1e-05" Max="360" Unit="°" Default="90" Digit="3" Tips="" Desc="location of liquid section" />
<ParaItem Name="NqX" Alias="位置" Unit="m" Default="30" Max="10000" Min="1e-05" Digit="3" Desc="location of liquid section"/>
<ParaItem Name="NqL" Alias="长度" Unit="m" Default="60" Max="10000" Min="1e-05" Digit="3" Desc="lengh of liquid section"/>
<ParaItem Name="NqQ" Alias="产量" Unit="m^3" Default="10" Max="1000000" Min="1e-05" Digit="3" Desc="liquid production of liquid section"/>
<ParaItem Name="Nf" Alias="压裂段数" Default="4" Max="6" Min="1" UseMode="4" Desc="number of fracture sections" SubItems="NqQ"/>
<ParaItem Name="Nf" Alias="压裂段数" Default="4" Max="6" Min="1" UseMode="4" Desc="number of fracture sections" SubItems="NqQ" SubGroupTag="压裂段"/>
</ParaGroup>
<ParaGroup Name="" Alias="储层参数">
<ParaItem Name="Transmissibility" Alias="地层系数" Unit="mD.m" Default="100" Max="1e+30" Min="0" Digit="6" UseMode="7" Desc="Transmissibility"/>
<ParaItem Name="Rc" Alias="探测半径" Unit="m" Default="100" Max="1e+30" Min="0" Digit="3" UseMode="7" Desc="radius of investigation"/>
<ParaItem Name="dt" Alias="测试时间" Unit="h" Default="100" Max="1e+30" Min="0" Digit="6" UseMode="7" Desc="test time"/>
<ParaItem Name="Transmissibility" Alias="地层系数" LayerMode="1" Unit="mD.m" Default="100" Max="1e+30" Min="0" Digit="6" UseMode="7" Desc="Transmissibility"/>
<ParaItem Name="Rc" Alias="探测半径" LayerMode="1" Unit="m" Default="100" Max="1e+30" Min="0" Digit="3" UseMode="7" Desc="radius of investigation"/>
<ParaItem Name="dt" Alias="测试时间" LayerMode="1" Unit="h" Default="100" Max="1e+30" Min="0" Digit="6" UseMode="7" Desc="test time"/>
<ParaItem Name="K" Alias="渗透率" Unit="mD" Default="5" Max="10000" Min="0" Digit="6" Desc="permeability"/>
<ParaItem Name="K1MP" Alias="渗透率1" Unit="mD" Default="5" Max="10000" Min="0.001" Digit="6" Desc="1st permeability of dual permeability"/>
@ -393,6 +395,7 @@
<ParaItem Name="zw" Alias="垂向井位" Unit="m" Default="5" Max="10000" Min="1e-05" Digit="3" Desc="生产段中心距储层底部距离(vertical well position)"/>
<ParaItem Name="xf" Alias="裂缝半长" Unit="m" Default="50" Max="10000" Min="1e-05" Digit="6" Desc="fracture half-length"/>
<ParaItem Name="theta_f" Alias="裂缝倾角" Unit="°" Default="0" Max="360" Min="0" Digit="3" Desc="fracture angle"/>
<ParaItem Name="wf" Alias="裂缝宽度" Unit="m" Default="0.001" Max="1" Min="1e-05" Digit="6" Desc="fracture width"/>
<ParaItem Name="Fc" Alias="裂缝导流能力" Unit="mD.m" Default="10000" Max="1e+30" Min="1e-05" Digit="3" Desc="fracture conductivity"/>
<ParaItem Name="Fc1" Alias="裂缝导流能力1" Unit="mD.m" Default="15000" Max="1e+30" Min="1e-05" Digit="3" Desc="fracture conductivity1"/>
@ -438,14 +441,14 @@
<ParaItem Name="XfPosX" Alias="裂缝坐标X" Unit="m" Default="0" Digit="3" Desc="Xf Pos X"/>
<ParaItem Name="XfPosY" Alias="裂缝坐标Y" Unit="m" Default="0" Digit="3" Desc="Xf Pos Y"/>
<ParaItem Name="nf" Alias="裂缝条数" Default="2" Min="2" Max="1000" ParaType="7" Desc="number of liquid sections" SubItems="XfPosX;XfPosY;xf;Fc"/>
<ParaItem Name="nf" Alias="裂缝条数" Default="2" Min="2" Max="1000" UseMode="4" ParaType="7" Desc="number of liquid sections" SubItems="XfPosX;XfPosY;xf;Fc" SubGroupTag="裂缝#"/>
</ParaGroup>
<ParaGroup Name="Bdy" Alias="边界" >
<ParaItem Name="top" Alias="顶边界" LayerMode="2" Default="0" ParaType="6" BdyType="1" ItemOptions="不渗透;定压" Desc="top boundary"/>
<ParaItem Name="bottom" Alias="底边界" LayerMode="2" Default="1" ParaType="6" BdyType="1" ItemOptions="不渗透;定压" Desc="bottom boundary"/>
<ParaItem Name="bottom" Alias="底边界" LayerMode="2" Default="0" ParaType="6" BdyType="1" ItemOptions="不渗透;定压" Desc="bottom boundary"/>
<ParaItem Name="x1" Alias="边界距离1" LayerMode="2" Unit="m" Default="50" Max="10000" Min="1e-05" Digit="3" BdyType="0" Desc="boundary distance1"/>
<ParaItem Name="x2" Alias="边界距离2" LayerMode="2" Unit="m" Default="50" Max="10000" Min="1e-05" Digit="3" BdyType="0" Desc="boundary distance2"/>
@ -497,6 +500,7 @@
<ParaItem Name="ro" Alias="油相比重" Unit="" Default="0.8" Max="10000" Min="1e-05" Digit="3" Desc="oil gravity"/>
<ParaItem Name="rg" Alias="气相比重" Unit="" Default="0.7" Max="10000" Min="1e-05" Digit="3" Desc="gas gravity"/>
<ParaItem Name="Psep" Alias="分离器压力" Unit="MPa" Default="0.791111" Max="10000" Min="1e-05" Digit="6" Desc="separator pressure"/>
<ParaItem Name="Pbtm" Alias="井底压力" Unit="MPa" Default="0.1" Max="10000" Min="1e-05" Digit="6" Desc="separator pressure"/>
<ParaItem Name="Tsep" Alias="分离器温度" Unit="℃" Default="15.5556" Max="10000" Min="-460" Digit="6" Desc="separator temperature"/>
<ParaItem Name="rt" Alias="油藏温度" Unit="℃" Default="100" Max="10000" Min="-274" Digit="3" Desc="reservoir temperature"/>
<ParaItem Name="yg" Alias="气体摩尔分数" Unit="" Default="0.50245" Max="1" Min="0" Digit="3" Desc="gas mole fraction"/>

@ -21,7 +21,7 @@
Unit 单位,默认
Default 默认值
Max 最大值
Max 最小值
Min 最小值
Digit 小数位数
Scientific 是否以科学计数法表示20260413 Added
Readonly 是否只读

@ -1,252 +1,335 @@
<?xml version="1.0" encoding="UTF-8"?>
<Root>
<TypeOf>
<UnitGroup Type="compressibility" Name="compressibility">
<Unit Remark=" " Unit="1/MPa" k="1"/>
<Unit Remark=" " Unit="1/Pa" k="1e6"/>
<Unit Remark=" " Unit="1/psi" k="145.038"/>
<Unit Remark=" " Unit="1/atm" k="9.86923"/>
<!-- ==================== 第01组长度 ==================== -->
<UnitGroup Type="length" Name="length">
<Unit ID="U0101" Unit="m" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U0102" Unit="km" k="1000" Digit="0"/>
<Unit ID="U0103" Unit="cm" k="0.01" Digit="3"/>
<Unit ID="U0104" Unit="mm" k="0.001" Digit="4"/>
<Unit ID="U0105" Unit="in" k="0.0254" Digit="4"/>
<Unit ID="U0106" Unit="ft" k="0.3048" Digit="4"/>
<Unit ID="U0107" Unit="yd" k="0.9144" Digit="4"/>
<Unit ID="U0108" Unit="mi" k="1609.34" Digit="2"/>
<Unit ID="U0109" Unit="nmile" k="1852" Digit="0"/>
<Unit ID="U0110" Unit="nm" k="1e-09" Digit="6"/>
</UnitGroup>
<UnitGroup Type="density" Name="density">
<Unit Remark=" " Unit="g/cm^3" k="1"/>
<Unit Remark=" " Unit="kg/m^3" k="0.001"/>
<Unit Remark=" " Unit="lb/ft^3" k="0.01602"/>
<Unit Remark=" " Unit="lb/gal(US)" k="0.119826"/>
<Unit Remark=" " Unit="lb/gal(UK)" k="0.09976"/>
<Unit Remark=" " Unit="lb/bbl" k="0.002853"/>
<Unit Remark=" " Unit="g/cc" k="1"/>
<Unit Remark=" " Unit="g/cf" k="3.53147e-05"/>
<Unit Remark=" " Unit="g/ft^3" k="3.53147e-05"/>
<!-- ==================== 第02组时间 ==================== -->
<UnitGroup Type="time" Name="time">
<Unit ID="U0201" Unit="s" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U0202" Unit="ms" k="0.001" Digit="6"/>
<Unit ID="U0203" Unit="us" k="1e-06" Digit="6"/>
<Unit ID="U0204" Unit="min" k="60" Digit="0"/>
<Unit ID="U0205" Unit="h" k="3600" Digit="0"/>
<Unit ID="U0206" Unit="d" k="86400" Digit="0"/>
</UnitGroup>
<UnitGroup Type="geothermalgradient" Name="geothermalgradient">
<Unit Remark=" " Unit="deg/m" k="1"/>
<Unit Remark=" " Unit="F/in" k="1.8"/>
<Unit Remark=" " Unit="deg/km" k="0.099"/>
<Unit Remark=" " Unit="F/mile" k="0.0344828"/>
<Unit Remark=" " Unit="F/ft" k="181.818"/>
<!-- ==================== 第03组质量 ==================== -->
<UnitGroup Type="mass" Name="mass">
<Unit ID="U0301" Unit="kg" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U0302" Unit="g" k="0.001" Digit="6"/>
<Unit ID="U0303" Unit="ton" k="1000" Digit="0"/>
<Unit ID="U0304" Unit="lb" k="0.45359237" Digit="6"/>
<Unit ID="U0305" Unit="oz" k="0.0283495" Digit="6"/>
<Unit ID="U0306" Unit="ston" k="907.185" Digit="3"/>
<Unit ID="U0307" Unit="lton" k="1016.05" Digit="2"/>
</UnitGroup>
<UnitGroup Type="length" Name="length">
<Unit Remark=" " Unit="in" k="1"/>
<Unit Remark=" " Unit="m" k="39.3701"/>
<Unit Remark=" " Unit="cm" k="0.393701"/>
<Unit Remark=" " Unit="mm" k="0.0393701"/>
<Unit Remark=" " Unit="km" k="39370.1"/>
<Unit Remark=" " Unit="ft" k="12"/>
<Unit Remark=" " Unit="mi" k="63346.5"/>
<Unit Remark=" " Unit="yd" k="35.9873"/>
<Unit Remark=" " Unit="nmile" k="72913.4"/>
<Unit Remark=" " Unit="nm" k="3.93701e-08"/>
<Unit Remark=" " Unit="rad" k="7.82831"/>
<!-- ==================== 第04组角度 ==================== -->
<UnitGroup Type="angle" Name="angle">
<Unit ID="U0401" Unit="rad" k="1" Digit="6" Remark="base unit"/>
<Unit ID="U0402" Unit="deg" k="0.0174532925199433" Digit="6"/>
<Unit ID="U0403" Unit="grad" k="0.015707963267949" Digit="6"/>
</UnitGroup>
<UnitGroup Type="percent" Name="percent">
<Unit Remark=" " Unit="%" k="1"/>
<Unit Remark=" " Unit="pu" k="1"/>
<Unit Remark=" " Unit="m^3/m^3" k="100"/>
<Unit Remark=" " Unit="v/v" k="100"/>
<Unit Remark=" " Unit="fraction" k="100"/>
<!-- ==================== 第05组面积 ==================== -->
<UnitGroup Type="area" Name="area">
<Unit ID="U0501" Unit="m²" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U0502" Unit="km²" k="1e6" Digit="0"/>
<Unit ID="U0503" Unit="cm²" k="0.0001" Digit="6"/>
<Unit ID="U0504" Unit="ft²" k="0.09290304" Digit="6"/>
<Unit ID="U0505" Unit="in²" k="0.00064516" Digit="6"/>
<Unit ID="U0506" Unit="acre" k="4046.8564224" Digit="3"/>
<Unit ID="U0507" Unit="ha" k="10000" Digit="0"/>
<Unit ID="U0508" Unit="yd²" k="0.83612736" Digit="4"/>
</UnitGroup>
<UnitGroup Type="permeability" Name="permeability">
<Unit Remark=" " Unit="D" k="1"/>
<Unit Remark=" " Unit="mD" k="0.001"/>
<Unit Remark=" " Unit="cm^-2" k="9.81e+07"/>
<!-- ==================== 第06组体积 ==================== -->
<UnitGroup Type="volume" Name="volume">
<Unit ID="U0601" Unit="m³" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U0602" Unit="L" k="0.001" Digit="4"/>
<Unit ID="U0603" Unit="mL" k="1e-06" Digit="6"/>
<Unit ID="U0604" Unit="cm³" k="1e-06" Digit="6"/>
<Unit ID="U0605" Unit="cc" k="1e-06" Digit="6"/>
<Unit ID="U0606" Unit="bbl" k="0.158987294928" Digit="6"/>
<Unit ID="U0607" Unit="gal(US)" k="0.003785411784" Digit="6"/>
<Unit ID="U0608" Unit="gal(UK)" k="0.00454609" Digit="6"/>
<Unit ID="U0609" Unit="ft³" k="0.028316846592" Digit="6"/>
<Unit ID="U0610" Unit="in³" k="1.6387064e-05" Digit="6"/>
<Unit ID="U0611" Unit="qt" k="0.000946352946" Digit="6"/>
<Unit ID="U0612" Unit="pt" k="0.000473176473" Digit="6"/>
<Unit ID="U0613" Unit="gi" k="0.000118294118" Digit="6"/>
<Unit ID="U0614" Unit="acre.ft" k="1233.48183754752" Digit="3"/>
</UnitGroup>
<UnitGroup Type="power" Name="power">
<Unit Remark=" " Unit="W" k="1"/>
<Unit Remark=" " Unit="Btu/h" k="0.293071"/>
<Unit Remark=" " Unit="kgf.m/s" k="9.80665"/>
<Unit Remark=" " Unit="cal/s" k="4.1868"/>
<Unit Remark=" " Unit="hp" k="735.499"/>
<!-- ==================== 第07组速度 ==================== -->
<UnitGroup Type="velocity" Name="velocity">
<Unit ID="U0701" Unit="m/s" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U0702" Unit="km/h" k="0.277777778" Digit="5"/>
<Unit ID="U0703" Unit="ft/s" k="0.3048" Digit="4"/>
<Unit ID="U0704" Unit="mile/h" k="0.44704" Digit="5"/>
</UnitGroup>
<!-- ==================== 第08组温度 ==================== -->
<UnitGroup Type="temperature" Name="temperature">
<Unit ID="U0801" Unit="K" k="1" b="0" Digit="2" Remark="base unit"/>
<Unit ID="U0802" Unit="℃" k="1" b="273.15" Digit="2"/>
<Unit ID="U0803" Unit="degC" k="1" b="273.15" Digit="2"/>
<Unit ID="U0804" Unit="degF" k="0.555555555555556" b="255.372222222222" Digit="2"/>
<Unit ID="U0805" Unit="°F" k="0.555555555555556" b="255.372222222222" Digit="2"/>
<Unit ID="U0806" Unit="R" k="0.555555555555556" b="0" Digit="2"/>
</UnitGroup>
<!-- ==================== 第09组温差 ==================== -->
<UnitGroup Type="temperature_delta" Name="temperature_delta">
<Unit ID="U0901" Unit="K" k="1" Digit="2" Remark="base unit"/>
<Unit ID="U0902" Unit="℃" k="1" Digit="2"/>
<Unit ID="U0903" Unit="degC" k="1" Digit="2"/>
<Unit ID="U0904" Unit="degF" k="0.555555555555556" Digit="2"/>
<Unit ID="U0905" Unit="°F" k="0.555555555555556" Digit="2"/>
<Unit ID="U0906" Unit="R" k="0.555555555555556" Digit="2"/>
</UnitGroup>
<!-- ==================== 第10组地温梯度 ==================== -->
<UnitGroup Type="geothermalgradient" Name="geothermalgradient">
<Unit ID="U1001" Unit="K/m" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U1002" Unit="℃/km" k="0.001" Digit="3"/>
<Unit ID="U1003" Unit="deg/km" k="0.001" Digit="3"/>
<Unit ID="U1004" Unit="°F/ft" k="1.81818181818182" Digit="3"/>
<Unit ID="U1005" Unit="F/ft" k="1.81818181818182" Digit="3"/>
<Unit ID="U1006" Unit="°F/100ft" k="0.0181818181818182" Digit="3"/>
<Unit ID="U1007" Unit="F/mile" k="0.0344827586206897" Digit="3"/>
</UnitGroup>
<!-- ==================== 第11组压力 ==================== -->
<UnitGroup Type="pressure" Name="pressure">
<Unit Remark=" " Unit="Pa" k="1"/>
<Unit Remark=" " Unit="MPa" k="1e+06"/>
<Unit Remark=" " Unit="KPa" k="1000"/>
<Unit Remark=" " Unit="bar" k="100000"/>
<Unit Remark=" " Unit="Torr" k="133.322"/>
<Unit Remark=" " Unit="dyn/cm^2" k="0.1"/>
<Unit Unit="mmHg" k="133.322"/>
<Unit Unit="mmH2O" k="9.80665"/>
<Unit Remark=" " Unit="at" k="98066.5"/>
<Unit Remark=" " Unit="psi" k="6896.55"/>
<Unit Remark=" " Unit="atm" k="101325"/>
<Unit Remark=" " Unit="kgf/cm^2" k="98079.7"/>
</UnitGroup>
<UnitGroup Type="production" Name="production">
<Unit Remark=" " Unit="m^3/d" k="1"/>
<Unit Remark=" " Unit="tcf/d" k="0.02832"/>
<Unit Remark=" " Unit="m^3/a" k="0.00274007"/>
<Unit Remark=" " Unit="bcf/d" k="0.02832"/>
<Unit Remark=" " Unit="mmcf/d" k="28320"/>
<Unit Remark=" " Unit="mcf/d" k="28.32"/>
<Unit Remark=" " Unit="stb/d" k="0.159"/>
</UnitGroup>
<UnitGroup Type="prodgas" Name="prodgas">
<Unit Remark=" " Unit="m^3/d" k="1"/>
<Unit Remark=" " Unit="10^4*m^3/d" k="10000"/>
<Unit Remark=" " Unit="tcf/d" k="0.02832"/>
<Unit Remark=" " Unit="m^3/a" k="0.00274007"/>
<Unit Remark=" " Unit="bcf/d" k="0.02832"/>
<Unit Remark=" " Unit="mmcf/d" k="28320"/>
<Unit Remark=" " Unit="mcf/d" k="28.32"/>
<Unit Remark=" " Unit="stb/d" k="0.159"/>
</UnitGroup>
<UnitGroup Type="prodoil" Name="prodoil">
<Unit Remark=" " Unit="m^3/d" k="1"/>
<Unit Remark=" " Unit="tcf/d" k="0.02832"/>
<Unit Remark=" " Unit="m^3/a" k="0.00274007"/>
<Unit Remark=" " Unit="bcf/d" k="0.02832"/>
<Unit Remark=" " Unit="mmcf/d" k="28320"/>
<Unit Remark=" " Unit="mcf/d" k="28.32"/>
<Unit Remark=" " Unit="stb/d" k="0.159"/>
</UnitGroup>
<UnitGroup Type="prodwater" Name="prodwater">
<Unit Remark=" " Unit="m^3/d" k="1"/>
<Unit Remark=" " Unit="tcf/d" k="0.02832"/>
<Unit Remark=" " Unit="m^3/a" k="0.00274007"/>
<Unit Remark=" " Unit="bcf/d" k="0.02832"/>
<Unit Remark=" " Unit="mmcf/d" k="28320"/>
<Unit Remark=" " Unit="mcf/d" k="28.32"/>
<Unit Remark=" " Unit="stb/d" k="0.159"/>
<Unit ID="U1101" Unit="Pa" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U1102" Unit="kPa" k="1000" Digit="2"/>
<Unit ID="U1103" Unit="MPa" k="1e6" Digit="3"/>
<Unit ID="U1104" Unit="bar" k="100000" Digit="3"/>
<Unit ID="U1105" Unit="mbar" k="100" Digit="3"/>
<Unit ID="U1106" Unit="psi" k="6894.75729" Digit="3"/>
<Unit ID="U1107" Unit="atm" k="101325" Digit="3"/>
<Unit ID="U1108" Unit="at" k="98066.5" Digit="3"/>
<Unit ID="U1109" Unit="kgf/cm²" k="98066.5" Digit="3"/>
<Unit ID="U1110" Unit="mmHg" k="133.322368" Digit="3"/>
<Unit ID="U1111" Unit="Torr" k="133.322368" Digit="3"/>
<Unit ID="U1112" Unit="mH2O" k="9806.65" Digit="3"/>
<Unit ID="U1113" Unit="mmH2O" k="9.80665" Digit="3"/>
<Unit ID="U1114" Unit="dyn/cm²" k="0.1" Digit="4"/>
</UnitGroup>
<UnitGroup Type="radioactivity" Name="radioactivity">
<Unit Remark=" " Unit="gAPI" k="1"/>
<Unit Remark=" " Unit="API" k="1"/>
<!-- ==================== 第12组密度 ==================== -->
<UnitGroup Type="density" Name="density">
<Unit ID="U1201" Unit="kg/m³" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U1202" Unit="g/cm³" k="1000" Digit="3"/>
<Unit ID="U1203" Unit="g/cc" k="1000" Digit="3"/>
<Unit ID="U1204" Unit="lb/ft³" k="16.0184634" Digit="3"/>
<Unit ID="U1205" Unit="lb/gal(US)" k="119.826427" Digit="3"/>
<Unit ID="U1206" Unit="lb/gal(UK)" k="99.7764" Digit="3"/>
<Unit ID="U1207" Unit="lb/bbl" k="2.853" Digit="3"/>
<Unit ID="U1208" Unit="g/ft³" k="0.0353147" Digit="3"/>
<Unit ID="U1209" Unit="g/cf" k="0.0353147" Digit="3"/>
</UnitGroup>
<UnitGroup Type="slowness" Name="slowness">
<Unit Remark=" " Unit="us/m" k="1"/>
<Unit Remark=" " Unit="us/ft" k="3.28084"/>
</UnitGroup>
<UnitGroup Type="square" Name="square">
<Unit Remark=" " Unit="m^2" k="1"/>
<Unit Remark=" " Unit="km^2" k="1e+06"/>
<Unit Remark=" " Unit="in^2" k="0.0006452"/>
<Unit Remark=" " Unit="cm^2" k="0.0001"/>
<Unit Remark=" " Unit="acre" k="4047"/>
<Unit Remark=" " Unit="mile^2" k="2.58888e+06"/>
<Unit Remark=" " Unit="ft^2" k="0.093"/>
<Unit Remark=" " Unit="ha" k="10000"/>
<Unit Remark=" " Unit="yd^2" k="0.8361"/>
<Unit Remark=" " Unit="rad2" k="0.0395369"/>
</UnitGroup>
<UnitGroup Type="strength" Name="strength">
<Unit Remark=" " Unit="N" k="1"/>
<Unit Remark=" " Unit="lbf" k="4.44444"/>
<Unit Remark=" " Unit="kgf" k="9.81"/>
<Unit Remark=" " Unit="dyn" k="1e-05"/>
<!-- ==================== 第13组动力粘度 ==================== -->
<UnitGroup Type="viscosity" Name="viscosity_dynamic">
<Unit ID="U1301" Unit="Pa·s" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U1302" Unit="mPa·s" k="0.001" Digit="4"/>
<Unit ID="U1303" Unit="cP" k="0.001" Digit="4"/>
<Unit ID="U1304" Unit="P" k="0.1" Digit="4"/>
<Unit ID="U1305" Unit="kgf·s/m²" k="9.80665" Digit="3"/>
<Unit ID="U1306" Unit="lbf·s/ft²" k="47.8803" Digit="3"/>
</UnitGroup>
<UnitGroup Type="temperature" Name="temperature">
<Unit Remark=" " Unit="deg" k="1"/>
<Unit Remark=" " Unit="K" k="1" b="273.15"/>
<Unit Remark=" " Unit="F" k="1.8"/>
<Unit Remark=" " Unit="℃" k="1"/>
</UnitGroup>
<UnitGroup Type="themal power" Name="themal power">
<Unit Remark=" " Unit="J" k="1"/>
<Unit Remark=" " Unit="cal" k="4.1868"/>
<Unit Remark=" " Unit="kgf.m" k="9.80665"/>
<Unit Remark=" " Unit="Btu" k="1055.06"/>
<Unit Remark=" " Unit="kW.h" k="3.6e+06"/>
<Unit Remark=" " Unit="ft.lbf" k="1.35582"/>
<Unit Remark=" " Unit="hp.h(US)" k="2.64779e+06"/>
<Unit Remark=" " Unit="Hp.h(UK)" k="2.68452e+06"/>
<Unit Remark=" " Unit="kg.m" k="9.80008"/>
<Unit Remark=" " Unit="kcal" k="4185.85"/>
<Unit Remark=" " Unit="BTU" k="1054.85"/>
<!-- ==================== 第14组运动粘度 ==================== -->
<UnitGroup Type="viscosity_kinematic" Name="viscosity_kinematic">
<Unit ID="U1401" Unit="m²/s" k="1" Digit="6" Remark="base unit"/>
<Unit ID="U1402" Unit="mm²/s" k="1e-06" Digit="6"/>
<Unit ID="U1403" Unit="cSt" k="1e-06" Digit="6"/>
<Unit ID="U1404" Unit="St" k="0.0001" Digit="6"/>
<Unit ID="U1405" Unit="cm²/s" k="0.0001" Digit="6"/>
<Unit ID="U1406" Unit="ft²/s" k="0.09290304" Digit="6"/>
</UnitGroup>
<UnitGroup Type="time" Name="time">
<Unit Remark=" " Unit="us" k="1"/>
<Unit Remark=" " Unit="ms" k="1000"/>
<Unit Remark=" " Unit="s" k="1e+06"/>
<Unit Remark=" " Unit="min" k="6e+07"/>
<Unit Remark=" " Unit="hr" k="3.6e+09"/>
<Unit Remark=" " Unit="Day" k="8.64e+10"/>
<!-- ==================== 第15组渗透率 ==================== -->
<UnitGroup Type="permeability" Name="permeability">
<Unit ID="U1501" Unit="D" k="1" Digit="4" Remark="base unit"/>
<Unit ID="U1502" Unit="mD" k="0.001" Digit="4" />
<Unit ID="U1503" Unit="1/cm²" k="9.81e+07" Digit="2"/>
</UnitGroup>
<UnitGroup Type="velocity" Name="velocity">
<Unit Remark=" " Unit="m/s" k="1"/>
<Unit Remark=" " Unit="mile/h" k="0.44704"/>
<Unit Remark=" " Unit="ft/s" k="0.3048"/>
<!-- ==================== 第16组能量 ==================== -->
<UnitGroup Type="energy" Name="energy">
<Unit ID="U1601" Unit="J" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U1602" Unit="kJ" k="1000" Digit="2"/>
<Unit ID="U1603" Unit="MJ" k="1e6" Digit="2"/>
<Unit ID="U1604" Unit="cal" k="4.184" Digit="3"/>
<Unit ID="U1605" Unit="kcal" k="4184" Digit="2"/>
<Unit ID="U1606" Unit="Btu" k="1055.05585262" Digit="3"/>
<Unit ID="U1607" Unit="BTU" k="1055.05585262" Digit="3"/>
<Unit ID="U1608" Unit="kW·h" k="3.6e6" Digit="3"/>
<Unit ID="U1609" Unit="ft·lbf" k="1.355817948" Digit="3"/>
<Unit ID="U1610" Unit="kgf·m" k="9.80665" Digit="3"/>
<Unit ID="U1611" Unit="hp·h" k="2.68452e6" Digit="3"/>
</UnitGroup>
<UnitGroup Type="viscosity" Name="viscosity">
<Unit Remark=" " Unit="Pa.s" k="1"/>
<Unit Remark=" " Unit="mPa.s" k="0.001"/>
<Unit Remark=" " Unit="P" k="0.1"/>
<Unit Remark=" " Unit="cP" k="0.001"/>
<Unit Remark=" " Unit="bf.s/ft^2" k="47.8803"/>
<Unit Remark=" " Unit="kgf.s/m^3" k="9.80665"/>
</UnitGroup>
<UnitGroup Type="viscosity act" Name="viscosity act">
<Unit Remark=" " Unit="m^2/s" k="1"/>
<Unit Remark=" " Unit="cm^2/s" k="0.0001"/>
<Unit Remark=" " Unit="ft^2/s" k="0.092903"/>
<Unit Remark=" " Unit="St" k="0.0001"/>
<Unit Remark=" " Unit="cSt" k="1e-06"/>
<Unit Remark=" " Unit="mm^2/s" k="1e-06"/>
<!-- ==================== 第17组功率 ==================== -->
<UnitGroup Type="power" Name="power">
<Unit ID="U1701" Unit="W" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U1702" Unit="kW" k="1000" Digit="2"/>
<Unit ID="U1703" Unit="MW" k="1e6" Digit="2"/>
<Unit ID="U1704" Unit="hp" k="745.69987158227" Digit="3"/>
<Unit ID="U1705" Unit="Btu/h" k="0.29307107" Digit="4"/>
<Unit ID="U1706" Unit="cal/s" k="4.1868" Digit="3"/>
<Unit ID="U1707" Unit="kgf·m/s" k="9.80665" Digit="3"/>
</UnitGroup>
<UnitGroup Type="voltage" Name="voltage">
<Unit Remark=" " Unit="mv" k="1"/>
<Unit Remark=" " Unit="v" k="1000"/>
<!-- ==================== 第18组体积流量 ==================== -->
<UnitGroup Type="flow_rate_volume" Name="flow_rate_volume">
<Unit ID="U1801" Unit="m³/d" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U1802" Unit="m³/s" k="86400" Digit="6" Remark="1 m³/s = 86400 m³/d"/>
<Unit ID="U1803" Unit="m³/a" k="0.00273972602739726" Digit="6" Remark="1 m³/a = 1/365 m³/d"/>
<Unit ID="U1804" Unit="stb/d" k="1" Digit="6" Remark="1 stb/d ≈ 1 m³/d (工程近似)"/>
<Unit ID="U1805" Unit="bbl/d" k="1" Digit="6" Remark="1 bbl/d ≈ 1 m³/d (工程近似)"/>
<Unit ID="U1806" Unit="ft³/s" k="2446.575" Digit="6" Remark="1 ft³/s = 2446.575 m³/d"/>
<Unit ID="U1807" Unit="ft³/d" k="0.028316846592" Digit="6" Remark="1 ft³/d = 0.028316846592 m³/d"/>
<Unit ID="U1808" Unit="MMscf/d" k="28316.846592" Digit="4" Remark="1 MMscf/d = 28316.846592 m³/d (理想气体)"/>
<Unit ID="U1809" Unit="Mscf/d" k="28.316846592" Digit="6" Remark="1 Mscf/d = 28.316846592 m³/d (理想气体)"/>
<Unit ID="U1810" Unit="10⁴*m³/d" k="10000" Digit="4" Remark="1 万方/天 = 10000 m³/d"/>
</UnitGroup>
<UnitGroup Type="volume" Name="volume">
<Unit Remark=" " Unit="m^3" k="1"/>
<Unit Remark=" " Unit="ml" k="1e-06"/>
<Unit Remark=" " Unit="L" k="0.001"/>
<Unit Remark=" " Unit="in^3" k="1.639e-05"/>
<Unit Remark=" " Unit="cm^3" k="1e-06"/>
<Unit Remark=" " Unit="pt" k="0.000473"/>
<Unit Remark=" " Unit="gal(US)" k="0.003785"/>
<Unit Remark=" " Unit="bbl" k="0.159"/>
<Unit Remark=" " Unit="bcf" k="2.8317e+06"/>
<Unit Remark=" " Unit="tcf" k="2.8317e+10"/>
<Unit Remark=" " Unit="mmcf" k="28317"/>
<Unit Remark=" " Unit="mcf" k="28.317"/>
<Unit Remark=" " Unit="ft^3" k="0.0283"/>
<Unit Remark=" " Unit="gal(UK)" k="0.004546"/>
<Unit Remark=" " Unit="gi" k="0.000118"/>
<Unit Remark=" " Unit="qt" k="0.000946"/>
<Unit Remark=" " Unit="cc" k="1e-06"/>
<Unit Remark=" " Unit="acre.ft" k="1234"/>
</UnitGroup>
<UnitGroup Type="weight" Name="weight">
<Unit Remark=" " Unit="kg" k="1"/>
<Unit Remark=" " Unit="ton" k="1000"/>
<Unit Remark=" " Unit="lton" k="1016"/>
<Unit Remark=" " Unit="lb" k="0.454"/>
<Unit Remark=" " Unit="oz" k="0.02835"/>
<Unit Remark=" " Unit="ston" k="907"/>
<Unit Remark=" " Unit="g" k="0.001"/>
<!-- ==================== 第19组压缩系数 ==================== -->
<UnitGroup Type="compressibility" Name="compressibility">
<Unit ID="U1901" Unit="1/MPa" k="1" Digit="6" Remark="base unit"/>
<Unit ID="U1902" Unit="1/Pa" k="1e6" Digit="6"/>
<Unit ID="U1903" Unit="1/psi" k="145.037738" Digit="6"/>
<Unit ID="U1904" Unit="1/atm" k="9.86923266716" Digit="6"/>
<Unit ID="U1905" Unit="1/bar" k="10" Digit="6"/>
</UnitGroup>
<UnitGroup Type="ws" Name="盐度">
<Unit Remark=" " Unit="mg/L" k="1"/>
<Unit Remark=" " Unit="μg/mL" k="1"/>
<Unit Remark=" " Unit="g/L" k="1000"/>
<Unit Remark=" " Unit="kg/m^3" k="0.001"/>
<Unit Remark=" " Unit="ppm" k="1"/>
<Unit Remark=" " Unit="Kppm" k="1000"/>
<!-- ==================== 第20组浓度 ==================== -->
<UnitGroup Type="concentration" Name="concentration">
<Unit ID="U2001" Unit="kg/m³" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U2002" Unit="g/L" k="1" Digit="3"/>
<Unit ID="U2003" Unit="mg/L" k="0.001" Digit="4"/>
<Unit ID="U2004" Unit="μg/mL" k="0.001" Digit="4"/>
<Unit ID="U2005" Unit="ppm" k="0.001" Digit="4" Remark="assuming 1 ppm = 1 mg/kg in water"/>
<Unit ID="U2006" Unit="Kppm" k="1" Digit="3"/>
<Unit ID="U2007" Unit="mol/m³" k="1" Digit="3"/>
</UnitGroup>
<!-- ==================== 第21组百分比 ==================== -->
<UnitGroup Type="percent" Name="percent">
<Unit ID="U2101" Unit="%" k="1" Digit="2" Remark="base unit"/>
<Unit ID="U2102" Unit="pu" k="1" Digit="2" Remark="per unit"/>
<Unit ID="U2103" Unit="fraction" k="100" Digit="2"/>
<Unit ID="U2104" Unit="v/v" k="100" Digit="2"/>
<Unit ID="U2105" Unit="m³/m³" k="100" Digit="2"/>
</UnitGroup>
<!-- ==================== 第22组慢度声波 ==================== -->
<UnitGroup Type="slowness" Name="slowness">
<Unit ID="U2201" Unit="s/m" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U2202" Unit="us/m" k="1e-06" Digit="6"/>
<Unit ID="U2203" Unit="us/ft" k="3.28083989501312e-06" Digit="6"/>
</UnitGroup>
<UnitGroup Type="ToDo1" Name="ToDo1">
<Unit Remark=" " Unit="1/m^3/d" k="1"/>
<!-- ==================== 第23组放射性 ==================== -->
<UnitGroup Type="radioactivity" Name="radioactivity">
<Unit ID="U2301" Unit="API" k="1" Digit="1" Remark="base unit"/>
<Unit ID="U2302" Unit="gAPI" k="1" Digit="1"/>
</UnitGroup>
<UnitGroup Type="ToDo2" Name="ToDo2">
<Unit Remark=" " Unit="°" k="1"/>
<!-- ==================== 第24组电压 ==================== -->
<UnitGroup Type="voltage" Name="voltage">
<Unit ID="U2401" Unit="V" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U2402" Unit="mV" k="0.001" Digit="4"/>
<Unit ID="U2403" Unit="kV" k="1000" Digit="2"/>
</UnitGroup>
<UnitGroup Type="ToDo3" Name="ToDo3">
<Unit Remark=" " Unit="m^3/MPa" k="1"/>
<!-- ==================== 第25组力 ==================== -->
<UnitGroup Type="force" Name="force">
<Unit ID="U2501" Unit="N" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U2502" Unit="kN" k="1000" Digit="2"/>
<Unit ID="U2503" Unit="lbf" k="4.4482216152605" Digit="3"/>
<Unit ID="U2504" Unit="kgf" k="9.80665" Digit="3"/>
<Unit ID="U2505" Unit="dyn" k="1e-05" Digit="6"/>
</UnitGroup>
<!-- ==================== 第26组频率 ==================== -->
<UnitGroup Type="frequency" Name="frequency">
<Unit ID="U2601" Unit="Hz" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U2602" Unit="kHz" k="1000" Digit="2"/>
<Unit ID="U2603" Unit="MHz" k="1e6" Digit="2"/>
<Unit ID="U2604" Unit="GHz" k="1e9" Digit="2"/>
</UnitGroup>
<!-- ==================== 第27组热导率 ==================== -->
<UnitGroup Type="thermal_conductivity" Name="thermal_conductivity">
<Unit ID="U2701" Unit="W/(m·K)" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U2702" Unit="W/(m·℃)" k="1" Digit="3"/>
<Unit ID="U2703" Unit="Btu/(h·ft·°F)" k="1.730735" Digit="3"/>
<Unit ID="U2704" Unit="cal/(cm·s·℃)" k="418.4" Digit="2"/>
</UnitGroup>
<UnitGroup Type="ToDo4" Name="ToDo4">
<Unit Remark=" " Unit="mD/(mPa.s)" k="1"/>
<!-- ==================== 第28组比热容 ==================== -->
<UnitGroup Type="specific_heat" Name="specific_heat">
<Unit ID="U2801" Unit="J/(kg·K)" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U2802" Unit="J/(g·K)" k="1000" Digit="2"/>
<Unit ID="U2803" Unit="cal/(g·℃)" k="4184" Digit="2"/>
<Unit ID="U2804" Unit="Btu/(lb·°F)" k="4186.8" Digit="2"/>
</UnitGroup>
<UnitGroup Type="ToDo5" Name="ToDo5">
<Unit Remark=" " Unit="MPa/m" k="1"/>
<!-- ==================== 第29组摩尔质量 ==================== -->
<UnitGroup Type="molar_mass" Name="molar_mass">
<Unit ID="U2901" Unit="kg/mol" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U2902" Unit="g/mol" k="0.001" Digit="4"/>
<Unit ID="U2903" Unit="lb/lbmol" k="0.45359237" Digit="4"/>
</UnitGroup>
<UnitGroup Type="ToDo6" Name="ToDo6">
<Unit Remark=" " Unit="mD.m" k="1"/>
<!-- ==================== 第30组Unknown1 ==================== -->
<UnitGroup Type="molar_mass" Name="molar_mass">
<Unit ID="U3001" Unit="kg/mol" k="1" Digit="3" Remark="base unit"/>
<Unit ID="U3002" Unit="g/mol" k="0.001" Digit="4"/>
<Unit ID="U3003" Unit="lb/lbmol" k="0.45359237" Digit="4"/>
</UnitGroup>
<UnitGroup Type="ToDo7" Name="ToDo7">
<Unit Remark=" " Unit="g/mol" k="1"/>
<!-- ==================== 第31组Unknown1 ==================== -->
<UnitGroup Type="ws" Name="盐度">
<Unit ID="U3101" Unit="mg/L" k="1"/>
<Unit ID="U3102" Unit="μg/mL" k="1"/>
<Unit ID="U3103" Unit="g/L" k="1000"/>
<Unit ID="U3104" Unit="kg/m^3" k="0.001"/>
<Unit ID="U3105" Unit="ppm" k="1"/>
<Unit ID="U3106" Unit="Kppm" k="1000"/>
</UnitGroup>
<!-- ==================== 第32组Unknown1 ==================== -->
<UnitGroup Type="viscosity" Name="viscosity">
<Unit ID="U3201" Unit="Pa.s" k="1"/>
<Unit ID="U3202" Unit="mPa.s" k="0.001"/>
<Unit ID="U3203" Unit="P" k="0.1"/>
<Unit ID="U3204" Unit="cP" k="0.001"/>
<Unit ID="U3205" Unit="bf.s/ft^2" k="47.8803"/>
<Unit ID="U3206" Unit="kgf.s/m^3" k="9.80665"/>
</UnitGroup>
</TypeOf>
</Root>

@ -17,7 +17,7 @@
//#include "nmPlotScene.h"
//#include "nmPlotView.h"
#include "ZxTableView.h"
#include "ZxTableViewUnit.h"
#include "ZxTableModel.h"
#include "mModuleDefines.h"
@ -223,7 +223,7 @@ void nmDemoSubWnd::initUiDockWxs()
addDockWidget(Qt::RightDockWidgetArea, pDockWx1);
m_pWxDockData1 = pDockWx1;
ZxTableView* pTableView = new ZxTableView();
ZxTableView* pTableView = new ZxTableViewUnit();
Q_ASSERT (nullptr != pTableView);
{
ZxTableModel* pTableModel = new ZxTableModel(1, 1, listTitles);
@ -243,7 +243,7 @@ void nmDemoSubWnd::initUiDockWxs()
tabifyDockWidget(pDockWx1, pDockWx2);
m_pWxDockData2 = pDockWx2;
ZxTableView* pTableView = new ZxTableView();
ZxTableView* pTableView = new ZxTableViewUnit();
Q_ASSERT (nullptr != pTableView);
{
ZxTableModel* pTableModel = new ZxTableModel(1, 1, listTitles);

Loading…
Cancel
Save