From c07932047ec37cf3be8c007f33d719c0ff1bdc0c Mon Sep 17 00:00:00 2001 From: Lesley Date: Fri, 15 Apr 2016 10:53:33 -0700 Subject: [PATCH] Finish work on issue #21. Update version number to 1.9.7. --- src/BAGIS_P/BagisPExtension.vb | 2 +- src/BAGIS_P/Config.Designer.vb | Bin 26782 -> 26782 bytes src/BAGIS_P/Config.esriaddinx | 4 ++-- .../Forms/FrmExportParametersEwsf.Designer.vb | 14 +++++++------- src/BAGIS_P/Forms/FrmExportParametersEwsf.vb | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/BAGIS_P/BagisPExtension.vb b/src/BAGIS_P/BagisPExtension.vb index 55ffd96..58b9f35 100644 --- a/src/BAGIS_P/BagisPExtension.vb +++ b/src/BAGIS_P/BagisPExtension.vb @@ -6,7 +6,7 @@ Public Class BagisPExtension Inherits ESRI.ArcGIS.Desktop.AddIns.Extension Private Shared s_extension As BagisPExtension - Private m_version As String = " 1.9.6" + Private m_version As String = " 1.9.7" Private m_classLibraryVersion As String = BA_CLASS_LIBRARY_VERSION Private m_aoi As Aoi Private m_settingsPath As String diff --git a/src/BAGIS_P/Config.Designer.vb b/src/BAGIS_P/Config.Designer.vb index b544421c6a0f637c5b086b3054ec6228c6f22363..ae20859202e338c5d4a8d6327005f4ec44359cb3 100644 GIT binary patch delta 29 lcmbPtk#XKd#tlN;jOLRW**9-K#$CY7Y{+1`*^)ms5&)Ye2~7Y1 delta 35 rcmbPtk#XKd#tlN;lb!gRCQlINn>>MCW%Dua0%m3d2D8nU{Hc)u>zWI{ diff --git a/src/BAGIS_P/Config.esriaddinx b/src/BAGIS_P/Config.esriaddinx index 9935ee2..22a78cf 100644 --- a/src/BAGIS_P/Config.esriaddinx +++ b/src/BAGIS_P/Config.esriaddinx @@ -2,11 +2,11 @@ BAGIS_P {1d026ddc-9aa9-4e39-84ac-7bb57a97d4b2} Generate parameters from BAGIS-H for model - 1.9.6 + 1.9.7 Images\BAGIS_P.png Lesley Bross and Geoffrey Duh Portland State University - 04/06/2016 + 04/15/2016 diff --git a/src/BAGIS_P/Forms/FrmExportParametersEwsf.Designer.vb b/src/BAGIS_P/Forms/FrmExportParametersEwsf.Designer.vb index 7dc4962..2043bac 100644 --- a/src/BAGIS_P/Forms/FrmExportParametersEwsf.Designer.vb +++ b/src/BAGIS_P/Forms/FrmExportParametersEwsf.Designer.vb @@ -292,7 +292,7 @@ Partial Class FrmExportParametersEwsf Me.Label7.Size = New System.Drawing.Size(549, 16) Me.Label7.TabIndex = 92 Me.Label7.Text = "The output file is saved as a plain text ASCII file in eWSF parameter file format" & _ - "." + "." ' 'LstProfiles ' @@ -409,7 +409,7 @@ Partial Class FrmExportParametersEwsf Me.TextBox1.Size = New System.Drawing.Size(650, 15) Me.TextBox1.TabIndex = 105 Me.TextBox1.Text = "HRU parameter values not calculated by BAGIS-P will be copied from the parameter " & _ - "template" + "template" ' 'BtnDefaultTemplate ' @@ -560,7 +560,7 @@ Partial Class FrmExportParametersEwsf Me.TextBox5.Size = New System.Drawing.Size(600, 17) Me.TextBox5.TabIndex = 132 Me.TextBox5.Text = "If no resampling resolution is provided, the data layers will be exported using t" & _ - "heir original resolution" + "heir original resolution" ' 'CkParametersOnly ' @@ -639,7 +639,7 @@ Partial Class FrmExportParametersEwsf Me.CkUsePreCalculated.Size = New System.Drawing.Size(689, 20) Me.CkUsePreCalculated.TabIndex = 139 Me.CkUsePreCalculated.Text = "Export pre-calculated nhru parameters (duplicate BAGIS-P output parameters will b" & _ - "e overwritten)" + "e overwritten)" Me.CkUsePreCalculated.UseVisualStyleBackColor = True ' 'Label3 @@ -651,7 +651,7 @@ Partial Class FrmExportParametersEwsf Me.Label3.Size = New System.Drawing.Size(680, 18) Me.Label3.TabIndex = 140 Me.Label3.Text = "Please use the BAGIS-P 'Parameters from Layers Tool' to manage pre-calculated HRU" & _ - " parameters" + " parameters" ' 'CkPeAndSrObs ' @@ -659,9 +659,9 @@ Partial Class FrmExportParametersEwsf Me.CkPeAndSrObs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CkPeAndSrObs.Location = New System.Drawing.Point(172, 231) Me.CkPeAndSrObs.Name = "CkPeAndSrObs" - Me.CkPeAndSrObs.Size = New System.Drawing.Size(582, 20) + Me.CkPeAndSrObs.Size = New System.Drawing.Size(568, 20) Me.CkPeAndSrObs.TabIndex = 141 - Me.CkPeAndSrObs.Text = "Export observed Potential Evaporation and Solar Radiation to the nmonths table" + Me.CkPeAndSrObs.Text = "Include observed Potential Evaporation and Solar Radiation in with export files" Me.CkPeAndSrObs.UseVisualStyleBackColor = True ' 'Label12 diff --git a/src/BAGIS_P/Forms/FrmExportParametersEwsf.vb b/src/BAGIS_P/Forms/FrmExportParametersEwsf.vb index 19e7cb5..24e1c17 100644 --- a/src/BAGIS_P/Forms/FrmExportParametersEwsf.vb +++ b/src/BAGIS_P/Forms/FrmExportParametersEwsf.vb @@ -532,10 +532,10 @@ Public Class FrmExportParametersEwsf If nmonthsTable IsNot Nothing Then Dim paramNamesToUpdate As IList(Of String) = New List(Of String) paramNamesToUpdate.Add(BA_Aoi_Parameter_jh_coef) - 'If CkPeAndSrObs.Checked Then - ' paramNamesToUpdate.Add(BA_Aoi_Parameter_PE_Obs) - ' paramNamesToUpdate.Add(BA_Aoi_Parameter_SR_Obs) - 'End If + If CkPeAndSrObs.Checked Then + paramNamesToUpdate.Add(BA_Aoi_Parameter_PE_Obs) + paramNamesToUpdate.Add(BA_Aoi_Parameter_SR_Obs) + End If nmonthsTable = BA_UpdateParametersInNmonthsTable(nmonthsTable, m_aoiParamTable, paramNamesToUpdate) m_tablesTable(NMONTHS) = nmonthsTable End If