Merge remote-tracking branch 'origin/patch' into patch

Author: cpaulgilman

deploy/runtime/ui/MSPT System Design.txt

@@ -1,7 +1,7 @@
 MSPT System Design
 869
 941
-22
+21
 Numeric
 
 1
@@ -133,7 +133,7 @@ X
 219
 Y
 3
-258
+240
 Width
 3
 100
@@ -192,7 +192,7 @@ X
 219
 Y
 3
-234
+216
 Width
 3
 100
@@ -513,7 +513,7 @@ X
 12
 Y
 3
-288
+273
 Width
 3
 405
@@ -549,7 +549,7 @@ X
 12
 Y
 3
-216
+198
 Width
 3
 405
@@ -803,65 +803,6 @@ TabOrder
 4294967295
 Numeric
 
-1
-16
-Name
-5
-9
-sf_excess
-X
-3
-219
-Y
-3
-189
-Width
-3
-100
-Height
-3
-21
-Value
-1
-0
-Mode
-3
-1
-Format
-3
-1
-Decimals
-3
-3
-Prefix
-5
-0
-Suffix
-5
-0
-ThousandsSep
-2
-1
-Editable
-2
-1
-ForeColour
-4
-0
-0
-0
-255
-BackColour
-4
-255
-255
-255
-255
-TabOrder
-3
-4294967295
-Numeric
-
 1
 16
 Name
@@ -932,7 +873,7 @@ X
 219
 Y
 3
-309
+294
 Width
 3
 100
@@ -991,7 +932,7 @@ X
 219
 Y
 3
-333
+318
 Width
 3
 100

deploy/runtime/ui/Tower SolarPilot Solar Field.txt

@@ -147,20 +147,20 @@ Name
 btn_optimize
 X
 3
-21
+303
 Y
 3
-321
+336
 Width
 3
-368
+86
 Height
 3
 25
 Caption
 5
-29
-Optimize solar field geometry
+9
+Calculate
 TabOrder
 3
 4294967295
@@ -174,20 +174,20 @@ Name
 btn_solarpilot
 X
 3
-21
+303
 Y
 3
-294
+309
 Width
 3
-368
+86
 Height
 3
 25
 Caption
 5
-25
-Generate heliostat layout
+9
+Calculate
 TabOrder
 3
 4294967295
@@ -2305,17 +2305,17 @@ X
 21
 Y
 3
-348
+309
 Width
 3
-230
+281
 Height
 3
 24
 Caption
 5
-27
-Always layout automatically
+48
+Generate heliostat layout using tower dimensions
 State
 2
 0
@@ -2332,20 +2332,20 @@ Name
 override_opt
 X
 3
-255
+21
 Y
 3
-348
+336
 Width
 3
-135
+279
 Height
 3
 24
 Caption
 5
-15
-Always optimize
+46
+Optimize heliostat layout and tower dimensions
 State
 2
 0

deploy/runtime/webapis.conf

@@ -5,7 +5,7 @@ website=http://sam.nrel.gov
 forum=https://sam.nrel.gov/support
 support_email=mailto:[email protected]
 release_notes=http://htmlpreview.github.io/?https://github.com/NREL/SAM/blob/release/release-notes.html
-windtoolkit=http://developer.nrel.gov/api/wind/srw_aggregate_extract?api_key=<SAMAPIKEY>&year=<YEAR>&lat=<LAT>&lon=<LON>
+windtoolkit=https://developer.nrel.gov/api/wind-toolkit/wind/wtk_srw_download?year=<YEAR>&lat=<LAT>&lon=<LON>&hubheight=<HUBHEIGHT>&api_key=<SAMAPIKEY>
 biomass_resource=https://developer.nrel.gov/api/opencarto/biopower/v1/geo_services?api_key=<SAMAPIKEY>
 energy_crop=http://developer.nrel.gov/api/biomass/btu_energy_feedstocks?api_key=<SAMAPIKEY>
 nsrdb_query=https://developer.nrel.gov/api/solar/nsrdb_data_query.json?&api_key=<SAMAPIKEY>&lat=<LAT>&lon=<LON>