fix: 适配新版框架曲线宏并补充 VTK 调试符号

- 补充 50 个与现有 VTK Debug DLL 匹配的 PDB 文件
- 修正数值模块中 10 处旧曲线宏引用,保持曲线含义不变
- 通过 VS2010/Qt4 单文件编译语法检查
develop
lh 3 days ago
parent 920b12044f
commit 9c8b11fdf9

@ -2372,7 +2372,7 @@ void nmSubWndMain::updateSensitiveHistoryPlot()
if(rates && rates->size() == well->m_vecFlowDurations.size()) {
iCurveDesc flow;
flow.m_oCurveType = POT_CurveFlow;
flow.m_sCurveName = s_HistorySouce_CurveF;
flow.m_sCurveName = s_Curve_HistSouceF;
flow.m_bLineVisible = true;
flow.m_bPointVisible = false;
flow.m_oPen.setColor(Qt::red);
@ -3119,13 +3119,13 @@ bool nmSubWndMain::inithalfLog(QVector<QVector<double >> & vvecLogPreData, QVect
// 判断是历史数据还是计算数据
if(isHistoryData) {
curveDesc.m_sCurveName = s_SemiSouce_Curve;
curveDesc.m_sCurveName = s_Curve_SemiSouceP;
curveDesc.m_bLineVisible = false; // 关闭线模式可见性
curveDesc.m_bPointVisible = true; // 开启点模式可见性
curveDesc.m_oDot.setColor(Qt::red); // 设置点的颜色
curveDesc.m_oDot.setStyle(ZxDotType::DTS_Cross); // x形状
} else {
curveDesc.m_sCurveName = s_SemiTheorySouce_Curve; // 理论曲线
curveDesc.m_sCurveName = s_Curve_SemiTheorySouceP; // 理论曲线
curveDesc.m_bLineVisible = true; // 开启线模式可见性
curveDesc.m_bPointVisible = false; // 关闭点模式可见性
curveDesc.m_oPen.setColor(Qt::green); // 设置线的颜色
@ -3181,8 +3181,8 @@ bool nmSubWndMain::initloglog(QVector<QVector<double> > &vvecLogPreData, QVector
// 判断是历史数据还是计算数据
if(isHistoryData) {
curveDesc1.m_sCurveName = s_Souce_Curve;
curveDesc2.m_sCurveName = s_Deriv_Curve;
curveDesc1.m_sCurveName = s_Curve_SouceP;
curveDesc2.m_sCurveName = s_Curve_DerivP;
curveDesc1.m_bLineVisible = false; // 关闭线模式可见性
curveDesc1.m_bPointVisible = true; // 开启点模式可见性
@ -3195,8 +3195,8 @@ bool nmSubWndMain::initloglog(QVector<QVector<double> > &vvecLogPreData, QVector
curveDesc2.m_oDot.setStyle(ZxDotType::DTS_Circle); // O形状
curveDesc2.m_oDot.setFilling(false); // 不填充
} else {
curveDesc1.m_sCurveName = s_TheorySouce_Curve;
curveDesc2.m_sCurveName = s_TheoryDeriv_Curve;
curveDesc1.m_sCurveName = s_Curve_TheorySouceP;
curveDesc2.m_sCurveName = s_Curve_TheoryDerivP;
curveDesc1.m_bLineVisible = true; // 关闭线模式可见性
curveDesc1.m_bPointVisible = false; // 开启点模式可见性
@ -3234,13 +3234,13 @@ bool nmSubWndMain::initPreHistory(QVector<QVector<double> > &vvecHistoryData, QV
// 判断是历史数据还是计算数据
if(isHistoryData) {
curveDesc.m_sCurveName = s_HistorySouce_CurveP;
curveDesc.m_sCurveName = s_Curve_HistSouceP;
curveDesc.m_bLineVisible = false; // 关闭线模式可见性
curveDesc.m_bPointVisible = true; // 开启点模式可见性
curveDesc.m_oDot.setColor(Qt::red); // 设置点的颜色
curveDesc.m_oDot.setStyle(ZxDotType::DTS_Plus); // +形状
} else {
curveDesc.m_sCurveName = s_HistoryFit_CurveP;
curveDesc.m_sCurveName = s_Curve_HistTheorySouceP;
curveDesc.m_bLineVisible = true; // 关闭线模式可见性
curveDesc.m_bPointVisible = false; // 开启点模式可见性
curveDesc.m_oPen.setColor(Qt::green); // 设置线的颜色
@ -3707,7 +3707,7 @@ bool nmSubWndMain::refreshPebiResultCurves(
resultReferenceRatesOf(pWell);
iCurveDesc oFlowCurve;
oFlowCurve.m_oCurveType = POT_CurveFlow;
oFlowCurve.m_sCurveName = s_HistorySouce_CurveF;
oFlowCurve.m_sCurveName = s_Curve_HistSouceF;
oFlowCurve.m_bLineVisible = true;
oFlowCurve.m_bPointVisible = false;
oFlowCurve.m_oPen.setColor(Qt::red);

Loading…
Cancel
Save