Change #2189

Comments

Merged revision(s) 16029-16064 from DAQ/branches/trunk_核电:

[CHG] 合并核电版本改动

Changed files

• bin
• bin/Debug/inst_vel_calc.dll
• bin/Release/inst_vel_calc.dll
• inc
• inc/ConfigChecker.h
• inc/JsonAccessEx.h
• inc/Plant.h
• inc/inst_vel_calc.h
• lib
• lib/Debug/inst_vel_calc.lib
• lib/Release/inst_vel_calc.lib
• src
• src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.cpp
• src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.h
• src/BHAdcSampler/BHAdcSampler.cpp
• src/BHAlarmDataSampler/BHAlarmDataSampler.cpp
• src/BHCommon/ActivityDataSelector.cpp
• src/BHCommon/ActivityDataSelector.h
• src/BHCommon/ActivityNuclearDataRecorder.cpp
• src/BHCommon/ActivityNuclearDataRecorder.h
• src/BHCommon/AlarmDataBase.cpp
• src/BHCommon/BHCommon.vcproj
• src/BHCommon/DataAlgrithm.cpp
• src/BHCommon/DataAlgrithm.h
• src/BHCommon/EventDataFileManager.cpp
• src/BHCommon/EventDataFileManager.h
• src/BHCommon/EventDetector.h
• src/BHCommon/RevCyclicDataProducer.cpp
• src/BHCommon/RevCyclicDataProducer.h
• src/BHPlant/ConfigChecker.cpp
• src/BHPlant/Plant.cpp
• src/BHSudDataSampler/BHSudDataSampler.cpp
• src/Common/InstRevHelper.cpp
• src/Common/InstRevHelper.h
• src/KDDAQ/ConfigFile.cpp
• src/KDDAQ/DiselKeyPhaseProcessor.cpp
• src/KDDAQ/KDDAQ.cpp
• src/KDDAQ/KDDAQDlg.cpp
• src/KDDAQ/KDDAQDlg.h
• src/KDDAQ/Processor.cpp
• src/KDDataReplayer/KDDataReplayer.cpp
• src/KDSimulator/KDSimulator.cpp
• src/NuclearDataDensifier/AlarmDataReloader.cpp
• src/NuclearDataDensifier/AlarmDataReloader.h
• src/NuclearDataDensifier/NuclearDataDensifier.cpp
• src/NuclearDataDensifier/NuclearDataDensifier.vcproj
• src/NuclearDataDensifier/NuclearDataSelector.cpp
• src/NuclearDataDensifier/NuclearDataSelector.h