Change #437

Comments

[CHG] 合并柴油机分支代码

Changed files

• inc
• inc/ConfigChecker.h
• inc/DSE_Define.h
• inc/DataCollector.h
• inc/DieselFireInfo.h
• inc/FixDef_Daq.h
• inc/FixDef_Field.h
• inc/Plant.h
• inc/PlantBasicInfo.h
• inc/PlantInfo.h
• inc/PlantStructures.h
• src
• src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.h
• src/BHAdcFastVariantSampler/RuntimeCyclicBuffer.cpp
• src/BHAdcFastVariantSampler/RuntimeCyclicBuffer.h
• src/BHAdcFastVariantSampler/SplitThread.cpp
• src/BHAdcFastVariantSampler/SplitThread.h
• src/BHAdcSampler/BHAdcSampler.cpp
• src/BHAlarmDataSampler/AlarmDataBase.cpp
• src/BHAlarmDataSampler/AlarmDataLoader.cpp
• src/BHAlarmDataSampler/AlarmDataLoader.h
• src/BHAlarmDataSampler/BHAlarmDataSampler.cpp
• src/BHAlarmDataSampler/BHAlarmDataSampler.h
• src/BHPlant/BHDefaultVals.cpp
• src/BHPlant/BHNameUtil.cpp
• src/BHPlant/BHPlant.vcproj
• src/BHPlant/ConfigChecker.cpp
• src/BHPlant/DieselFireInfo.cpp
• src/BHPlant/DieselPlantBasicInfo.cpp
• src/BHPlant/DieselPlantBasicInfo.h
• src/BHPlant/Plant.cpp
• src/BHPlant/PlantBasicInfo.cpp
• src/BHPlant/PlantBasicInfo.h
• src/BHPlant/PlantInfo.cpp
• src/Common/InstRevHelper.cpp
• src/Common/InstRevHelper.h
• src/Common/PlantInfoTransverter.cpp
• src/Common/sgsmooth.cpp
• src/Common/sgsmooth.h
• src/ConfigAssistant
• src/ConfigAssistant/ConfigAssistant.cpp
• src/ConfigAssistant/ConfigAssistant.rc
• src/ConfigAssistant/CtrDlg.cpp
• src/ConfigAssistant/CtrDlg.h
• src/ConfigAssistant/CylindersDlg.cpp
• src/ConfigAssistant/DlgSUDSet.cpp
• src/ConfigAssistant/MeasuringPointsDlg.cpp
• src/ConfigAssistant/MeasuringPointsDlg.h
• src/ConfigAssistant/PlantInfoDlg.cpp
• src/ConfigAssistant/SynFromDB.cpp
• src/ConfigAssistant/resource.h
• src/ConfigAssistant/stdafx.h
• src/KDDAQ/CCurrentComputer.cpp
• src/KDDAQ/CCurrentComputer.h
• src/KDDAQ/CReciprocationAccComputer.cpp
• src/KDDAQ/CReciprocationAccComputer.h
• src/KDDAQ/CReciprocationVecComputer.cpp
• src/KDDAQ/CReciprocationVecComputer.h
• src/KDDAQ/CRotationAccComputer.cpp
• src/KDDAQ/CRotationAccComputer.h
• src/KDDAQ/CRotationAxisDisComputer.cpp
• src/KDDAQ/CRotationAxisDisComputer.h
• src/KDDAQ/CRotationRadialDisComputer.cpp
• src/KDDAQ/CRotationRadialDisComputer.h
• src/KDDAQ/CRotationVecComputer.cpp
• src/KDDAQ/CRotationVecComputer.h
• src/KDDAQ/CVoltageComputer.cpp
• src/KDDAQ/CVoltageComputer.h
• src/KDDAQ/CWindAndPumpAccComputer.cpp
• src/KDDAQ/CWindAndPumpAccComputer.h
• src/KDDAQ/CWindAndPumpVecComputer.cpp
• src/KDDAQ/CWindAndPumpVecComputer.h
• src/KDDAQ/ChanComputer.h
• src/KDDAQ/DAQSetPage.cpp
• src/KDDAQ/DSComm.cpp
• src/KDDAQ/DSComm.h
• src/KDDAQ/DebugHelper.cpp
• src/KDDAQ/DebugHelper.h
• src/KDDAQ/DiselKeyPhaseProcessor.cpp
• src/KDDAQ/DiselKeyPhaseProcessor.h
• src/KDDAQ/DynPressComputer.cpp
• src/KDDAQ/DynPressComputer.h
• src/KDDAQ/ImpactComputer.cpp
• src/KDDAQ/ImpactComputer.h
• src/KDDAQ/InfoDlg.cpp
• src/KDDAQ/InfoDlg.h
• src/KDDAQ/InstVelTimeComputer.cpp
• src/KDDAQ/InstVelTimeComputer.h
• src/KDDAQ/KDDAQ.cpp
• src/KDDAQ/KDDAQ.rc
• src/KDDAQ/KDDAQ.vcproj
• src/KDDAQ/KDDAQDlg.cpp
• src/KDDAQ/LoadComputer.cpp
• src/KDDAQ/LoadComputer.h
• src/KDDAQ/OtherComputer.cpp
• src/KDDAQ/OtherComputer.h
• src/KDDAQ/Processor.cpp
• src/KDDAQ/Processor.h
• src/KDDAQ/RodComputer.cpp
• src/KDDAQ/RodComputer.h
• src/KDDAQ/RodRevComputer.cpp
• src/KDDAQ/RodRevComputer.h
• src/KDDAQ/SudSetPage.cpp
• src/KDDAQ/TorsVibComputer.cpp
• src/KDDAQ/TorsVibComputer.h
• src/KDDAQ/threads.cpp
• src/KDDataReplayer/KDDataReplayer.cpp
• src/KDSimulator/KDSimulator.cpp