Commit Graph

12 Commits (f87ffafad933619653a9b526aaf4bc75a11d6df6)

Author SHA1 Message Date
lvjunjie 34a82fe087 Merge branch 'feature/nm-para-property-20260615' into develop
# Conflicts:
#	3rd/Pebi/include/pch.h
#	Bin/Config/Common/MenuDefines_Ribbon_cn.dat   resolved by feature/nm-para-property-20260615 version
#	Bin/Config/Common/ModelParaDefinesNM_cn.dat   resolved by feature/nm-para-property-20260615 version
#	Bin/Config/Common/ModelParaDefinesNM_en.dat   resolved by feature/nm-para-property-20260615 version
#	Src/nmNum/nmData/nmDataAnalyzeManager.cpp
#	Src/nmNum/nmPlot/nmGuiPlot.cpp
#	Src/nmNum/nmPlot/nmObjPointWell.cpp
17 hours ago
lvjunjie c64dc6ce88 结果拟压力转换 2 weeks ago
lh 4e574b76d6 fix:合并框架代码,已修复获取不到PVT数据的问题 2 months ago
lvjunjie 2b721e6b8a 修复打开map后关闭成果崩溃的问题 2 months ago
lvjunjie fc3f7328aa 修复一个成果中有多个流动段分析窗口时,关闭会崩溃的问题 2 months ago
lvjunjie b92403c904 Revert "修复切换成果后下拉框和曲线显示错误的问题"
This reverts commit c6eaa7940b.
2 months ago
lvjunjie 91f0fdd86c 保存当前查看结果的井下次打开时显示 2 months ago
lvjunjie c6eaa7940b 修复切换成果后下拉框和曲线显示错误的问题 2 months ago
lvjunjie da8d6ce1c8 把计算后查看井结果放到左侧界面中,计算后不再弹出 2 months ago
lvjunjie 0fdd200607 求解之后,如果井数量大于一才弹出查看井的对话框 2 months ago
lvjunjie f52c6207dc 计算前判断是否有网格数据,有的话就不再次生成 2 months ago
lh 34209bc128 feat:初始化仓库代码 2 months ago