Merge branch 'Release2.7' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.7

Bin/x64/OTSOx50_2_7.wse

@@ -3923,43 +3923,43 @@ item: Set Variable
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSMeasureApp.exe
-  Destination=%GROUP%\OTSMeasureApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSMeasureApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSSysMgrApp.exe
-  Destination=%GROUP%\OTSSysMgrApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSSysMgrApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSIncAReportApp.exe
-  Destination=%GROUP%\OTSIncAReportApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSIncAReportApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSMeasureApp.exe
-  Destination=%DESKTOPDIR%\OTSMeasureApp.lnk
+  Destination=%CDESKTOPDIR%\OTSMeasureApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSIncAReportApp.exe
-  Destination=%DESKTOPDIR%\OTSIncAReportApp.lnk
+  Destination=%CDESKTOPDIR%\OTSIncAReportApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OTSSysMgrApp.exe
-  Destination=%DESKTOPDIR%\OTSSysMgrApp.lnk
+  Destination=%CDESKTOPDIR%\OTSSysMgrApp.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
 item: Create Shortcut
   Source=%MAINDIR%\OINA.Extender.WPF.Testharness.exe
-  Destination=%DESKTOPDIR%\OINA.Extender.WPF.Testharness.lnk
+  Destination=%CDESKTOPDIR%\OINA.Extender.WPF.Testharness.lnk
   Working Directory=%MAINDIR%
   Icon Number=0
 end
@@ -3970,49 +3970,42 @@ item: Add ProgMan Icon
   Icon Name=OINA.Extender.WPF.Testharness
   Command Line=%MAINDIR%\OINA.Extender.WPF.Testharness.exe
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=OTSSysMgrApp
   Command Line=%MAINDIR%\OTSSysMgrApp.exe
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=OTSMeasureApp
   Command Line=%MAINDIR%\OTSMeasureApp.exe
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=OTSIncAReportApp
   Command Line=%MAINDIR%\OTSIncAReportApp.exe
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=OTSMeasureApp
   Command Line=%MAINDIR%\OTSMeasureApp.exe
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=OTSSysMgrApp
   Command Line=%MAINDIR%\OTSSysMgrApp.exe
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=OTSIncAReportApp
   Command Line=%MAINDIR%\OTSIncAReportApp.exe
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 item: End Block
 end

OTSCPP/OTSClrInterface/ReportCalculateClr/ReportMgrClr.cpp

@@ -347,8 +347,23 @@ namespace OTSCLRINTERFACE {
 		if (listSelectedDataSource.size() > 1) return tbl;
 
 		CSmplMsrResultFileMgrPtr rstFileMgrPrt = pReportMgr->GetASmplMsrResultMgrByFileName(listSelectedDataSource[0]);
-
-		CGBFieldList listGBFields = GBCal.CalGBFields(rstFileMgrPrt);
+		GB_METHODE_TYPE t;
+		switch (CalTableType)
+		{
+		case CALCULATE_TABLE_TYPE::GB_Method1:
+			t = GB_METHODE_TYPE::METHODE_1;
+			break;
+		case CALCULATE_TABLE_TYPE::GB_Method2:
+			t = GB_METHODE_TYPE::METHODE_2;
+			break;
+		case CALCULATE_TABLE_TYPE::ASTM:
+			t = GB_METHODE_TYPE::ASTM;
+			break;
+		default:
+			t = GB_METHODE_TYPE::METHODE_1;
+			break;
+		}
+		CGBFieldList listGBFields = GBCal.CalGBFields(rstFileMgrPrt,t);
 
 		GBCal.CategoryGBInclutions(listGBFields, CalTableType);
 

OTSCPP/OTSData/otsdataconst.h

@@ -306,7 +306,8 @@ namespace OTSDATA
 		MIN = 0,
 		METHODE_1 = 0,
 		METHODE_2 = 1,
-		MAX = 1
+		ASTM=2,
+		MAX = 2
 	} GB_METHODE_TYPE;
 
 	typedef enum class __declspec(dllexport) GB_CHEMICAL_TYPE

OTSCPP/OTSRptCalculate/GBCal/CGBCalculate.cpp

