Ver código fonte

fix merge errors

gsp 1 mês atrás
pai
commit
d650fe0269

+ 1 - 1
OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSSampleVisualPropertyInfo.cs

@@ -2287,7 +2287,7 @@ namespace OTSMeasureApp
                         {
                             //a_nId = ResourceID.GrpSEMParameter;
                             // does SEM data (measure) set?
-                            CSEMDataMsr m_TempSEMDataMsr = new CSEMDataMsr();
+                            CSEMFieldData m_TempSEMDataMsr = new CSEMFieldData();
                             if ((m_poSEMDataMsr.GetScanFieldSize100() == m_TempSEMDataMsr.GetScanFieldSize100())
                                 && (m_poSEMDataMsr.GetTotalFields() == m_TempSEMDataMsr.GetTotalFields())
                                 && (m_poSEMDataMsr.GetWorkingDistance() == m_TempSEMDataMsr.GetWorkingDistance())