IStation/shys/ChEqCalc.V1.3.git

			@@ -40,7 +40,7 @@
			/// </summary>
			public void InitialDataSource()
			{
			var anaSetting = IStation.Calc.ErQu.GlobalParas.AnaSetting;
			var anaSetting = IStation.AnaGlobalParas.Setting;
			if (anaSetting == null)
			return;
			dateEditDay.DateTime = DateTime.Today;
			@@ -53,7 +53,7 @@
			{
			this.Invoke(new Action(() =>
			{
			textEdit当前水库水位.Text = v.ToString();
			textEdit当前水库水位.Text = Math.Round( v,2).ToString();
			}));
			}

			@@ -95,11 +95,22 @@

			#region 获取

			public IStation.Model.AnaRequest GetAnaRequest()
			public IStation.CalcModel.AnaRequest GetAnaRequest()
			{
			IStation.Model.AnaRequest request = new Model.AnaRequest();
			IStation.CalcModel.AnaRequest request = new CalcModel.AnaRequest();
			request.CalcOptType = GetOptCalcType();
			request.Day = GetAnaDay();
			request.StartTime = new DateTime(dateEditDay.DateTime.Year, dateEditDay.DateTime.Month, dateEditDay.DateTime.Day, Convert.ToInt32(spinEditStart.EditValue), 0, 0);
			if(Convert.ToInt32(spinEditStart.EditValue)<= Convert.ToInt32(spinEditEnd.EditValue))
			{
			request.EndTime = new DateTime(dateEditDay.DateTime.Year, dateEditDay.DateTime.Month, dateEditDay.DateTime.Day, Convert.ToInt32(spinEditEnd.EditValue), 0, 0);
			}
			else
			{
			request.EndTime = new DateTime(dateEditDay.DateTime.Year, dateEditDay.DateTime.Month, dateEditDay.DateTime.Day, Convert.ToInt32(spinEditEnd.EditValue), 0, 0);
			request.EndTime.AddDays(1);
			}


			request.WaterLevels长江 = this._waterLevels长江;
			request.StartOpenCount = Convert.ToInt32(
			imageComboCurrentOpenCount.EditValue);
			@@ -185,10 +196,7 @@
			}
			return sortType;
			}
			public DateTime GetAnaDay()
			{
			return dateEditDay.DateTime;
			}


			#endregion

			@@ -298,7 +306,7 @@

			private void NextStep()
			{
			var anaSetting = IStation.Calc.ErQu.GlobalParas.AnaSetting;
			var anaSetting = IStation.AnaGlobalParas.Setting;
			if (anaSetting == null)
			return;
			anaSetting.OptSortType = imageComboClacOptType.SelectedIndex;
			@@ -362,7 +370,7 @@
			_waterLevels长江 = viewRealTimeRiverWaterLevelCtrl1.SetBindingData3Day(this.dateEditDay.DateTime, out benchmark);
			if (benchmark != null && _waterLevels长江 != null)
			{
			var anaSetting = IStation.Calc.ErQu.GlobalParas.AnaSetting;
			var anaSetting = IStation.AnaGlobalParas.Setting;

			layoutControlGroup2.Text = "长江水位: 暂时认为潮汐查询的数据( 就是陈行基准,如不是,需要修正)";
			// layoutControlGroup2.Text = string.Format
			@@ -411,7 +419,7 @@
			/// <param name="endTime"></param>
			private void GetAnaRangeTime(out DateTime startTime, out DateTime endTime)
			{
			var anaSetting = IStation.Calc.ErQu.GlobalParas.AnaSetting;
			var anaSetting = IStation.AnaGlobalParas.Setting;

			var day = this.dateEditDay.DateTime.Date;
			var startHour = anaSetting.StartHourPerDay;
			@@ -576,9 +584,9 @@
			private void imageComboSouceWL_SelectedIndexChanged(object sender, EventArgs e)
			{
			if (imageComboSouceWL.SelectedIndex == 0)
			viewRealTimeRiverWaterLevelCtrl1.SetTideSouce(River.eTideSouce.Book);
			viewRealTimeRiverWaterLevelCtrl1.SetTideSouce(Model.eTideSouce.Book);
			else
			viewRealTimeRiverWaterLevelCtrl1.SetTideSouce(River.eTideSouce.Web);
			viewRealTimeRiverWaterLevelCtrl1.SetTideSouce(Model.eTideSouce.Web);

			Initial长江水位();
			}
			@@ -628,7 +636,7 @@
			var v = IStation.BLL.ReservoirWaterLevel.GetTodayEndPredictiveValue();
			if (v > 0)
			{
			textEdit当前水库水位.Text = v.ToString();
			textEdit当前水库水位.Text = Math.Round(v, 2).ToString();
			}
			else
			{