@@ -75,7 +75,23 @@ namespace OTSGBCalculate
 			}
 			else
 			{
-				CGBFieldList listRawGBFields = CalGBFields(rstFileMgrPrt);
+				GB_METHODE_TYPE t;
+				switch(tableType)
+				{
+				case CALCULATE_TABLE_TYPE::GB_Method1:
+					t = GB_METHODE_TYPE::METHODE_1;
+					break;
+				case CALCULATE_TABLE_TYPE::GB_Method2:
+				    t= GB_METHODE_TYPE::METHODE_2;
+					break;
+				case CALCULATE_TABLE_TYPE::ASTM:
+					t = GB_METHODE_TYPE::ASTM;
+					break;
+				default:
+					t = GB_METHODE_TYPE::METHODE_1;
+					break;
+				}
+				CGBFieldList listRawGBFields = CalGBFields(rstFileMgrPrt,t);
 
 				CategoryGBInclutions(listRawGBFields, tableType);
 
@@ -201,9 +217,24 @@ namespace OTSGBCalculate
 
 		CSmplMsrResultFileMgrPtr rstFileMgrPrt = m_rptMgrPtr->GetASmplMsrResultMgrByFileName(listSelectedDataSource[0]);
 
+		GB_METHODE_TYPE t;
+		switch (tableType)
+		{
+		case CALCULATE_TABLE_TYPE::GB_Method1:
+			t = GB_METHODE_TYPE::METHODE_1;
+			break;
+		case CALCULATE_TABLE_TYPE::GB_Method2:
+			t = GB_METHODE_TYPE::METHODE_2;
+			break;
+		case CALCULATE_TABLE_TYPE::ASTM:
+			t = GB_METHODE_TYPE::ASTM;
+			break;
+		default:
+			t = GB_METHODE_TYPE::METHODE_1;
+			break;
+		}
 
-
-		CGBFieldList listGBFields = CalGBFields(rstFileMgrPrt);
+		CGBFieldList listGBFields = CalGBFields(rstFileMgrPrt,t);
 
 		CategoryGBInclutions(listGBFields, tableType);
 
@@ -762,7 +793,7 @@ namespace OTSGBCalculate
 
 	
 	// calculate GB fields
-	CGBFieldList CGBCalculate::CalGBFields(CSmplMsrResultFileMgrPtr pSmplMgr)
+	CGBFieldList CGBCalculate::CalGBFields(CSmplMsrResultFileMgrPtr pSmplMgr, GB_METHODE_TYPE calType)
 	{
 		CGBFieldList m_listGBFields;
 		m_listGBFields.clear();
@@ -811,6 +842,11 @@ namespace OTSGBCalculate
 			LogErrorTrace(__FILE__, __LINE__, _T("CalGBFields: call OTSFieldToGBField failed."));
 			return m_listGBFields;
 		}
+		for (auto fld : m_listGBFields)
+		{
+			fld->SetCalcuType(calType);
+		}
+
 		return m_listGBFields;
 	}
 

OTSCPP/OTSRptCalculate/GBCal/CGBCalculate.h

@@ -23,7 +23,7 @@ namespace OTSGBCalculate
 		CGBFieldList GetAllGBFields(CALCULATE_TABLE_TYPE tableType);
 
 		// calculate GB fields
-		CGBFieldList CalGBFields(CSmplMsrResultFileMgrPtr pSmplMgr);
+		CGBFieldList CalGBFields(CSmplMsrResultFileMgrPtr pSmplMgr, GB_METHODE_TYPE calType);
 
 		void CategoryGBInclutions(CGBFieldList listCGBField, CALCULATE_TABLE_TYPE ty);
 		

OTSCPP/OTSRptCalculate/GBCal/GBFieldData.cpp

@@ -1373,6 +1373,7 @@ namespace OTSGBCalculate
 	}
 	std::string CGBFieldData::GetGBGradeString()
 	{
+		std::string grdStr;
 		CString Astring = _T("A:") + GetGradeString(GetALevel()->GetThinGrade()) + _T(" ") +			
 			GetGradeString(GetALevel()->GetWideGrade()) + _T(" ") +
 			GetGradeString(GetALevel()->GetSuperGrade()) + _T(" ");
@@ -1385,10 +1386,19 @@ namespace OTSGBCalculate
 		CString Dstring = _T("D:") + GetGradeString(GetDLevel()->GetThinGrade()) + _T(" ") +
 			GetGradeString(GetDLevel()->GetWideGrade()) + _T(" ") +
 			GetGradeString(GetDLevel()->GetSuperGrade()) + _T(" ");
-		CString DSulstring = _T("DSulfide:") + GetGradeString(GetDSulfideLevel()->GetThinGrade()) + _T(" ") +
-			GetGradeString(GetDSulfideLevel()->GetWideGrade()) + _T(" ") +
-			GetGradeString(GetDSulfideLevel()->GetSuperGrade()) ;
-		return std::string((Astring + Bstring + Cstring + Dstring + DSulstring).GetBuffer());
+		if (calcuType == GB_METHODE_TYPE::METHODE_2)
+		{
+			CString DSulstring = _T("DSulfide:") + GetGradeString(GetDSulfideLevel()->GetThinGrade()) + _T(" ") +
+				GetGradeString(GetDSulfideLevel()->GetWideGrade()) + _T(" ") +
+				GetGradeString(GetDSulfideLevel()->GetSuperGrade());
+			grdStr= std::string((Astring + Bstring + Cstring + Dstring + DSulstring).GetBuffer());
+		}
+		else
+		{
+			grdStr= std::string((Astring + Bstring + Cstring + Dstring ).GetBuffer());
+		}
+		
+		return grdStr;
 	}
 	GB_GRADE_TYPE CGBFieldData::GetGBTopGrade()
 	{

OTSCPP/OTSRptCalculate/GBCal/GBFieldData.h

@@ -52,7 +52,8 @@ namespace OTSGBCalculate
 		// D level
 		CGBLevelPtr GetDLevel() { return m_pDLevel; }
 
-	
+		GB_METHODE_TYPE GetCalcuType() { return calcuType; }
+		void SetCalcuType(GB_METHODE_TYPE calType) { calcuType = calType; }
 
 		// D sulfide level
 		CGBLevelPtr GetDSulfideLevel() { return m_pDSulfidLevel; }
@@ -115,6 +116,7 @@ namespace OTSGBCalculate
 		BOOL CaculateLevelFatWidth(COTSParticleList& a_listParticles, GB_LEVEL_TYPE a_nLevel);
 		BOOL CaculateSuper(COTSParticleList& a_listParticles, GB_LEVEL_TYPE a_nLevel);
 		
+		GB_METHODE_TYPE calcuType;
 	private:
 
 

OTSIncAMeasureApp/0-OTSModel/OTSDataType/XMLSerialization.cs

@@ -501,6 +501,11 @@ namespace OTSDataType
                     //string aa = rootNode.Attributes[element.Key].Value;
                     element.Value.getStringPtr(rootNode.Attributes[element.Key].Value);
                 }
