Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/Servo.vcxproj.filters

@@ -99,8 +99,152 @@
    <ClCompile Include="CRecipeList.cpp" />
    <ClCompile Include="CArm.cpp" />
    <ClCompile Include="CArmTray.cpp" />
    <ClCompile Include="ProductionLogDlg.cpp" />
    <ClCompile Include="ProductionLogManager.cpp" />
    <ClCompile Include="PageRecipe.cpp" />
    <ClCompile Include="CDoubleGlass.cpp" />
    <ClCompile Include="CProcessData.cpp" />
    <ClCompile Include="CGlassPool.cpp" />
    <ClCompile Include="CEquipmentPage3.cpp" />
    <ClCompile Include="PageRobotCmd.cpp" />
    <ClCompile Include="CRobotCmdContainerDlg.cpp" />
    <ClCompile Include="CRobotCmdTestDlg.cpp" />
    <ClCompile Include="CPortStatusReport.cpp" />
    <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="CPageDataVarialbles.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" />
    <ClCompile Include="CCarrierSlotSelector.cpp" />
    <ClCompile Include="CCarrierSlotGrid.cpp" />
    <ClCompile Include="..\DAQBridge\buffer\BufferManager.cpp">
      <Filter>DAQBridge</Filter>
    </ClCompile>
    <ClCompile Include="..\DAQBridge\buffer\BufferRegistry.cpp">
      <Filter>DAQBridge</Filter>
    </ClCompile>
    <ClCompile Include="..\DAQBridge\buffer\SampleBuffer.cpp">
      <Filter>DAQBridge</Filter>
    </ClCompile>
    <ClCompile Include="..\DAQBridge\core\Collector.cpp">
      <Filter>DAQBridge</Filter>
    </ClCompile>
    <ClCompile Include="..\DAQBridge\core\Display.cpp">
      <Filter>DAQBridge</Filter>
    </ClCompile>
    <ClCompile Include="..\DAQBridge\net\SocketComm.cpp">
      <Filter>DAQBridge</Filter>
    </ClCompile>
    <ClCompile Include="..\DAQBridge\proto\ProtocolCodec.cpp">
      <Filter>DAQBridge</Filter>
    </ClCompile>
    <ClCompile Include="ClientListDlg.cpp" />
    <ClCompile Include="LoginDlg2.cpp" />
    <ClCompile Include="CUserManager2.cpp" />
    <ClCompile Include="CUserManager2Dlg.cpp" />
    <ClCompile Include="CUserEdit2Dlg.cpp" />
    <ClCompile Include="CUserXLogDlg.cpp" />
    <ClCompile Include="CVariableEditDlg2.cpp" />
    <ClCompile Include="CEventEditDlg.cpp" />
    <ClCompile Include="CReportEditDlg.cpp" />
    <ClCompile Include="ConfigurationProduction.cpp" />
    <ClCompile Include="CPanelProduction.cpp" />
    <ClCompile Include="ProductionStats.cpp" />
    <ClCompile Include="AccordionWnd.cpp" />
    <ClCompile Include="CPageProdOverview.cpp" />
    <ClCompile Include="HmLabel.cpp" />
    <ClCompile Include="CPageCtrlState.cpp" />
    <ClCompile Include="AlarmPopupDlg.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="AlarmManager.h" />
@@ -122,6 +266,7 @@
    <ClInclude Include="stdafx.h" />
    <ClInclude Include="targetver.h" />
    <ClInclude Include="TerminalDisplayDlg.h" />
    <ClInclude Include="ProductionStats.h" />
    <ClInclude Include="SECSRuntimeManager.h" />
    <ClInclude Include="CCLinkPerformance\CCLinkIEControl.h">
      <Filter>CCLinkPerformance</Filter>
@@ -198,8 +343,195 @@
    <ClInclude Include="CRecipeList.h" />
    <ClInclude Include="CArm.h" />
    <ClInclude Include="CArmTray.h" />
    <ClInclude Include="ProductionLogDlg.h" />
    <ClInclude Include="ProductionLogManager.h" />
    <ClInclude Include="PageRecipe.h" />
    <ClInclude Include="CDoubleGlass.h" />
    <ClInclude Include="CProcessData.h" />
    <ClInclude Include="CGlassPool.h" />
    <ClInclude Include="CEquipmentPage3.h" />
    <ClInclude Include="PageRobotCmd.h" />
    <ClInclude Include="CRobotCmdContainerDlg.h" />
    <ClInclude Include="CRobotCmdTestDlg.h" />
    <ClInclude Include="CPortStatusReport.h" />
    <ClInclude Include="MsgDlg.h" />
    <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="CPageDataVarialbles.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" />
    <ClInclude Include="CCarrierSlotSelector.h" />
    <ClInclude Include="CCarrierSlotGrid.h" />
    <ClInclude Include="..\DAQBridge\buffer\BufferManager.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\buffer\BufferRegistry.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\buffer\SampleBuffer.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\core\Collector.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\core\CommBase.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\core\ConnEvents.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\core\DataTypes.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\core\Display.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\net\FrameAssembler.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\net\SocketComm.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\proto\Protocol.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\proto\ProtocolCodec.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="..\DAQBridge\DAQConfig.h">
      <Filter>DAQBridge</Filter>
    </ClInclude>
    <ClInclude Include="ClientListDlg.h" />
    <ClInclude Include="LoginDlg2.h" />
    <ClInclude Include="CUserManager2.h" />
    <ClInclude Include="CUserManager2Dlg.h" />
    <ClInclude Include="CUserEdit2Dlg.h" />
    <ClInclude Include="CUserXLogDlg.h" />
    <ClInclude Include="CVariableEditDlg2.h" />
    <ClInclude Include="CEventEditDlg.h" />
    <ClInclude Include="CReportEditDlg.h" />
    <ClInclude Include="CPanelProduction.h" />
    <ClInclude Include="AccordionWnd.h" />
    <ClInclude Include="CPageProdOverview.h" />
    <ClInclude Include="HmLabel.h" />
    <ClInclude Include="CPageCtrlState.h" />
    <ClInclude Include="AlarmPopupDlg.h" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Servo.rc" />
@@ -210,6 +542,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" />
@@ -218,5 +562,17 @@
    <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>
    <Filter Include="DAQBridge">
      <UniqueIdentifier>{885738f6-3122-4bb9-8308-46b7f692fb13}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
</Project>
</Project>