~chenluhua/Bond2.git

			@@ -112,10 +112,98 @@
			<ClCompile Include="MsgDlg.cpp" />
			<ClCompile Include="CPagePortStatus.cpp" />
			<ClCompile Include="JobSlotGrid.cpp" />
			<ClCompile Include="GridControl\GridCell.cpp">
			<Filter>GridControl</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\GridCellBase.cpp">
			<Filter>GridControl</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\GridCellButton.cpp">
			<Filter>GridControl</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\GridCtrl.cpp">
			<Filter>GridControl</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\GridDropTarget.cpp">
			<Filter>GridControl</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\GridInPlaceEdit.cpp">
			<Filter>GridControl</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\TitleTip.cpp">
			<Filter>GridControl</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\NewCellTypes\GridCellCheck.cpp">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\NewCellTypes\GridCellCombo.cpp">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\NewCellTypes\GridCellDateTime.cpp">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\NewCellTypes\GridCellNumeric.cpp">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClCompile>
			<ClCompile Include="GridControl\NewCellTypes\GridURLCell.cpp">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClCompile>
			<ClCompile Include="PortConfigurationDlg.cpp" />
			<ClCompile Include="TransferManager.cpp" />
			<ClCompile Include="TopToolbar.cpp" />
			<ClCompile Include="HorizontalLine.cpp" />
			<ClCompile Include="CMyStatusbar.cpp" />
			<ClCompile Include="CRobotTask.cpp" />
			<ClCompile Include="CSlot.cpp" />
			<ClCompile Include="CRobotTaskDlg.cpp" />
			<ClCompile Include="PageTransferLog.cpp" />
			<ClCompile Include="ServoMemDC.cpp" />
			<ClCompile Include="ChangePasswordDlg.cpp" />
			<ClCompile Include="CPageLinkSignal.cpp" />
			<ClCompile Include="LoginDlg.cpp" />
			<ClCompile Include="SystemLogManagerDlg.cpp" />
			<ClCompile Include="UserManagerDlg.cpp" />
			<ClCompile Include="CBaseDlg.cpp" />
			<ClCompile Include="SystemLogManager.cpp" />
			<ClCompile Include="UserManager.cpp" />
			<ClCompile Include="InputDialog.cpp" />
			<ClCompile Include="RecipeManager.cpp" />
			<ClCompile Include="RecipeDeviceBindDlg.cpp" />
			<ClCompile Include="CCustomCheckBox.cpp" />
			<ClCompile Include="CCollectionEvent.cpp" />
			<ClCompile Include="CReport.cpp" />
			<ClCompile Include="CVariable.cpp" />
			<ClCompile Include="CPageVarialbles.cpp" />
			<ClCompile Include="CPageReport.cpp" />
			<ClCompile Include="CPageCollectionEvent.cpp" />
			<ClCompile Include="ProcessJob.cpp" />
			<ClCompile Include="CControlJob.cpp" />
			<ClCompile Include="CExpandableListCtrl.cpp" />
			<ClCompile Include="CControlJobDlg.cpp" />
			<ClCompile Include="CParam.cpp" />
			<ClCompile Include="CPageGlassList.cpp" />
			<ClCompile Include="GlassJson.cpp" />
			<ClCompile Include="..\jsoncpp\lib_json\json_reader.cpp">
			<Filter>JsonCpp</Filter>
			</ClCompile>
			<ClCompile Include="..\jsoncpp\lib_json\json_value.cpp">
			<Filter>JsonCpp</Filter>
			</ClCompile>
			<ClCompile Include="..\jsoncpp\lib_json\json_writer.cpp">
			<Filter>JsonCpp</Filter>
			</ClCompile>
			<ClCompile Include="DeviceRecipeParamDlg.cpp" />
			<ClCompile Include="CSVData.cpp" />
			<ClCompile Include="CServoUtilsTool.cpp" />
			<ClCompile Include="GlassLogDb.cpp" />
			<ClCompile Include="sqlite3.c" />
			<ClCompile Include="CProcessDataListDlg.cpp" />
			<ClCompile Include="GroupLabel.cpp" />
			<ClCompile Include="CControlJobManagerDlg.cpp" />
			<ClCompile Include="CCjPage1.cpp" />
			<ClCompile Include="CCjPage2.cpp" />
			<ClCompile Include="CCjPage3.cpp" />
			<ClCompile Include="CCjPageBase.cpp" />
			</ItemGroup>
			<ItemGroup>
			<ClInclude Include="AlarmManager.h" />
			@@ -227,10 +315,124 @@
			<ClInclude Include="CPagePortStatus.h" />
			<ClInclude Include="ServoCommo.h" />
			<ClInclude Include="JobSlotGrid.h" />
			<ClInclude Include="GridControl\CellRange.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\GridCell.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\GridCellBase.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\GridCellButton.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\GridCtrl.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\GridDropTarget.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\GridInPlaceEdit.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\GridMemDC.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\TitleTip.h">
			<Filter>GridControl</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\NewCellTypes\GridCellCheck.h">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\NewCellTypes\GridCellCombo.h">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\NewCellTypes\GridCellDateTime.h">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\NewCellTypes\GridCellNumeric.h">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClInclude>
			<ClInclude Include="GridControl\NewCellTypes\GridURLCell.h">
			<Filter>GridControl\NewCellTypes</Filter>
			</ClInclude>
			<ClInclude Include="PortConfigurationDlg.h" />
			<ClInclude Include="TransferManager.h" />
			<ClInclude Include="TopToolbar.h" />
			<ClInclude Include="HorizontalLine.h" />
			<ClInclude Include="CMyStatusbar.h" />
			<ClInclude Include="CRobotTask.h" />
			<ClInclude Include="CSlot.h" />
			<ClInclude Include="CRobotTaskDlg.h" />
			<ClInclude Include="PageTransferLog.h" />
			<ClInclude Include="ServoMemDC.h" />
			<ClInclude Include="ChangePasswordDlg.h" />
			<ClInclude Include="CPageLinkSignal.h" />
			<ClInclude Include="LoginDlg.h" />
			<ClInclude Include="SystemLogManagerDlg.h" />
			<ClInclude Include="UserManagerDlg.h" />
			<ClInclude Include="CBaseDlg.h" />
			<ClInclude Include="UserManager.h" />
			<ClInclude Include="SystemLogManager.h" />
			<ClInclude Include="InputDialog.h" />
			<ClInclude Include="RecipeManager.h" />
			<ClInclude Include="RecipeDeviceBindDlg.h" />
			<ClInclude Include="CCustomCheckBox.h" />
			<ClInclude Include="CCollectionEvent.h" />
			<ClInclude Include="CReport.h" />
			<ClInclude Include="CVariable.h" />
			<ClInclude Include="CPageVarialbles.h" />
			<ClInclude Include="CPageReport.h" />
			<ClInclude Include="CPageCollectionEvent.h" />
			<ClInclude Include="ProcessJob.h" />
			<ClInclude Include="CControlJob.h" />
			<ClInclude Include="SerializeUtil.h" />
			<ClInclude Include="CExpandableListCtrl.h" />
			<ClInclude Include="CControlJobDlg.h" />
			<ClInclude Include="CParam.h" />
			<ClInclude Include="CPageGlassList.h" />
			<ClInclude Include="GlassJson.h" />
			<ClInclude Include="..\jsoncpp\include\json\autolink.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="..\jsoncpp\include\json\config.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="..\jsoncpp\include\json\features.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="..\jsoncpp\include\json\forwards.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="..\jsoncpp\include\json\json.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="..\jsoncpp\include\json\reader.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="..\jsoncpp\include\json\value.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="..\jsoncpp\include\json\writer.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h">
			<Filter>JsonCpp</Filter>
			</ClInclude>
			<ClInclude Include="DeviceRecipeParamDlg.h" />
			<ClInclude Include="CSVData.h" />
			<ClInclude Include="CServoUtilsTool.h" />
			<ClInclude Include="GlassLogDb.h" />
			<ClInclude Include="sqlite3.h" />
			<ClInclude Include="sqlite3ext.h" />
			<ClInclude Include="CProcessDataListDlg.h" />
			<ClInclude Include="GroupLabel.h" />
			<ClInclude Include="CControlJobManagerDlg.h" />
			<ClInclude Include="CCjPage1.h" />
			<ClInclude Include="CCjPage2.h" />
			<ClInclude Include="CCjPage3.h" />
			<ClInclude Include="CCjPageBase.h" />
			</ItemGroup>
			<ItemGroup>
			<ResourceCompile Include="Servo.rc" />
			@@ -241,6 +443,18 @@
			<ItemGroup>
			<None Include="packages.config" />
			<None Include="res\Servo.rc2" />
			<None Include="..\jsoncpp\lib_json\json_internalarray.inl">
			<Filter>JsonCpp</Filter>
			</None>
			<None Include="..\jsoncpp\lib_json\json_internalmap.inl">
			<Filter>JsonCpp</Filter>
			</None>
			<None Include="..\jsoncpp\lib_json\json_valueiterator.inl">
			<Filter>JsonCpp</Filter>
			</None>
			<None Include="..\jsoncpp\lib_json\sconscript">
			<Filter>JsonCpp</Filter>
			</None>
			</ItemGroup>
			<ItemGroup>
			<Text Include="ReadMe.txt" />
			@@ -249,5 +463,14 @@
			<Filter Include="CCLinkPerformance">
			<UniqueIdentifier>{77338295-9841-4706-8816-a958b1b5c465}</UniqueIdentifier>
			</Filter>
			<Filter Include="GridControl">
			<UniqueIdentifier>{1206b229-6054-40f2-8d8a-5848582a3896}</UniqueIdentifier>
			</Filter>
			<Filter Include="GridControl\NewCellTypes">
			<UniqueIdentifier>{52ebd40d-fb71-4a53-93ab-5b93670c706d}</UniqueIdentifier>
			</Filter>
			<Filter Include="JsonCpp">
			<UniqueIdentifier>{a877af37-2f78-484f-b1bb-276edbbcd694}</UniqueIdentifier>
			</Filter>
			</ItemGroup>
			</Project>