Change #196

Changed by	zdl
Changed at	Thu 03 Dec 2015 14:29:06
Repository	http://192.168.123.218:8888/svn/BHClient/trunk
Project	BHClient
Revision	13268

Comments

merge:/branches/BH5000/diesel:11973-12061,12069
[CHG] 合并柴油机版本

Changed files

KD5000/AxesLoctionWaterfall/AxesLocationWaterfallDlg.cpp
KD5000/AxesLoctionWaterfall/AxesLocationWaterfallPO.cpp
KD5000/AxesLoctionWaterfall/AxesLocationWaterfallPO.h
KD5000/BarChart/BarChart.cpp
KD5000/BarChart/BarChartPO.cpp
KD5000/BarChart/BarChartPO.h
KD5000/CompreMonitoringDiesel
KD5000/CompreMonitoringDiesel/BH5000TraceLog.txt
KD5000/CompreMonitoringDiesel/BHCharInfo.cpp
KD5000/CompreMonitoringDiesel/BHCharInfo.h
KD5000/CompreMonitoringDiesel/CompreMonitoring.cpp
KD5000/CompreMonitoringDiesel/CompreMonitoring.def
KD5000/CompreMonitoringDiesel/CompreMonitoring.rc
KD5000/CompreMonitoringDiesel/CompreMonitoring.sln
KD5000/CompreMonitoringDiesel/CompreMonitoringDiesel.vcproj
KD5000/CompreMonitoringDiesel/CompreMonitoringDlg.cpp
KD5000/CompreMonitoringDiesel/CompreMonitoringDlg.h
KD5000/CompreMonitoringDiesel/CompreMonitoringPO.cpp
KD5000/CompreMonitoringDiesel/CompreMonitoringPO.h
KD5000/CompreMonitoringDiesel/ReadMe.txt
KD5000/CompreMonitoringDiesel/Resource.h
KD5000/CompreMonitoringDiesel/res
KD5000/CompreMonitoringDiesel/res/CompreMonitoring.rc2
KD5000/CompreMonitoringDiesel/res/综合监测.ico
KD5000/CompreMonitoringDiesel/stdafx.cpp
KD5000/CompreMonitoringDiesel/stdafx.h
KD5000/DieselAlarmQuery
KD5000/DieselAlarmQuery/AlarmBuffer.cpp
KD5000/DieselAlarmQuery/AlarmBuffer.h
KD5000/DieselAlarmQuery/DieselAlarmQuery.vcproj
KD5000/DieselAlarmQuery/DlgOpPage.cpp
KD5000/DieselAlarmQuery/DlgOpPage.h
KD5000/DieselAlarmQuery/DlgProgress.cpp
KD5000/DieselAlarmQuery/DlgProgress.h
KD5000/DieselAlarmQuery/DlgRepairAdvice.cpp
KD5000/DieselAlarmQuery/DlgRepairAdvice.h
KD5000/DieselAlarmQuery/IStream.cpp
KD5000/DieselAlarmQuery/IStream.h
KD5000/DieselAlarmQuery/KDFigureMulBarInfo.h
KD5000/DieselAlarmQuery/KDFigureSingleBarInfo.h
KD5000/DieselAlarmQuery/KDFigureThemeBase.h
KD5000/DieselAlarmQuery/KDFigureThemeDefine.h
KD5000/DieselAlarmQuery/KDFigureThemeExport.h
KD5000/DieselAlarmQuery/KDFigureThemeManage.h
KD5000/DieselAlarmQuery/KDFigureThemeXP.h
KD5000/DieselAlarmQuery/MainPanel.cpp
KD5000/DieselAlarmQuery/MainPanel.h
KD5000/DieselAlarmQuery/PoRcAlarmQuery.cpp
KD5000/DieselAlarmQuery/PoRcAlarmQuery.h
KD5000/DieselAlarmQuery/RcAlarmQuery.cpp
KD5000/DieselAlarmQuery/RcAlarmQuery.def
KD5000/DieselAlarmQuery/RcAlarmQuery.rc
KD5000/DieselAlarmQuery/ReadMe.txt
KD5000/DieselAlarmQuery/ReportMoniDiagDlg.cpp
KD5000/DieselAlarmQuery/ReportMoniDiagDlg.h
KD5000/DieselAlarmQuery/icon1.ico
KD5000/DieselAlarmQuery/msado15.tlh
KD5000/DieselAlarmQuery/msado15.tli
KD5000/DieselAlarmQuery/res
KD5000/DieselAlarmQuery/res/BAR_MULTI_CHANNEL.ICO
KD5000/DieselAlarmQuery/res/GRAPH09.ICO
KD5000/DieselAlarmQuery/res/GRAPH16.ICO
KD5000/DieselAlarmQuery/res/Generic.Ico
KD5000/DieselAlarmQuery/res/MISC02.ICO
KD5000/DieselAlarmQuery/res/NOTE07.ICO
KD5000/DieselAlarmQuery/res/REFBAR.ICO
KD5000/DieselAlarmQuery/res/RcAlarmQuery.rc2
KD5000/DieselAlarmQuery/res/SINEWAVE.ICO
KD5000/DieselAlarmQuery/res/SpinTest.Ico
KD5000/DieselAlarmQuery/res/Thumbs.db
KD5000/DieselAlarmQuery/res/ViewDIB.ico
KD5000/DieselAlarmQuery/res/bar_comp_fft.ico
KD5000/DieselAlarmQuery/res/bar_comp_histogram.ICO
KD5000/DieselAlarmQuery/res/bar_comp_wave.ico
KD5000/DieselAlarmQuery/res/bar_env_comp_wave.ico
KD5000/DieselAlarmQuery/res/bar_fft.ico
KD5000/DieselAlarmQuery/res/bar_histogram.ICO
KD5000/DieselAlarmQuery/res/bar_multiparam.ICO
KD5000/DieselAlarmQuery/res/bar_pv.ICO
KD5000/DieselAlarmQuery/res/bar_stress.ico
KD5000/DieselAlarmQuery/res/bar_wave.ico
KD5000/DieselAlarmQuery/res/earth.ico
KD5000/DieselAlarmQuery/res/error.ico
KD5000/DieselAlarmQuery/res/icon1.ico
KD5000/DieselAlarmQuery/res/lock_16x16.ico
KD5000/DieselAlarmQuery/res/main_on.ico
KD5000/DieselAlarmQuery/res/multichan.ico
KD5000/DieselAlarmQuery/res/skins-s.bmp
KD5000/DieselAlarmQuery/res/tray1.ico
KD5000/DieselAlarmQuery/res/vmrsample.ico
KD5000/DieselAlarmQuery/resource.h
KD5000/DieselAlarmQuery/stdafx.cpp
KD5000/DieselAlarmQuery/stdafx.h
KD5000/DieselHisCompare
KD5000/DieselHisCompare/DieselHisCompare.vcproj
KD5000/DieselHisCompare/DlgOpPage.cpp
KD5000/DieselHisCompare/DlgOpPage.h
KD5000/DieselHisCompare/PORcHisCompare.cpp
KD5000/DieselHisCompare/PORcHisCompare.h
KD5000/DieselHisCompare/RcHisCompare.cpp
KD5000/DieselHisCompare/RcHisCompare.def
KD5000/DieselHisCompare/RcHisCompare.rc
KD5000/DieselHisCompare/ReadMe.txt
KD5000/DieselHisCompare/icon1.ico
KD5000/DieselHisCompare/res
KD5000/DieselHisCompare/res/RcHisCompare.rc2
KD5000/DieselHisCompare/res/skins-s.bmp
KD5000/DieselHisCompare/resource.h
KD5000/DieselHisCompare/stdafx.cpp
KD5000/DieselHisCompare/stdafx.h
KD5000/DieselHisCompare/历史比较图.ico
KD5000/DieselImpact
KD5000/DieselImpact/AssemImageWnd.cpp
KD5000/DieselImpact/DieselImpact.vcproj
KD5000/DieselImpact/ReadMe.txt
KD5000/DieselImpact/Resource.h
KD5000/DieselImpact/WindPowerPumpDlg.cpp
KD5000/DieselImpact/WindPowerPumpDlg.h
KD5000/DieselImpact/WindPowerPumpImpact.cpp
KD5000/DieselImpact/WindPowerPumpImpact.def
KD5000/DieselImpact/WindPowerPumpImpact.rc
KD5000/DieselImpact/WindPowerPumpImpact.sln
KD5000/DieselImpact/WindPowerPumpPO.cpp
KD5000/DieselImpact/WindPowerPumpPO.h
KD5000/DieselImpact/res
KD5000/DieselImpact/res/WindPowerPumpImpact.rc2
KD5000/DieselImpact/stdafx.cpp
KD5000/DieselImpact/stdafx.h
KD5000/DieselImpact/齿轮图标.ico
KD5000/DieselMultiParam
KD5000/DieselMultiParam/ChangeLog.Log
KD5000/DieselMultiParam/DieselMultiParam.vcproj
KD5000/DieselMultiParam/DlgOpPage.cpp
KD5000/DieselMultiParam/DlgOpPage.h
KD5000/DieselMultiParam/PORcMultiParam.cpp
KD5000/DieselMultiParam/PORcMultiParam.h
KD5000/DieselMultiParam/RcMultiParam.cpp
KD5000/DieselMultiParam/RcMultiParam.def
KD5000/DieselMultiParam/RcMultiParam.rc
KD5000/DieselMultiParam/ReadMe.txt
KD5000/DieselMultiParam/icon1.ico
KD5000/DieselMultiParam/res
KD5000/DieselMultiParam/res/RcMultiParam.rc2
KD5000/DieselMultiParam/res/skins-s.bmp
KD5000/DieselMultiParam/resource.h
KD5000/DieselMultiParam/stdafx.cpp
KD5000/DieselMultiParam/stdafx.h
KD5000/DieselMultiParam/多参数分析.ico
KD5000/HisProTrend/ChannelTreePage.cpp
KD5000/HisProTrend/HisProTrend.cpp
KD5000/HisProTrend/HisProTrendPO.cpp
KD5000/InstVel
KD5000/InstVel/BHBiz.cpp
KD5000/InstVel/BHChannelTree.cpp
KD5000/InstVel/BHChannelTree.h
KD5000/InstVel/DeviceTotalPopupMenu.h
KD5000/InstVel/GlobalFun.cpp
KD5000/InstVel/InstVel.def
KD5000/InstVel/InstVel.vcproj
KD5000/InstVel/KDOnline_1_189.ico
KD5000/InstVel/PanelContainer.cpp
KD5000/InstVel/PanelContainer.h
KD5000/InstVel/RCVibService.cpp
KD5000/InstVel/RCVibService.h
KD5000/InstVel/ReadMe.txt
KD5000/InstVel/SampleDlg.cpp
KD5000/InstVel/SampleDlg.h
KD5000/InstVel/SamplePlugin.cpp
KD5000/InstVel/SamplePlugin.h
KD5000/InstVel/SvcDef.h
KD5000/InstVel/VibrationMonitor.cpp
KD5000/InstVel/VibrationMonitor.rc
KD5000/InstVel/VibrationMonitor.sln
KD5000/InstVel/icon1.ico
KD5000/InstVel/icon2.ico
KD5000/InstVel/icon4.ico
KD5000/InstVel/res
KD5000/InstVel/res/Thumbs.db
KD5000/InstVel/res/VibrationMonitor.rc2
KD5000/InstVel/res/振动监测.ico
KD5000/InstVel/res/概貌图.ico
KD5000/InstVel/resource.h
KD5000/InstVel/stdafx.cpp
KD5000/InstVel/stdafx.h
KD5000/PlantGraphRDiesel
KD5000/PlantGraphRDiesel/CeXDib.cpp
KD5000/PlantGraphRDiesel/CeXDib.h
KD5000/PlantGraphRDiesel/Changelog.log
KD5000/PlantGraphRDiesel/FigurePopupMenu.cpp
KD5000/PlantGraphRDiesel/FigurePopupMenu.h
KD5000/PlantGraphRDiesel/ImageEx.cpp
KD5000/PlantGraphRDiesel/ImageEx.h
KD5000/PlantGraphRDiesel/ListBoxEx.cpp
KD5000/PlantGraphRDiesel/ListBoxEx.h
KD5000/PlantGraphRDiesel/MaxGraphFrame.cpp
KD5000/PlantGraphRDiesel/MaxGraphFrame.h
KD5000/PlantGraphRDiesel/PGPage.cpp
KD5000/PlantGraphRDiesel/PGPage.h
KD5000/PlantGraphRDiesel/PPDrawManager.cpp
KD5000/PlantGraphRDiesel/PPDrawManager.h
KD5000/PlantGraphRDiesel/PPHtmlDrawer.cpp
KD5000/PlantGraphRDiesel/PPHtmlDrawer.h
KD5000/PlantGraphRDiesel/PPTooltip.cpp
KD5000/PlantGraphRDiesel/PPTooltip.h
KD5000/PlantGraphRDiesel/PanelContainer.cpp
KD5000/PlantGraphRDiesel/PanelContainer.h
KD5000/PlantGraphRDiesel/PlantGraph.h
KD5000/PlantGraphRDiesel/PlantGraphR.cpp
KD5000/PlantGraphRDiesel/PlantGraphR.def
KD5000/PlantGraphRDiesel/PlantGraphR.h
KD5000/PlantGraphRDiesel/PlantGraphR.rc
KD5000/PlantGraphRDiesel/PlantGraphR.sln
KD5000/PlantGraphRDiesel/PlantGraphRDiesel.vcproj
KD5000/PlantGraphRDiesel/PlantGraphRPO.cpp
KD5000/PlantGraphRDiesel/PlantGraphRPO.h
KD5000/PlantGraphRDiesel/ReadMe.txt
KD5000/PlantGraphRDiesel/StaticEx.cpp
KD5000/PlantGraphRDiesel/StaticEx.h
KD5000/PlantGraphRDiesel/TrendSel.cpp
KD5000/PlantGraphRDiesel/TrendSel.h
KD5000/PlantGraphRDiesel/WebDlg.cpp
KD5000/PlantGraphRDiesel/WebDlg.h
KD5000/PlantGraphRDiesel/explorer.cpp
KD5000/PlantGraphRDiesel/explorer.h
KD5000/PlantGraphRDiesel/res
KD5000/PlantGraphRDiesel/res/PlantGraphR.rc2
KD5000/PlantGraphRDiesel/res/概貌图.ico
KD5000/PlantGraphRDiesel/resource.h
KD5000/PlantGraphRDiesel/stdafx.cpp
KD5000/PlantGraphRDiesel/stdafx.h
KD5000/Power
KD5000/Power/BHBiz.cpp
KD5000/Power/BHChannelTree.cpp
KD5000/Power/BHChannelTree.h
KD5000/Power/DeviceTotalPopupMenu.h
KD5000/Power/GlobalFun.cpp
KD5000/Power/KDOnline_1_189.ico
KD5000/Power/PanelContainer.cpp
KD5000/Power/PanelContainer.h
KD5000/Power/Power.def
KD5000/Power/Power.vcproj
KD5000/Power/Power.vcproj.bak
KD5000/Power/RCVibService.cpp
KD5000/Power/RCVibService.h
KD5000/Power/ReadMe.txt
KD5000/Power/SampleDlg.cpp
KD5000/Power/SampleDlg.h
KD5000/Power/SamplePlugin.cpp
KD5000/Power/SamplePlugin.h
KD5000/Power/SvcDef.h
KD5000/Power/VibrationMonitor.cpp
KD5000/Power/VibrationMonitor.rc
KD5000/Power/icon1.ico
KD5000/Power/icon2.ico
KD5000/Power/icon4.ico
KD5000/Power/res
KD5000/Power/res/Thumbs.db
KD5000/Power/res/VibrationMonitor.rc2
KD5000/Power/res/振动监测.ico
KD5000/Power/res/概貌图.ico
KD5000/Power/resource.h
KD5000/Power/stdafx.cpp
KD5000/Power/stdafx.h
KD5000/RcStress/DlgOpPage.cpp
KD5000/RcStress/PoRcStress.cpp
KD5000/RcStress/PoRcStress.h
KD5000/RcStress/RcStress.cpp
KD5000/RodSink/PanelContainer.cpp
KD5000/RodSink/RodSink.cpp
KD5000/RodSink/RodSinkPO.cpp
KD5000/RodSink/RodSinkPO.h
KD5000/RunStatusDiesel
KD5000/RunStatusDiesel/ChannelTreePage.cpp
KD5000/RunStatusDiesel/ChannelTreePage.h
KD5000/RunStatusDiesel/ReadMe.txt
KD5000/RunStatusDiesel/Resource.h
KD5000/RunStatusDiesel/RunStatus.h
KD5000/RunStatusDiesel/RunStatusDiesel.vcproj
KD5000/RunStatusDiesel/RunStatusPO.cpp
KD5000/RunStatusDiesel/RunStatusPO.h
KD5000/RunStatusDiesel/RunStatus_wangfu.cpp
KD5000/RunStatusDiesel/RunStatus_wangfu.def
KD5000/RunStatusDiesel/RunStatus_wangfu.rc
KD5000/RunStatusDiesel/RunStatus_wangfu.sln
KD5000/RunStatusDiesel/res
KD5000/RunStatusDiesel/res/RunStatus_wangfu.rc2
KD5000/RunStatusDiesel/res/运行状态图.ico
KD5000/RunStatusDiesel/stdafx.cpp
KD5000/RunStatusDiesel/stdafx.h
KD5000/ShiGong/ShiGongPO.cpp
KD5000/ShiGong/ShiGongPO.h
KD5000/TorsVib
KD5000/TorsVib/BHBiz.cpp
KD5000/TorsVib/BHChannelTree.cpp
KD5000/TorsVib/BHChannelTree.h
KD5000/TorsVib/DeviceTotalPopupMenu.h
KD5000/TorsVib/GlobalFun.cpp
KD5000/TorsVib/KDOnline_1_189.ico
KD5000/TorsVib/PanelContainer.cpp
KD5000/TorsVib/PanelContainer.h
KD5000/TorsVib/RCVibService.cpp
KD5000/TorsVib/RCVibService.h
KD5000/TorsVib/ReadMe.txt
KD5000/TorsVib/SampleDlg.cpp
KD5000/TorsVib/SampleDlg.h
KD5000/TorsVib/SamplePlugin.cpp
KD5000/TorsVib/SamplePlugin.h
KD5000/TorsVib/SvcDef.h
KD5000/TorsVib/TorsVib.vcproj
KD5000/TorsVib/VibrationMonitor.cpp
KD5000/TorsVib/VibrationMonitor.def
KD5000/TorsVib/VibrationMonitor.rc
KD5000/TorsVib/VibrationMonitor.sln
KD5000/TorsVib/icon1.ico
KD5000/TorsVib/icon2.ico
KD5000/TorsVib/icon4.ico
KD5000/TorsVib/res
KD5000/TorsVib/res/Thumbs.db
KD5000/TorsVib/res/VibrationMonitor.rc2
KD5000/TorsVib/res/振动监测.ico
KD5000/TorsVib/res/概貌图.ico
KD5000/TorsVib/resource.h
KD5000/TorsVib/stdafx.cpp
KD5000/TorsVib/stdafx.h
KD5000/VibrationMonitorDiesel
KD5000/VibrationMonitorDiesel/BHBiz.cpp
KD5000/VibrationMonitorDiesel/BHChannelTree.cpp
KD5000/VibrationMonitorDiesel/BHChannelTree.h
KD5000/VibrationMonitorDiesel/DeviceTotalPopupMenu.h
KD5000/VibrationMonitorDiesel/GlobalFun.cpp
KD5000/VibrationMonitorDiesel/KDOnline_1_189.ico
KD5000/VibrationMonitorDiesel/PanelContainer.cpp
KD5000/VibrationMonitorDiesel/PanelContainer.h
KD5000/VibrationMonitorDiesel/RCVibService.cpp
KD5000/VibrationMonitorDiesel/RCVibService.h
KD5000/VibrationMonitorDiesel/ReadMe.txt
KD5000/VibrationMonitorDiesel/SampleDlg.cpp
KD5000/VibrationMonitorDiesel/SampleDlg.h
KD5000/VibrationMonitorDiesel/SamplePlugin.cpp
KD5000/VibrationMonitorDiesel/SamplePlugin.h
KD5000/VibrationMonitorDiesel/SvcDef.h
KD5000/VibrationMonitorDiesel/VibrationMonitor.cpp
KD5000/VibrationMonitorDiesel/VibrationMonitor.def
KD5000/VibrationMonitorDiesel/VibrationMonitor.rc
KD5000/VibrationMonitorDiesel/VibrationMonitor.sln
KD5000/VibrationMonitorDiesel/VibrationMonitorDiesel.vcproj
KD5000/VibrationMonitorDiesel/icon1.ico
KD5000/VibrationMonitorDiesel/icon2.ico
KD5000/VibrationMonitorDiesel/icon4.ico
KD5000/VibrationMonitorDiesel/res
KD5000/VibrationMonitorDiesel/res/VibrationMonitor.rc2
KD5000/VibrationMonitorDiesel/res/振动监测.ico
KD5000/VibrationMonitorDiesel/res/概貌图.ico
KD5000/VibrationMonitorDiesel/resource.h
KD5000/VibrationMonitorDiesel/stdafx.cpp
KD5000/VibrationMonitorDiesel/stdafx.h
bin/700_high.png
bin/700_low.png
bin/bg.jpg
bin/comm_fund.dll
bin_Release/comm_fun.dll
lib/comm_fund.lib
lib_Release/comm_fun.lib