Change #436

Changed by	tongfei
Changed at	Wed 23 Aug 2017 17:10:03
Repository	http://192.168.123.218:8888/svn/BHClient/trunk
Project	BHClient
Revision	13826

Comments

*merge* branches/BH5000/replace_customtimectrl
[CHG] 切换设备后，保持原有设备选择的历史时间段不变

Changed files

KD5000/AxesLoctionWaterfall/AxesLocationWaterfallDlg.cpp
KD5000/AxesLoctionWaterfall/AxesLocationWaterfallDlg.h
KD5000/AxesLoctionWaterfall/AxesLocationWaterfallPO.cpp
KD5000/AxesLoctionWaterfall/AxesLoctionWaterfall.rc
KD5000/AxisPosition/AxisPosition.rc
KD5000/AxisPosition/AxisPositionPO.cpp
KD5000/AxisPosition/DlgAxisPosition.cpp
KD5000/AxisPosition/DlgAxisPosition.h
KD5000/AxisTrack/AxisTrack.rc
KD5000/AxisTrack/AxisTrackDlg.cpp
KD5000/AxisTrack/AxisTrackDlg.h
KD5000/AxisTrack/AxisTrackPO.cpp
KD5000/BH5000ClientOPPages/BH5000ClientOPPages.vcproj
KD5000/BH5000ClientOPPages/DlgRtHisMode.cpp
KD5000/Cepstrum/Cepstrum.rc
KD5000/Cepstrum/CepstrumOpPage.cpp
KD5000/Cepstrum/CepstrumOpPage.h
KD5000/Cepstrum/CepstrumPO.cpp
KD5000/CompanyAlarm/CompanyAlarm.rc
KD5000/CompanyAlarm/DlgOpPage.cpp
KD5000/CompanyAlarm/DlgOpPage.h
KD5000/CompanyAlarm/POCompanyAlarm.cpp
KD5000/CompreAnalysis/CompreAnalysis.rc
KD5000/CompreAnalysis/CompreAnalysisDlg.cpp
KD5000/CompreAnalysis/CompreAnalysisDlg.h
KD5000/CompreAnalysis/CompreAnalysisPO.cpp
KD5000/CompreAnalysisTurbine/CompreAnalysis.rc
KD5000/CompreAnalysisTurbine/CompreAnalysisDlg.cpp
KD5000/CompreAnalysisTurbine/CompreAnalysisDlg.h
KD5000/CompreAnalysisTurbine/CompreAnalysisPO.cpp
KD5000/CompreMonitoring/CompreMonitoring.rc
KD5000/CompreMonitoring/CompreMonitoringDlg.cpp
KD5000/CompreMonitoring/CompreMonitoringDlg.h
KD5000/CompreMonitoring/CompreMonitoringPO.cpp
KD5000/CompreMonitoringDiesel/CompreMonitoring.rc
KD5000/CompreMonitoringDiesel/CompreMonitoringDlg.cpp
KD5000/CompreMonitoringDiesel/CompreMonitoringDlg.h
KD5000/CompreMonitoringDiesel/CompreMonitoringPO.cpp
KD5000/DieselAlarmQuery/DlgOpPage.cpp
KD5000/DieselAlarmQuery/DlgOpPage.h
KD5000/DieselAlarmQuery/PoRcAlarmQuery.cpp
KD5000/DieselAlarmQuery/RcAlarmQuery.rc
KD5000/DieselHisCompare/DlgOpPage.cpp
KD5000/DieselHisCompare/DlgOpPage.h
KD5000/DieselHisCompare/PORcHisCompare.cpp
KD5000/DieselHisCompare/RcHisCompare.rc
KD5000/DieselImpact/WindPowerPumpDlg.cpp
KD5000/DieselImpact/WindPowerPumpDlg.h
KD5000/DieselImpact/WindPowerPumpImpact.rc
KD5000/DieselImpact/WindPowerPumpPO.cpp
KD5000/DieselMultiParam/DlgOpPage.cpp
KD5000/DieselMultiParam/DlgOpPage.h
KD5000/DieselMultiParam/PORcMultiParam.cpp
KD5000/DieselMultiParam/RcMultiParam.rc
KD5000/DynPressMonitor/RodSink.rc
KD5000/DynPressMonitor/RodSinkOpPage.cpp
KD5000/DynPressMonitor/RodSinkOpPage.h
KD5000/DynPressMonitor/RodSinkPO.cpp
KD5000/DynamicBalanceResponseAnalyze/DlgDynBalanceResponAnalyze.cpp
KD5000/DynamicBalanceResponseAnalyze/DlgDynBalanceResponAnalyze.h
KD5000/DynamicBalanceResponseAnalyze/DynBalanceResponAnalyzePO.cpp
KD5000/DynamicBalanceResponseAnalyze/DynamicBalanceResponseAnalyze.rc
KD5000/GroupAlarm/DlgGroupAlarm.h
KD5000/GroupAlarm/DlgOpPage.cpp
KD5000/GroupAlarm/DlgOpPage.h
KD5000/GroupAlarm/GroupAlarm.rc
KD5000/GroupAlarm/POGroupAlarm.cpp
KD5000/HisProTrend/ChannelTreePage.cpp
KD5000/HisProTrend/ChannelTreePage.h
KD5000/HisProTrend/HisProTrend.rc
KD5000/HisProTrend/HisProTrendPO.cpp
KD5000/InstVel/SampleDlg.cpp
KD5000/InstVel/SampleDlg.h
KD5000/InstVel/SamplePlugin.cpp
KD5000/InstVel/VibrationMonitor.rc
KD5000/PlantGraphR/PGPage.cpp
KD5000/PlantGraphR/PGPage.h
KD5000/PlantGraphR/PanelContainer.cpp
KD5000/PlantGraphR/PlantGraphR.rc
KD5000/PlantGraphR/PlantGraphRPO.cpp
KD5000/PlantGraphRDiesel/PGPage.cpp
KD5000/PlantGraphRDiesel/PGPage.h
KD5000/PlantGraphRDiesel/PlantGraphR.rc
KD5000/PlantGraphRDiesel/PlantGraphRPO.cpp
KD5000/PlantGraphRTurbine/PGPage.cpp
KD5000/PlantGraphRTurbine/PGPage.h
KD5000/PlantGraphRTurbine/PlantGraphR.rc
KD5000/PlantGraphRTurbine/PlantGraphRPO.cpp
KD5000/PlantGraphR_Lubricate/PlantGraphR.aps
KD5000/Power/SampleDlg.cpp
KD5000/Power/SampleDlg.h
KD5000/Power/SamplePlugin.cpp
KD5000/Power/VibrationMonitor.rc
KD5000/RcAlarmQuery/DlgOpPage.cpp
KD5000/RcAlarmQuery/DlgOpPage.h
KD5000/RcAlarmQuery/PoRcAlarmQuery.cpp
KD5000/RcAlarmQuery/RcAlarmQuery.rc
KD5000/RcHisCompare/DlgOpPage.cpp
KD5000/RcHisCompare/DlgOpPage.h
KD5000/RcHisCompare/PORcHisCompare.cpp
KD5000/RcHisCompare/RcHisCompare.rc
KD5000/RcMultiParam/DlgOpPage.cpp
KD5000/RcMultiParam/DlgOpPage.h
KD5000/RcMultiParam/PORcMultiParam.cpp
KD5000/RcMultiParam/RcMultiParam.rc
KD5000/RcStress/DlgOpPage.cpp
KD5000/RcStress/DlgOpPage.h
KD5000/RcStress/PoRcStress.cpp
KD5000/RcStress/RcStress.rc
KD5000/ReportVib/MainPO.cpp
KD5000/ReportVib/ReportVib.rc
KD5000/ReportVib/ReportVibDlg.cpp
KD5000/ReportVib/ReportVibDlg.h
KD5000/RodSink/RodSink.rc
KD5000/RodSink/RodSinkOpPage.cpp
KD5000/RodSink/RodSinkOpPage.h
KD5000/RodSink/RodSinkPO.cpp
KD5000/RotateAlarmQuery/DlgOpPage.cpp
KD5000/RotateAlarmQuery/DlgOpPage.h
KD5000/RotateAlarmQuery/PoRotateAlarmQuery.cpp
KD5000/RotateAlarmQuery/RotateAlarmQuery.rc
KD5000/RunStatus/RunStatus.rc
KD5000/RunStatus/RunStatusDlg.cpp
KD5000/RunStatus/RunStatusDlg.h
KD5000/RunStatus/RunStatusPO.cpp
KD5000/RunStatusDiesel/ChannelTreePage.cpp
KD5000/RunStatusDiesel/ChannelTreePage.h
KD5000/RunStatusDiesel/RunStatusPO.cpp
KD5000/RunStatusDiesel/RunStatus_wangfu.rc
KD5000/RunStatusTurbine/RunStatus.rc
KD5000/RunStatusTurbine/RunStatusDlg.cpp
KD5000/RunStatusTurbine/RunStatusDlg.h
KD5000/RunStatusTurbine/RunStatusPO.cpp
KD5000/RunStatus_R/ChannelTreePage.cpp
KD5000/RunStatus_R/ChannelTreePage.h
KD5000/RunStatus_R/RunStatusPO.cpp
KD5000/RunStatus_R/RunStatus_wangfu.rc
KD5000/SUD/SUD.rc
KD5000/SUD/SUDDlg.cpp
KD5000/SUD/SUDDlg.h
KD5000/SUD/SUDPO.cpp
KD5000/ShiGong/ChannelTreePage.cpp
KD5000/ShiGong/ChannelTreePage.h
KD5000/ShiGong/ShiGong.rc
KD5000/ShiGong/ShiGongPO.cpp
KD5000/TempFieldDistribution/DlgTempFieldDistribution.cpp
KD5000/TempFieldDistribution/DlgTempFieldDistribution.h
KD5000/TempFieldDistribution/TempFieldDistribution.rc
KD5000/TempFieldDistribution/TempFieldDistributionPO.cpp
KD5000/TempOnlineSUD/SUD.rc
KD5000/TempOnlineSUD/SUDDlg.cpp
KD5000/TempOnlineSUD/SUDDlg.h
KD5000/TempOnlineSUD/SUDPO.cpp
KD5000/Three2DimHolospectrum/DlgThree2DimHolospectrumOpPage.cpp
KD5000/Three2DimHolospectrum/DlgThree2DimHolospectrumOpPage.h
KD5000/Three2DimHolospectrum/Three2DimHolospectrum.rc
KD5000/Three2DimHolospectrum/Three2DimHolospectrumPO.cpp
KD5000/TorsVib/SampleDlg.cpp
KD5000/TorsVib/SampleDlg.h
KD5000/TorsVib/SamplePlugin.cpp
KD5000/TorsVib/VibrationMonitor.rc
KD5000/Trend_lubricate/ChannelTreePage.cpp
KD5000/Trend_lubricate/ChannelTreePage.h
KD5000/Trend_lubricate/HisProTrend.rc
KD5000/Trend_lubricate/HisProTrendPO.cpp
KD5000/TurbineAlarmQuery/DlgOpPage.cpp
KD5000/TurbineAlarmQuery/DlgOpPage.h
KD5000/TurbineAlarmQuery/PoRotateAlarmQuery.cpp
KD5000/TurbineAlarmQuery/RotateAlarmQuery.rc
KD5000/TurbinePumpImpact/WindPowerPumpDlg.cpp
KD5000/TurbinePumpImpact/WindPowerPumpDlg.h
KD5000/TurbinePumpImpact/WindPowerPumpImpact.rc
KD5000/TurbinePumpImpact/WindPowerPumpPO.cpp
KD5000/TwoHolospectrum/AxisTrackDlg.cpp
KD5000/TwoHolospectrum/AxisTrackDlg.h
KD5000/TwoHolospectrum/MainPO.cpp
KD5000/TwoHolospectrum/TwoHolospectrum.rc
KD5000/VibFullSpecstrum/VibFullSpecstrum.rc
KD5000/VibFullSpecstrum/VibFullSpecstrumDlg.cpp
KD5000/VibFullSpecstrum/VibFullSpecstrumDlg.h
KD5000/VibFullSpecstrum/VibFullSpecstrumPO.cpp
KD5000/VibHisCompare/DlgVibHisComparePage.cpp
KD5000/VibHisCompare/DlgVibHisComparePage.h
KD5000/VibHisCompare/VibHisCompare.rc
KD5000/VibHisCompare/VibHisComparePO.cpp
KD5000/VibHisCompareTurbine/DlgVibHisComparePage.cpp
KD5000/VibHisCompareTurbine/DlgVibHisComparePage.h
KD5000/VibHisCompareTurbine/VibHisCompare.rc
KD5000/VibHisCompareTurbine/VibHisComparePO.cpp
KD5000/VibMonitorC/VibHisTrendDlg.cpp
KD5000/VibMonitorC/VibHisTrendDlg.h
KD5000/VibMonitorC/VibHisTrendPO.cpp
KD5000/VibMonitorCTurbine/VibHisTrendDlg.cpp
KD5000/VibMonitorCTurbine/VibHisTrendDlg.h
KD5000/VibMonitorCTurbine/VibHisTrendPO.cpp
KD5000/VibrationMonitor/SampleDlg.cpp
KD5000/VibrationMonitor/SampleDlg.h
KD5000/VibrationMonitor/SamplePlugin.cpp
KD5000/VibrationMonitor/VibrationMonitor.rc
KD5000/VibrationMonitorDiesel/SampleDlg.cpp
KD5000/VibrationMonitorDiesel/SampleDlg.h
KD5000/VibrationMonitorDiesel/SamplePlugin.cpp
KD5000/VibrationMonitorDiesel/VibrationMonitor.rc
KD5000/WindAlarmQuery/DlgOpPage.cpp
KD5000/WindAlarmQuery/DlgOpPage.h
KD5000/WindAlarmQuery/PoRotateAlarmQuery.cpp
KD5000/WindAlarmQuery/WindAlarmQuery.rc
KD5000/WindPowerPumpImpact/WindPowerPumpDlg.cpp
KD5000/WindPowerPumpImpact/WindPowerPumpDlg.h
KD5000/WindPowerPumpImpact/WindPowerPumpImpact.rc
KD5000/WindPowerPumpImpact/WindPowerPumpPO.cpp
KD5000/WindPowerPumpRotorDiag/DlgCtrlPage.cpp
KD5000/WindPowerPumpRotorDiag/DlgCtrlPage.h
KD5000/WindPowerPumpRotorDiag/MainPO.cpp
KD5000/WindPowerPumpRotorDiag/WindPowerPumpRotorDiag.rc
KD5000/WindPowerPumpTrend/DlgCtrlPage.cpp
KD5000/WindPowerPumpTrend/DlgCtrlPage.h
KD5000/WindPowerPumpTrend/MainPO.cpp
KD5000/WindPowerPumpTrend/WindPowerPumpTrend.rc
inc/DlgRtHisMode.h