+                else
+                {
+                    NLog.LogManager.GetCurrentClassLogger().Error("cann't find " + element.Key + " in config file!");
+
+                }
             }
 
 

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -105,23 +105,24 @@ namespace OTSMeasureApp
             switch (SampleId)
             {
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME:
-                    if (m_measurePara.SetSTDFileName((int)ObjVal))
-                    {
+                if (m_measurePara.SetSTDFileName((int)ObjVal))
+                {
 
-                        m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+                    m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
 
-                        DisplaySampleMeasureInfo(SMInfo);
-                        return;
-                    }
+                    DisplaySampleMeasureInfo(SMInfo);
+                    return;
+                }
                     break;
                 case OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME:
                     string strNewName = (string)ObjVal;
                     strNewName = strNewName.Trim();
                     string oldName = m_measurePara.GetWorkSampleName();
                     if (!m_measurePara.CheckSampleNameIsValid(strNewName))
-                    {
-                        m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+                   {
+
                         //update source grid,recover to the original value
+                        m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                     }
@@ -148,11 +149,11 @@ namespace OTSMeasureApp
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
 
 
-                        DisplaySampleMeasureInfo(SMInfo);
-                        return;
+                    DisplaySampleMeasureInfo(SMInfo);
+                    return;
                     }
                     if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, frmStopModeDialog.TimeMode))    // Prop值变化，修改样品值成功
-                    {
+                   {
 
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
 
@@ -200,42 +201,42 @@ namespace OTSMeasureApp
                         return;
                     }
                     break;
-           
-            }
+             
+                }
 
             //---after modify the value of current sample properties,update the corresponding value of GUI.---
 
             if (OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_GRP_MAX == SampleId
-                   || OTS_SAMPLE_PROP_GRID_ITEMS.MAGNIFICATION == SampleId
-                   || OTS_SAMPLE_PROP_GRID_ITEMS.IMAGERESOLUTION_SIZE == SampleId
+                    || OTS_SAMPLE_PROP_GRID_ITEMS.MAGNIFICATION == SampleId
+                    || OTS_SAMPLE_PROP_GRID_ITEMS.IMAGERESOLUTION_SIZE == SampleId
                    || OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE == SampleId
-                   || OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_MODE == SampleId
-                   )
-            {
+                    || OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_MODE == SampleId
+                    )
+                {
 
 
 
-                var sam = m_MeasureAppForm.m_SamplepaceWindow.GetWorkingVisualSample();
+                        var sam = m_MeasureAppForm.m_SamplepaceWindow.GetWorkingVisualSample();
 
-                m_MeasureAppForm.m_SamplepaceWindow.PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
+                        m_MeasureAppForm.m_SamplepaceWindow.PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
 
 
                 m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
                 DisplaySampleMeasureInfo(SMInfo);
                 return;
-            }
+                }
 
 
             m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
             if (OTS_SAMPLE_PROP_GRID_ITEMS.SWITCH == SampleId)
             {
-              
+                    
                 m_MeasureAppForm.m_SolutionWindows.Rev_MeasureApp_CheckboxStatuChange_Event(m_measurePara.GetWorkSampleName(), SMInfo.TSampleParam.bSwitch);
                 // 设置 开始 ,停止 和检查参数 按钮状态
                 m_MeasureAppForm.m_RibbonFun.SetMeasureRibbonButnStatu();
-            }
+               }
 
-         
+           
           
             m_measurePara.UpdateGroupValAndItemVal(SampleId);
             //update the source grid value