diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonColor-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonColor-7.1.pdb new file mode 100644 index 00000000..4ac26f6b Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonColor-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonComputationalGeometry-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonComputationalGeometry-7.1.pdb new file mode 100644 index 00000000..33d5e302 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonComputationalGeometry-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonCore-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonCore-7.1.pdb new file mode 100644 index 00000000..6ebe63c5 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonCore-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonDataModel-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonDataModel-7.1.pdb new file mode 100644 index 00000000..16d5c4c7 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonDataModel-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonExecutionModel-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonExecutionModel-7.1.pdb new file mode 100644 index 00000000..f539e48e Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonExecutionModel-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonMath-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonMath-7.1.pdb new file mode 100644 index 00000000..70445aa1 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonMath-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonMisc-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonMisc-7.1.pdb new file mode 100644 index 00000000..ccfc75dd Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonMisc-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonSystem-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonSystem-7.1.pdb new file mode 100644 index 00000000..7e5623ed Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonSystem-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkCommonTransforms-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkCommonTransforms-7.1.pdb new file mode 100644 index 00000000..ea2c5a80 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkCommonTransforms-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkDICOMParser-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkDICOMParser-7.1.pdb new file mode 100644 index 00000000..7ea4027e Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkDICOMParser-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkFiltersCore-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkFiltersCore-7.1.pdb new file mode 100644 index 00000000..f62b6529 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkFiltersCore-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkFiltersExtraction-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkFiltersExtraction-7.1.pdb new file mode 100644 index 00000000..b2e18288 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkFiltersExtraction-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkFiltersGeneral-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkFiltersGeneral-7.1.pdb new file mode 100644 index 00000000..53be557f Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkFiltersGeneral-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkFiltersGeometry-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkFiltersGeometry-7.1.pdb new file mode 100644 index 00000000..6394b7bb Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkFiltersGeometry-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkFiltersHybrid-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkFiltersHybrid-7.1.pdb new file mode 100644 index 00000000..835447f5 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkFiltersHybrid-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkFiltersModeling-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkFiltersModeling-7.1.pdb new file mode 100644 index 00000000..e9246093 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkFiltersModeling-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkFiltersSources-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkFiltersSources-7.1.pdb new file mode 100644 index 00000000..4a30847b Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkFiltersSources-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkFiltersStatistics-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkFiltersStatistics-7.1.pdb new file mode 100644 index 00000000..680d7fb5 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkFiltersStatistics-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkGUISupportQt-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkGUISupportQt-7.1.pdb new file mode 100644 index 00000000..1a5b6722 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkGUISupportQt-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkIOCore-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkIOCore-7.1.pdb new file mode 100644 index 00000000..db8fec34 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkIOCore-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkIOFFMPEG-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkIOFFMPEG-7.1.pdb new file mode 100644 index 00000000..007ff019 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkIOFFMPEG-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkIOImage-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkIOImage-7.1.pdb new file mode 100644 index 00000000..29d5a576 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkIOImage-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkIOLegacy-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkIOLegacy-7.1.pdb new file mode 100644 index 00000000..35a41d05 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkIOLegacy-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkIOMovie-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkIOMovie-7.1.pdb new file mode 100644 index 00000000..867a4aa5 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkIOMovie-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkIOXML-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkIOXML-7.1.pdb new file mode 100644 index 00000000..5dd022d5 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkIOXML-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkIOXMLParser-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkIOXMLParser-7.1.pdb new file mode 100644 index 00000000..8c11d9f3 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkIOXMLParser-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkImagingColor-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkImagingColor-7.1.pdb new file mode 100644 index 00000000..b3bd1413 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkImagingColor-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkImagingCore-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkImagingCore-7.1.pdb new file mode 100644 index 00000000..f78f1c53 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkImagingCore-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkImagingFourier-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkImagingFourier-7.1.pdb new file mode 100644 index 00000000..b0f1871f Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkImagingFourier-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkImagingGeneral-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkImagingGeneral-7.1.pdb new file mode 100644 index 00000000..97ffbba2 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkImagingGeneral-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkImagingHybrid-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkImagingHybrid-7.1.pdb new file mode 100644 index 00000000..da12ccbe Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkImagingHybrid-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkImagingSources-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkImagingSources-7.1.pdb new file mode 100644 index 00000000..4ccf5683 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkImagingSources-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkInteractionStyle-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkInteractionStyle-7.1.pdb new file mode 100644 index 00000000..d1382e4c Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkInteractionStyle-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkInteractionWidgets-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkInteractionWidgets-7.1.pdb new file mode 100644 index 00000000..6d44829d Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkInteractionWidgets-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkRenderingAnnotation-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkRenderingAnnotation-7.1.pdb new file mode 100644 index 00000000..76df0ebf Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkRenderingAnnotation-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkRenderingCore-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkRenderingCore-7.1.pdb new file mode 100644 index 00000000..5c803e46 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkRenderingCore-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkRenderingFreeType-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkRenderingFreeType-7.1.pdb new file mode 100644 index 00000000..c7043df2 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkRenderingFreeType-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkRenderingLabel-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkRenderingLabel-7.1.pdb new file mode 100644 index 00000000..f835782f Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkRenderingLabel-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkRenderingOpenGL-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkRenderingOpenGL-7.1.pdb new file mode 100644 index 00000000..51dcb99c Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkRenderingOpenGL-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkRenderingVolume-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkRenderingVolume-7.1.pdb new file mode 100644 index 00000000..51313aa8 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkRenderingVolume-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkalglib-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkalglib-7.1.pdb new file mode 100644 index 00000000..bd9b6298 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkalglib-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkexpat-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkexpat-7.1.pdb new file mode 100644 index 00000000..774a4c52 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkexpat-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkfreetype-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkfreetype-7.1.pdb new file mode 100644 index 00000000..0ae04f5c Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkfreetype-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkjpeg-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkjpeg-7.1.pdb new file mode 100644 index 00000000..3db502a5 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkjpeg-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkmetaio-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkmetaio-7.1.pdb new file mode 100644 index 00000000..fe882591 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkmetaio-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkoggtheora-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkoggtheora-7.1.pdb new file mode 100644 index 00000000..ad39460e Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkoggtheora-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkpng-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkpng-7.1.pdb new file mode 100644 index 00000000..b7a71637 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkpng-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtksys-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtksys-7.1.pdb new file mode 100644 index 00000000..c4215c51 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtksys-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtktiff-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtktiff-7.1.pdb new file mode 100644 index 00000000..c0ad39d5 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtktiff-7.1.pdb differ diff --git a/3rd/VTK7.1/pdb/Debug/vtkzlib-7.1.pdb b/3rd/VTK7.1/pdb/Debug/vtkzlib-7.1.pdb new file mode 100644 index 00000000..70a02c66 Binary files /dev/null and b/3rd/VTK7.1/pdb/Debug/vtkzlib-7.1.pdb differ diff --git a/Src/nmNum/nmSubWnd/nmSubWndMain.cpp b/Src/nmNum/nmSubWnd/nmSubWndMain.cpp index 17e160b4..5b23399f 100644 --- a/Src/nmNum/nmSubWnd/nmSubWndMain.cpp +++ b/Src/nmNum/nmSubWnd/nmSubWndMain.cpp @@ -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> & 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 > &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 > &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 > &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);