diff --git a/.gitignore b/.gitignore index dbc3aedb8..0283fa50d 100644 --- a/.gitignore +++ b/.gitignore @@ -394,3 +394,5 @@ deploy/physical_trough_v2_mimo_ssc_auto_exec.lk deploy/physical_trough_IPH_v2_mimo_ssc_auto_exec.lk /samples/CSP/sco2_analysis_python_V2/.vscode + +SAM diff --git a/deploy/runtime/ui/Battery Dispatch Grid Power Targets.json b/deploy/runtime/ui/Battery Dispatch Grid Power Targets.json index 6d3f411ba..c5f9d4114 100644 --- a/deploy/runtime/ui/Battery Dispatch Grid Power Targets.json +++ b/deploy/runtime/ui/Battery Dispatch Grid Power Targets.json @@ -1,7 +1,7 @@ { "Name": "Battery Dispatch Grid Power Targets", - "Width": 1051.0, - "Height": 146.0, + "Width": 1058.0, + "Height": 203.0, "FormObjects": { "Choice": { "Visible": 1.0, @@ -65,7 +65,7 @@ }, "Height": { "Type": 3.0, - "Integer": 51.0 + "Integer": 78.0 }, "Tool Tip": { "Type": 5.0, @@ -119,7 +119,7 @@ }, "Y": { "Type": 3.0, - "Integer": 108.0 + "Integer": 141.0 }, "Width": { "Type": 3.0, @@ -164,7 +164,7 @@ }, "Y": { "Type": 3.0, - "Integer": 78.0 + "Integer": 111.0 }, "Width": { "Type": 3.0, @@ -209,7 +209,7 @@ }, "Height": { "Type": 3.0, - "Integer": 136.0 + "Integer": 184.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Battery Dispatch Options BTM.json b/deploy/runtime/ui/Battery Dispatch Options BTM.json index 44f13390a..7eb4e2a05 100644 --- a/deploy/runtime/ui/Battery Dispatch Options BTM.json +++ b/deploy/runtime/ui/Battery Dispatch Options BTM.json @@ -20,7 +20,7 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 430.0 }, "Height": { "Type": 3.0, @@ -61,7 +61,7 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 430.0 }, "Height": { "Type": 3.0, @@ -102,7 +102,7 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 430.0 }, "Height": { "Type": 3.0, @@ -143,7 +143,7 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 430.0 }, "Height": { "Type": 3.0, @@ -184,7 +184,7 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 430.0 }, "Height": { "Type": 3.0, @@ -225,7 +225,7 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 430.0 }, "Height": { "Type": 3.0, @@ -266,7 +266,7 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 430.0 }, "Height": { "Type": 3.0, @@ -356,7 +356,7 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 430.0 }, "Height": { "Type": 3.0, @@ -389,7 +389,7 @@ }, "X": { "Type": 3.0, - "Integer": 690.0 + "Integer": 741.0 }, "Y": { "Type": 3.0, @@ -397,7 +397,7 @@ }, "Width": { "Type": 3.0, - "Integer": 348.0 + "Integer": 297.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/Battery Losses.json b/deploy/runtime/ui/Battery Losses.json index 9fa708b32..611167f15 100644 --- a/deploy/runtime/ui/Battery Losses.json +++ b/deploy/runtime/ui/Battery Losses.json @@ -1,7 +1,7 @@ { "Name": "Battery Losses", - "Width": 1052.0, - "Height": 352.0, + "Width": 1053.0, + "Height": 399.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 135.0 + "Integer": 180.0 }, "Tool Tip": { "Type": 5.0, @@ -127,7 +127,7 @@ }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -463,7 +463,7 @@ }, "Height": { "Type": 3.0, - "Integer": 32.0 + "Integer": 59.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Battery Model Simple with REopt.json b/deploy/runtime/ui/Battery Model Simple with REopt.json index 218a8d5ad..24003af11 100644 --- a/deploy/runtime/ui/Battery Model Simple with REopt.json +++ b/deploy/runtime/ui/Battery Model Simple with REopt.json @@ -1,7 +1,7 @@ { "Name": "Battery Model Simple with REopt", - "Width": 876.0, - "Height": 400.0, + "Width": 881.0, + "Height": 465.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 396.0 + "Integer": 456.0 }, "Tool Tip": { "Type": 5.0, @@ -49,11 +49,11 @@ }, "X": { "Type": 3.0, - "Integer": 102.0 + "Integer": 99.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 273.0 }, "Width": { "Type": 3.0, @@ -110,11 +110,11 @@ }, "X": { "Type": 3.0, - "Integer": 204.0 + "Integer": 198.0 }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 162.0 }, "Width": { "Type": 3.0, @@ -159,7 +159,7 @@ }, "Y": { "Type": 3.0, - "Integer": 96.0 + "Integer": 102.0 }, "Width": { "Type": 3.0, @@ -167,7 +167,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 45.0 }, "Tool Tip": { "Type": 5.0, @@ -465,11 +465,11 @@ }, "X": { "Type": 3.0, - "Integer": 27.0 + "Integer": 24.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -477,7 +477,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 45.0 }, "Tool Tip": { "Type": 5.0, @@ -527,11 +527,11 @@ }, "X": { "Type": 3.0, - "Integer": 96.0 + "Integer": 93.0 }, "Y": { "Type": 3.0, - "Integer": 357.0 + "Integer": 411.0 }, "Width": { "Type": 3.0, @@ -564,11 +564,11 @@ }, "X": { "Type": 3.0, - "Integer": 486.0 + "Integer": 483.0 }, "Y": { "Type": 3.0, - "Integer": 357.0 + "Integer": 411.0 }, "Width": { "Type": 3.0, @@ -609,7 +609,7 @@ }, "Y": { "Type": 3.0, - "Integer": 174.0 + "Integer": 201.0 }, "Width": { "Type": 3.0, @@ -705,11 +705,11 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 294.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -755,11 +755,11 @@ }, "X": { "Type": 3.0, - "Integer": 27.0 + "Integer": 24.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 228.0 }, "Width": { "Type": 3.0, @@ -767,7 +767,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 45.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Battery REopt Optimization.json b/deploy/runtime/ui/Battery REopt Optimization.json index 8dc50ca31..669cea2a9 100644 --- a/deploy/runtime/ui/Battery REopt Optimization.json +++ b/deploy/runtime/ui/Battery REopt Optimization.json @@ -1,7 +1,7 @@ { "Name": "Battery REopt Optimization", "Width": 1052.0, - "Height": 127.0, + "Height": 153.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 54.0 + "Integer": 69.0 }, "Tool Tip": { "Type": 5.0, @@ -78,7 +78,7 @@ }, "Y": { "Type": 3.0, - "Integer": 81.0 + "Integer": 105.0 }, "Width": { "Type": 3.0, @@ -123,7 +123,7 @@ }, "Height": { "Type": 3.0, - "Integer": 117.0 + "Integer": 141.0 }, "Tool Tip": { "Type": 5.0, @@ -152,7 +152,7 @@ }, "Y": { "Type": 3.0, - "Integer": 81.0 + "Integer": 105.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Battery Standalone Timestep.json b/deploy/runtime/ui/Battery Standalone Timestep.json index 29a7203df..70bf4678e 100644 --- a/deploy/runtime/ui/Battery Standalone Timestep.json +++ b/deploy/runtime/ui/Battery Standalone Timestep.json @@ -1,7 +1,7 @@ { "Name": "Battery Standalone Timestep", - "Width": 1052.0, - "Height": 95.0, + "Width": 1050.0, + "Height": 129.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 87.0 + "Integer": 117.0 }, "Tool Tip": { "Type": 5.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 51.0 }, "Tool Tip": { "Type": 5.0, @@ -115,7 +115,7 @@ }, "Y": { "Type": 3.0, - "Integer": 60.0 + "Integer": 81.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Battery Thermal.json b/deploy/runtime/ui/Battery Thermal.json index de764eb41..15ad55311 100644 --- a/deploy/runtime/ui/Battery Thermal.json +++ b/deploy/runtime/ui/Battery Thermal.json @@ -1,7 +1,7 @@ { "Name": "Battery Thermal", - "Width": 1051.0, - "Height": 565.0, + "Width": 1053.0, + "Height": 604.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 559.0 + "Integer": 589.0 }, "Tool Tip": { "Type": 5.0, @@ -215,11 +215,11 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 486.0 }, "Y": { "Type": 3.0, - "Integer": 330.0 + "Integer": 372.0 }, "Width": { "Type": 3.0, @@ -426,11 +426,11 @@ }, "X": { "Type": 3.0, - "Integer": 210.0 + "Integer": 216.0 }, "Y": { "Type": 3.0, - "Integer": 330.0 + "Integer": 372.0 }, "Width": { "Type": 3.0, @@ -509,11 +509,11 @@ }, "X": { "Type": 3.0, - "Integer": 210.0 + "Integer": 216.0 }, "Y": { "Type": 3.0, - "Integer": 387.0 + "Integer": 429.0 }, "Width": { "Type": 3.0, @@ -592,11 +592,11 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 486.0 }, "Y": { "Type": 3.0, - "Integer": 420.0 + "Integer": 462.0 }, "Width": { "Type": 3.0, @@ -716,11 +716,11 @@ }, "X": { "Type": 3.0, - "Integer": 210.0 + "Integer": 216.0 }, "Y": { "Type": 3.0, - "Integer": 420.0 + "Integer": 462.0 }, "Width": { "Type": 3.0, @@ -799,11 +799,11 @@ }, "X": { "Type": 3.0, - "Integer": 210.0 + "Integer": 216.0 }, "Y": { "Type": 3.0, - "Integer": 450.0 + "Integer": 492.0 }, "Width": { "Type": 3.0, @@ -882,11 +882,11 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 486.0 }, "Y": { "Type": 3.0, - "Integer": 387.0 + "Integer": 429.0 }, "Width": { "Type": 3.0, @@ -1078,11 +1078,11 @@ }, "X": { "Type": 3.0, - "Integer": 72.0 + "Integer": 78.0 }, "Y": { "Type": 3.0, - "Integer": 360.0 + "Integer": 402.0 }, "Width": { "Type": 3.0, @@ -1169,11 +1169,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 21.0 }, "Y": { "Type": 3.0, - "Integer": 306.0 + "Integer": 348.0 }, "Width": { "Type": 3.0, @@ -1248,11 +1248,11 @@ }, "X": { "Type": 3.0, - "Integer": 25.0 + "Integer": 24.0 }, "Y": { "Type": 3.0, - "Integer": 489.0 + "Integer": 525.0 }, "Width": { "Type": 3.0, @@ -1260,7 +1260,7 @@ }, "Height": { "Type": 3.0, - "Integer": 63.0 + "Integer": 66.0 }, "Tool Tip": { "Type": 5.0, @@ -1384,7 +1384,7 @@ }, "Height": { "Type": 3.0, - "Integer": 57.0 + "Integer": 96.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Battery Voltage.json b/deploy/runtime/ui/Battery Voltage.json index e889700b4..c823fc249 100644 --- a/deploy/runtime/ui/Battery Voltage.json +++ b/deploy/runtime/ui/Battery Voltage.json @@ -1,7 +1,7 @@ { "Name": "Battery Voltage", - "Width": 1056.0, - "Height": 709.0, + "Width": 1055.0, + "Height": 732.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 696.0 + "Integer": 720.0 }, "Tool Tip": { "Type": 5.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 543.0 + "Integer": 567.0 }, "Width": { "Type": 3.0, @@ -136,7 +136,7 @@ }, "Y": { "Type": 3.0, - "Integer": 489.0 + "Integer": 513.0 }, "Width": { "Type": 3.0, @@ -219,7 +219,7 @@ }, "Y": { "Type": 3.0, - "Integer": 516.0 + "Integer": 540.0 }, "Width": { "Type": 3.0, @@ -302,7 +302,7 @@ }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 402.0 }, "Width": { "Type": 3.0, @@ -385,7 +385,7 @@ }, "Y": { "Type": 3.0, - "Integer": 435.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -468,7 +468,7 @@ }, "Y": { "Type": 3.0, - "Integer": 462.0 + "Integer": 486.0 }, "Width": { "Type": 3.0, @@ -551,7 +551,7 @@ }, "Y": { "Type": 3.0, - "Integer": 408.0 + "Integer": 432.0 }, "Width": { "Type": 3.0, @@ -634,7 +634,7 @@ }, "Y": { "Type": 3.0, - "Integer": 384.0 + "Integer": 408.0 }, "Width": { "Type": 3.0, @@ -696,7 +696,7 @@ }, "Y": { "Type": 3.0, - "Integer": 357.0 + "Integer": 381.0 }, "Width": { "Type": 3.0, @@ -746,7 +746,7 @@ }, "Y": { "Type": 3.0, - "Integer": 357.0 + "Integer": 381.0 }, "Width": { "Type": 3.0, @@ -796,7 +796,7 @@ }, "Y": { "Type": 3.0, - "Integer": 180.0 + "Integer": 204.0 }, "Width": { "Type": 3.0, @@ -879,7 +879,7 @@ }, "Y": { "Type": 3.0, - "Integer": 207.0 + "Integer": 231.0 }, "Width": { "Type": 3.0, @@ -962,7 +962,7 @@ }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 258.0 }, "Width": { "Type": 3.0, @@ -1045,7 +1045,7 @@ }, "Y": { "Type": 3.0, - "Integer": 114.0 + "Integer": 138.0 }, "Width": { "Type": 3.0, @@ -1094,7 +1094,7 @@ }, "Y": { "Type": 3.0, - "Integer": 417.0 + "Integer": 441.0 }, "Width": { "Type": 3.0, @@ -1207,7 +1207,7 @@ }, "Y": { "Type": 3.0, - "Integer": 87.0 + "Integer": 111.0 }, "Width": { "Type": 3.0, @@ -1236,7 +1236,7 @@ }, "Y": { "Type": 3.0, - "Integer": 570.0 + "Integer": 594.0 }, "Width": { "Type": 3.0, @@ -1306,7 +1306,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 72.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/CEC Performance Model with User Entered Specifications.json b/deploy/runtime/ui/CEC Performance Model with User Entered Specifications.json index 8c821b92f..9165a9abe 100644 --- a/deploy/runtime/ui/CEC Performance Model with User Entered Specifications.json +++ b/deploy/runtime/ui/CEC Performance Model with User Entered Specifications.json @@ -1,7 +1,7 @@ { "Name": "CEC Performance Model with User Entered Specifications", "Width": 1157.0, - "Height": 803.0, + "Height": 814.0, "FormObjects": { "Numeric": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 579.0 + "Integer": 594.0 }, "Width": { "Type": 3.0, @@ -385,11 +385,11 @@ }, "X": { "Type": 3.0, - "Integer": 354.0 + "Integer": 408.0 }, "Y": { "Type": 3.0, - "Integer": 561.0 + "Integer": 570.0 }, "Width": { "Type": 3.0, @@ -468,11 +468,11 @@ }, "X": { "Type": 3.0, - "Integer": 354.0 + "Integer": 408.0 }, "Y": { "Type": 3.0, - "Integer": 507.0 + "Integer": 516.0 }, "Width": { "Type": 3.0, @@ -551,11 +551,11 @@ }, "X": { "Type": 3.0, - "Integer": 354.0 + "Integer": 408.0 }, "Y": { "Type": 3.0, - "Integer": 534.0 + "Integer": 543.0 }, "Width": { "Type": 3.0, @@ -638,7 +638,7 @@ }, "Y": { "Type": 3.0, - "Integer": 552.0 + "Integer": 567.0 }, "Width": { "Type": 3.0, @@ -886,7 +886,7 @@ }, "Y": { "Type": 3.0, - "Integer": 735.0 + "Integer": 750.0 }, "Width": { "Type": 3.0, @@ -1111,7 +1111,7 @@ }, "Y": { "Type": 3.0, - "Integer": 510.0 + "Integer": 525.0 }, "Width": { "Type": 3.0, @@ -1235,7 +1235,7 @@ }, "Y": { "Type": 3.0, - "Integer": 537.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, @@ -1522,7 +1522,7 @@ }, "Y": { "Type": 3.0, - "Integer": 642.0 + "Integer": 657.0 }, "Width": { "Type": 3.0, @@ -1812,7 +1812,7 @@ }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 540.0 }, "Width": { "Type": 3.0, @@ -1895,7 +1895,7 @@ }, "Y": { "Type": 3.0, - "Integer": 552.0 + "Integer": 567.0 }, "Width": { "Type": 3.0, @@ -1978,7 +1978,7 @@ }, "Y": { "Type": 3.0, - "Integer": 579.0 + "Integer": 594.0 }, "Width": { "Type": 3.0, @@ -2061,7 +2061,7 @@ }, "Y": { "Type": 3.0, - "Integer": 606.0 + "Integer": 621.0 }, "Width": { "Type": 3.0, @@ -2144,7 +2144,7 @@ }, "Y": { "Type": 3.0, - "Integer": 633.0 + "Integer": 648.0 }, "Width": { "Type": 3.0, @@ -2227,7 +2227,7 @@ }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 540.0 }, "Width": { "Type": 3.0, @@ -2310,7 +2310,7 @@ }, "Y": { "Type": 3.0, - "Integer": 612.0 + "Integer": 627.0 }, "Width": { "Type": 3.0, @@ -2434,7 +2434,7 @@ }, "Y": { "Type": 3.0, - "Integer": 702.0 + "Integer": 717.0 }, "Width": { "Type": 3.0, @@ -2691,7 +2691,7 @@ }, "Height": { "Type": 3.0, - "Integer": 476.0 + "Integer": 488.0 }, "Tool Tip": { "Type": 5.0, @@ -2720,7 +2720,7 @@ }, "Y": { "Type": 3.0, - "Integer": 681.0 + "Integer": 696.0 }, "Width": { "Type": 3.0, @@ -2757,7 +2757,7 @@ }, "Y": { "Type": 3.0, - "Integer": 600.0 + "Integer": 615.0 }, "Width": { "Type": 3.0, @@ -2905,7 +2905,7 @@ }, "Y": { "Type": 3.0, - "Integer": 702.0 + "Integer": 717.0 }, "Width": { "Type": 3.0, @@ -2942,7 +2942,7 @@ }, "Y": { "Type": 3.0, - "Integer": 702.0 + "Integer": 717.0 }, "Width": { "Type": 3.0, @@ -2979,7 +2979,7 @@ }, "Y": { "Type": 3.0, - "Integer": 450.0 + "Integer": 462.0 }, "Width": { "Type": 3.0, @@ -3045,7 +3045,7 @@ }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 519.0 }, "Width": { "Type": 3.0, @@ -3145,7 +3145,7 @@ }, "Y": { "Type": 3.0, - "Integer": 681.0 + "Integer": 696.0 }, "Width": { "Type": 3.0, @@ -3182,7 +3182,7 @@ }, "Y": { "Type": 3.0, - "Integer": 486.0 + "Integer": 498.0 }, "Width": { "Type": 3.0, @@ -3190,7 +3190,7 @@ }, "Height": { "Type": 3.0, - "Integer": 111.0 + "Integer": 114.0 }, "Tool Tip": { "Type": 5.0, @@ -3219,7 +3219,7 @@ }, "Y": { "Type": 3.0, - "Integer": 420.0 + "Integer": 414.0 }, "Width": { "Type": 3.0, @@ -3227,7 +3227,7 @@ }, "Height": { "Type": 3.0, - "Integer": 28.0 + "Integer": 43.0 }, "Tool Tip": { "Type": 5.0, @@ -3343,7 +3343,7 @@ }, "Y": { "Type": 3.0, - "Integer": 729.0 + "Integer": 744.0 }, "Width": { "Type": 3.0, @@ -3351,7 +3351,7 @@ }, "Height": { "Type": 3.0, - "Integer": 57.0 + "Integer": 63.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Cambium API Data.json b/deploy/runtime/ui/Cambium API Data.json index 838d21ae7..4c3647a8d 100644 --- a/deploy/runtime/ui/Cambium API Data.json +++ b/deploy/runtime/ui/Cambium API Data.json @@ -1,7 +1,7 @@ { "Name": "Cambium API Data", - "Width": 859.0, - "Height": 357.0, + "Width": 863.0, + "Height": 400.0, "FormObjects": { "Button": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 318.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 246.0 }, "Width": { "Type": 3.0, @@ -136,7 +136,7 @@ }, "Y": { "Type": 3.0, - "Integer": 132.0 + "Integer": 156.0 }, "Width": { "Type": 3.0, @@ -177,7 +177,7 @@ }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 126.0 }, "Width": { "Type": 3.0, @@ -218,7 +218,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 273.0 }, "Width": { "Type": 3.0, @@ -259,7 +259,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 303.0 }, "Width": { "Type": 3.0, @@ -300,7 +300,7 @@ }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, @@ -341,7 +341,7 @@ }, "Y": { "Type": 3.0, - "Integer": 162.0 + "Integer": 186.0 }, "Width": { "Type": 3.0, @@ -382,7 +382,7 @@ }, "Y": { "Type": 3.0, - "Integer": 81.0 + "Integer": 105.0 }, "Width": { "Type": 3.0, @@ -440,7 +440,7 @@ }, "Height": { "Type": 3.0, - "Integer": 349.0 + "Integer": 385.0 }, "Tool Tip": { "Type": 5.0, @@ -469,7 +469,7 @@ }, "Y": { "Type": 3.0, - "Integer": 30.0 + "Integer": 24.0 }, "Width": { "Type": 3.0, @@ -477,7 +477,7 @@ }, "Height": { "Type": 3.0, - "Integer": 45.0 + "Integer": 66.0 }, "Tool Tip": { "Type": 5.0, @@ -531,7 +531,7 @@ }, "Y": { "Type": 3.0, - "Integer": 132.0 + "Integer": 156.0 }, "Width": { "Type": 3.0, @@ -568,7 +568,7 @@ }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 126.0 }, "Width": { "Type": 3.0, @@ -605,7 +605,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 273.0 }, "Width": { "Type": 3.0, @@ -642,7 +642,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 303.0 }, "Width": { "Type": 3.0, @@ -679,7 +679,7 @@ }, "Y": { "Type": 3.0, - "Integer": 162.0 + "Integer": 186.0 }, "Width": { "Type": 3.0, @@ -716,7 +716,7 @@ }, "Y": { "Type": 3.0, - "Integer": 81.0 + "Integer": 117.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Degradation AC DC Lifetime Daily.json b/deploy/runtime/ui/Degradation AC DC Lifetime Daily.json index 315160cd3..fb5a2c8e0 100644 --- a/deploy/runtime/ui/Degradation AC DC Lifetime Daily.json +++ b/deploy/runtime/ui/Degradation AC DC Lifetime Daily.json @@ -273,7 +273,7 @@ }, "Height": { "Type": 3.0, - "Integer": 63.0 + "Integer": 84.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Degradation AC Lifetime Linear.json b/deploy/runtime/ui/Degradation AC Lifetime Linear.json index 0f6e97aa1..d81cccde9 100644 --- a/deploy/runtime/ui/Degradation AC Lifetime Linear.json +++ b/deploy/runtime/ui/Degradation AC Lifetime Linear.json @@ -1,7 +1,7 @@ { "Name": "Degradation AC Lifetime Linear", - "Width": 794.0, - "Height": 134.0, + "Width": 788.0, + "Height": 162.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 128.0 + "Integer": 149.0 }, "Tool Tip": { "Type": 5.0, @@ -114,7 +114,7 @@ }, "Height": { "Type": 3.0, - "Integer": 78.0 + "Integer": 81.0 }, "Tool Tip": { "Type": 5.0, @@ -168,7 +168,7 @@ }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 111.0 }, "Width": { "Type": 3.0, @@ -176,7 +176,7 @@ }, "Height": { "Type": 3.0, - "Integer": 27.0 + "Integer": 42.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Degradation AC Lifetime.json b/deploy/runtime/ui/Degradation AC Lifetime.json index ba1eae9da..afb8fb326 100644 --- a/deploy/runtime/ui/Degradation AC Lifetime.json +++ b/deploy/runtime/ui/Degradation AC Lifetime.json @@ -1,7 +1,7 @@ { "Name": "Degradation AC Lifetime", - "Width": 794.0, - "Height": 134.0, + "Width": 789.0, + "Height": 176.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 128.0 + "Integer": 167.0 }, "Tool Tip": { "Type": 5.0, @@ -114,7 +114,7 @@ }, "Height": { "Type": 3.0, - "Integer": 78.0 + "Integer": 84.0 }, "Tool Tip": { "Type": 5.0, @@ -168,7 +168,7 @@ }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 111.0 }, "Width": { "Type": 3.0, @@ -176,7 +176,7 @@ }, "Height": { "Type": 3.0, - "Integer": 27.0 + "Integer": 57.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Degradation AC Single Year.json b/deploy/runtime/ui/Degradation AC Single Year.json index 0d991d5e7..27d6b4c71 100644 --- a/deploy/runtime/ui/Degradation AC Single Year.json +++ b/deploy/runtime/ui/Degradation AC Single Year.json @@ -1,7 +1,7 @@ { "Name": "Degradation AC Single Year", - "Width": 788.0, - "Height": 132.0, + "Width": 795.0, + "Height": 179.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 122.0 + "Integer": 158.0 }, "Tool Tip": { "Type": 5.0, @@ -49,11 +49,11 @@ }, "X": { "Type": 3.0, - "Integer": 18.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 96.0 + "Integer": 111.0 }, "Width": { "Type": 3.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 27.0 + "Integer": 51.0 }, "Tool Tip": { "Type": 5.0, @@ -176,7 +176,7 @@ }, "Height": { "Type": 3.0, - "Integer": 72.0 + "Integer": 84.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Degradation DC Lifetime.json b/deploy/runtime/ui/Degradation DC Lifetime.json index 2444bed1e..3c5450657 100644 --- a/deploy/runtime/ui/Degradation DC Lifetime.json +++ b/deploy/runtime/ui/Degradation DC Lifetime.json @@ -1,7 +1,7 @@ { "Name": "Degradation DC Lifetime", - "Width": 788.0, - "Height": 132.0, + "Width": 790.0, + "Height": 173.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 122.0 + "Integer": 164.0 }, "Tool Tip": { "Type": 5.0, @@ -106,7 +106,7 @@ }, "Y": { "Type": 3.0, - "Integer": 90.0 + "Integer": 108.0 }, "Width": { "Type": 3.0, @@ -114,7 +114,7 @@ }, "Height": { "Type": 3.0, - "Integer": 27.0 + "Integer": 57.0 }, "Tool Tip": { "Type": 5.0, @@ -238,7 +238,7 @@ }, "Height": { "Type": 3.0, - "Integer": 66.0 + "Integer": 87.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Degradation Lifetime Variables.json b/deploy/runtime/ui/Degradation Lifetime Variables.json index 9068d5a13..9185e3265 100644 --- a/deploy/runtime/ui/Degradation Lifetime Variables.json +++ b/deploy/runtime/ui/Degradation Lifetime Variables.json @@ -1,7 +1,7 @@ { "Name": "Degradation Lifetime Variables", - "Width": 788.0, - "Height": 126.0, + "Width": 795.0, + "Height": 138.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -86,7 +86,7 @@ }, "Height": { "Type": 3.0, - "Integer": 118.0 + "Integer": 124.0 }, "Tool Tip": { "Type": 5.0, @@ -123,7 +123,7 @@ }, "Height": { "Type": 3.0, - "Integer": 56.0 + "Integer": 74.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Empirical Trough Power Block.json b/deploy/runtime/ui/Empirical Trough Power Block.json index 1ad7e70b9..c2c2637cf 100644 --- a/deploy/runtime/ui/Empirical Trough Power Block.json +++ b/deploy/runtime/ui/Empirical Trough Power Block.json @@ -712,7 +712,7 @@ }, "Y": { "Type": 3.0, - "Integer": 105.0 + "Integer": 99.0 }, "Width": { "Type": 3.0, @@ -720,7 +720,7 @@ }, "Height": { "Type": 3.0, - "Integer": 33.0 + "Integer": 39.0 }, "Tool Tip": { "Type": 5.0, @@ -2704,7 +2704,7 @@ }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 99.0 }, "Width": { "Type": 3.0, @@ -2712,7 +2712,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 3936.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Financial Debt DSCR or Debt Fraction.json b/deploy/runtime/ui/Financial Debt DSCR or Debt Fraction.json index 32818c894..46354a4e0 100644 --- a/deploy/runtime/ui/Financial Debt DSCR or Debt Fraction.json +++ b/deploy/runtime/ui/Financial Debt DSCR or Debt Fraction.json @@ -1,7 +1,7 @@ { "Name": "Financial Debt DSCR or Debt Fraction", - "Width": 860.0, - "Height": 361.0, + "Width": 862.0, + "Height": 404.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 350.0 + "Integer": 386.0 }, "Tool Tip": { "Type": 5.0, @@ -281,7 +281,7 @@ }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -773,7 +773,7 @@ }, "Height": { "Type": 3.0, - "Integer": 78.0 + "Integer": 111.0 }, "Tool Tip": { "Type": 5.0, @@ -1249,7 +1249,7 @@ }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 297.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Financial Depreciation Detailed.json b/deploy/runtime/ui/Financial Depreciation Detailed.json index e34ffcda8..e9e614bbd 100644 --- a/deploy/runtime/ui/Financial Depreciation Detailed.json +++ b/deploy/runtime/ui/Financial Depreciation Detailed.json @@ -1,7 +1,7 @@ { "Name": "Financial Depreciation Detailed", "Width": 858.0, - "Height": 400.0, + "Height": 430.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 6.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 3.0 + "Integer": 9.0 }, "Width": { "Type": 3.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 395.0 + "Integer": 413.0 }, "Tool Tip": { "Type": 5.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 195.0 }, "Width": { "Type": 3.0, @@ -115,7 +115,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, @@ -177,7 +177,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -239,7 +239,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -301,7 +301,7 @@ }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 303.0 }, "Width": { "Type": 3.0, @@ -363,7 +363,7 @@ }, "Y": { "Type": 3.0, - "Integer": 303.0 + "Integer": 330.0 }, "Width": { "Type": 3.0, @@ -425,7 +425,7 @@ }, "Y": { "Type": 3.0, - "Integer": 360.0 + "Integer": 387.0 }, "Width": { "Type": 3.0, @@ -487,7 +487,7 @@ }, "Y": { "Type": 3.0, - "Integer": 333.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -549,7 +549,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -611,7 +611,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -673,7 +673,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -735,7 +735,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -797,7 +797,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 147.0 }, "Width": { "Type": 3.0, @@ -859,7 +859,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 147.0 }, "Width": { "Type": 3.0, @@ -921,7 +921,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -983,7 +983,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -1045,7 +1045,7 @@ }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 168.0 }, "Width": { "Type": 3.0, @@ -1107,7 +1107,7 @@ }, "Y": { "Type": 3.0, - "Integer": 330.0 + "Integer": 357.0 }, "Width": { "Type": 3.0, @@ -1190,7 +1190,7 @@ }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 219.0 }, "Width": { "Type": 3.0, @@ -1273,7 +1273,7 @@ }, "Y": { "Type": 3.0, - "Integer": 165.0 + "Integer": 192.0 }, "Width": { "Type": 3.0, @@ -1356,7 +1356,7 @@ }, "Y": { "Type": 3.0, - "Integer": 360.0 + "Integer": 387.0 }, "Width": { "Type": 3.0, @@ -1439,7 +1439,7 @@ }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 273.0 }, "Width": { "Type": 3.0, @@ -1522,7 +1522,7 @@ }, "Y": { "Type": 3.0, - "Integer": 273.0 + "Integer": 300.0 }, "Width": { "Type": 3.0, @@ -1605,7 +1605,7 @@ }, "Y": { "Type": 3.0, - "Integer": 300.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -1688,7 +1688,7 @@ }, "Y": { "Type": 3.0, - "Integer": 219.0 + "Integer": 246.0 }, "Width": { "Type": 3.0, @@ -1771,7 +1771,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -1854,7 +1854,7 @@ }, "Y": { "Type": 3.0, - "Integer": 333.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -1895,7 +1895,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, @@ -1936,7 +1936,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 195.0 }, "Width": { "Type": 3.0, @@ -1977,7 +1977,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2018,7 +2018,7 @@ }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 303.0 }, "Width": { "Type": 3.0, @@ -2059,7 +2059,7 @@ }, "Y": { "Type": 3.0, - "Integer": 303.0 + "Integer": 330.0 }, "Width": { "Type": 3.0, @@ -2100,7 +2100,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -2141,7 +2141,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 171.0 }, "Width": { "Type": 3.0, @@ -2224,7 +2224,7 @@ }, "Y": { "Type": 3.0, - "Integer": 333.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -2265,7 +2265,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, @@ -2306,7 +2306,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 195.0 }, "Width": { "Type": 3.0, @@ -2347,7 +2347,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2388,7 +2388,7 @@ }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 303.0 }, "Width": { "Type": 3.0, @@ -2429,7 +2429,7 @@ }, "Y": { "Type": 3.0, - "Integer": 303.0 + "Integer": 330.0 }, "Width": { "Type": 3.0, @@ -2470,7 +2470,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -2511,7 +2511,7 @@ }, "Y": { "Type": 3.0, - "Integer": 333.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -2564,7 +2564,7 @@ }, "Y": { "Type": 3.0, - "Integer": 333.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -2605,7 +2605,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, @@ -2646,7 +2646,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 195.0 }, "Width": { "Type": 3.0, @@ -2687,7 +2687,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2728,7 +2728,7 @@ }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 303.0 }, "Width": { "Type": 3.0, @@ -2769,7 +2769,7 @@ }, "Y": { "Type": 3.0, - "Integer": 303.0 + "Integer": 330.0 }, "Width": { "Type": 3.0, @@ -2810,7 +2810,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -2851,7 +2851,7 @@ }, "Y": { "Type": 3.0, - "Integer": 333.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -2892,7 +2892,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, @@ -2933,7 +2933,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 195.0 }, "Width": { "Type": 3.0, @@ -2974,7 +2974,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -3015,7 +3015,7 @@ }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 303.0 }, "Width": { "Type": 3.0, @@ -3056,7 +3056,7 @@ }, "Y": { "Type": 3.0, - "Integer": 303.0 + "Integer": 330.0 }, "Width": { "Type": 3.0, @@ -3097,7 +3097,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -3138,7 +3138,7 @@ }, "Y": { "Type": 3.0, - "Integer": 357.0 + "Integer": 384.0 }, "Width": { "Type": 3.0, @@ -3200,7 +3200,7 @@ }, "Y": { "Type": 3.0, - "Integer": 81.0 + "Integer": 99.0 }, "Width": { "Type": 3.0, @@ -3208,7 +3208,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 39.0 }, "Tool Tip": { "Type": 5.0, @@ -3270,7 +3270,7 @@ }, "Height": { "Type": 3.0, - "Integer": 54.0 + "Integer": 78.0 }, "Tool Tip": { "Type": 5.0, @@ -3324,7 +3324,7 @@ }, "Y": { "Type": 3.0, - "Integer": 333.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -3407,7 +3407,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, @@ -3490,7 +3490,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 195.0 }, "Width": { "Type": 3.0, @@ -3573,7 +3573,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -3656,7 +3656,7 @@ }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 303.0 }, "Width": { "Type": 3.0, @@ -3739,7 +3739,7 @@ }, "Y": { "Type": 3.0, - "Integer": 303.0 + "Integer": 330.0 }, "Width": { "Type": 3.0, @@ -3822,7 +3822,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Financial ITC Depreciation Allocation.json b/deploy/runtime/ui/Financial ITC Depreciation Allocation.json index 63dca0f98..2847939ed 100644 --- a/deploy/runtime/ui/Financial ITC Depreciation Allocation.json +++ b/deploy/runtime/ui/Financial ITC Depreciation Allocation.json @@ -1,7 +1,7 @@ { "Name": "Financial ITC Depreciation Allocation", - "Width": 860.0, - "Height": 196.0, + "Width": 868.0, + "Height": 227.0, "FormObjects": { "RadioChoice": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 30.0 + "Integer": 33.0 }, "Y": { "Type": 3.0, - "Integer": 81.0 + "Integer": 105.0 }, "Width": { "Type": 3.0, @@ -61,11 +61,11 @@ }, "X": { "Type": 3.0, - "Integer": 318.0 + "Integer": 321.0 }, "Y": { "Type": 3.0, - "Integer": 132.0 + "Integer": 156.0 }, "Width": { "Type": 3.0, @@ -102,11 +102,11 @@ }, "X": { "Type": 3.0, - "Integer": 582.0 + "Integer": 585.0 }, "Y": { "Type": 3.0, - "Integer": 132.0 + "Integer": 156.0 }, "Width": { "Type": 3.0, @@ -185,11 +185,11 @@ }, "X": { "Type": 3.0, - "Integer": 318.0 + "Integer": 321.0 }, "Y": { "Type": 3.0, - "Integer": 159.0 + "Integer": 183.0 }, "Width": { "Type": 3.0, @@ -226,11 +226,11 @@ }, "X": { "Type": 3.0, - "Integer": 582.0 + "Integer": 585.0 }, "Y": { "Type": 3.0, - "Integer": 159.0 + "Integer": 183.0 }, "Width": { "Type": 3.0, @@ -321,7 +321,7 @@ }, "Height": { "Type": 3.0, - "Integer": 186.0 + "Integer": 210.0 }, "Tool Tip": { "Type": 5.0, @@ -346,11 +346,11 @@ }, "X": { "Type": 3.0, - "Integer": 582.0 + "Integer": 585.0 }, "Y": { "Type": 3.0, - "Integer": 105.0 + "Integer": 129.0 }, "Width": { "Type": 3.0, @@ -420,7 +420,7 @@ }, "Height": { "Type": 3.0, - "Integer": 54.0 + "Integer": 81.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Financial ITC Qualification Fuel Cell.json b/deploy/runtime/ui/Financial ITC Qualification Fuel Cell.json index 5e2174e7b..49d908222 100644 --- a/deploy/runtime/ui/Financial ITC Qualification Fuel Cell.json +++ b/deploy/runtime/ui/Financial ITC Qualification Fuel Cell.json @@ -1,7 +1,7 @@ { "Name": "Financial ITC Qualification Fuel Cell", "Width": 864.0, - "Height": 294.0, + "Height": 336.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 156.0 }, "Width": { "Type": 3.0, @@ -78,7 +78,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 156.0 }, "Width": { "Type": 3.0, @@ -140,7 +140,7 @@ }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 135.0 }, "Width": { "Type": 3.0, @@ -202,7 +202,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 204.0 }, "Width": { "Type": 3.0, @@ -285,7 +285,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 204.0 }, "Width": { "Type": 3.0, @@ -326,7 +326,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 204.0 }, "Width": { "Type": 3.0, @@ -367,7 +367,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 204.0 }, "Width": { "Type": 3.0, @@ -450,7 +450,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 204.0 }, "Width": { "Type": 3.0, @@ -512,7 +512,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 231.0 }, "Width": { "Type": 3.0, @@ -595,7 +595,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 231.0 }, "Width": { "Type": 3.0, @@ -636,7 +636,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 231.0 }, "Width": { "Type": 3.0, @@ -677,7 +677,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 231.0 }, "Width": { "Type": 3.0, @@ -760,7 +760,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 231.0 }, "Width": { "Type": 3.0, @@ -822,7 +822,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 258.0 }, "Width": { "Type": 3.0, @@ -905,7 +905,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 258.0 }, "Width": { "Type": 3.0, @@ -988,7 +988,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 285.0 }, "Width": { "Type": 3.0, @@ -1071,7 +1071,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 285.0 }, "Width": { "Type": 3.0, @@ -1154,7 +1154,7 @@ }, "Y": { "Type": 3.0, - "Integer": 72.0 + "Integer": 108.0 }, "Width": { "Type": 3.0, @@ -1216,7 +1216,7 @@ }, "Y": { "Type": 3.0, - "Integer": 72.0 + "Integer": 108.0 }, "Width": { "Type": 3.0, @@ -1273,7 +1273,7 @@ }, "Height": { "Type": 3.0, - "Integer": 277.0 + "Integer": 319.0 }, "Tool Tip": { "Type": 5.0, @@ -1302,7 +1302,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 258.0 }, "Width": { "Type": 3.0, @@ -1364,7 +1364,7 @@ }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 285.0 }, "Width": { "Type": 3.0, @@ -1434,7 +1434,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 78.0 }, "Tool Tip": { "Type": 5.0, @@ -1488,7 +1488,7 @@ }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 177.0 }, "Width": { "Type": 3.0, @@ -1550,7 +1550,7 @@ }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 177.0 }, "Width": { "Type": 3.0, @@ -1633,7 +1633,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 180.0 }, "Width": { "Type": 3.0, @@ -1674,7 +1674,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 180.0 }, "Width": { "Type": 3.0, @@ -1715,7 +1715,7 @@ }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 177.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Financial ITC Qualification Hybrid.json b/deploy/runtime/ui/Financial ITC Qualification Hybrid.json index b62e61ead..d62c79a0d 100644 --- a/deploy/runtime/ui/Financial ITC Qualification Hybrid.json +++ b/deploy/runtime/ui/Financial ITC Qualification Hybrid.json @@ -1,7 +1,7 @@ { "Name": "Financial ITC Qualification Hybrid", - "Width": 861.0, - "Height": 403.0, + "Width": 864.0, + "Height": 463.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 150.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -78,7 +78,7 @@ }, "Y": { "Type": 3.0, - "Integer": 150.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -140,7 +140,7 @@ }, "Y": { "Type": 3.0, - "Integer": 126.0 + "Integer": 165.0 }, "Width": { "Type": 3.0, @@ -202,7 +202,7 @@ }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 237.0 }, "Width": { "Type": 3.0, @@ -285,7 +285,7 @@ }, "Y": { "Type": 3.0, - "Integer": 201.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -326,7 +326,7 @@ }, "Y": { "Type": 3.0, - "Integer": 201.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -367,7 +367,7 @@ }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 237.0 }, "Width": { "Type": 3.0, @@ -450,7 +450,7 @@ }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 237.0 }, "Width": { "Type": 3.0, @@ -512,7 +512,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -595,7 +595,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -636,7 +636,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -677,7 +677,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -760,7 +760,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -822,7 +822,7 @@ }, "Y": { "Type": 3.0, - "Integer": 252.0 + "Integer": 291.0 }, "Width": { "Type": 3.0, @@ -905,7 +905,7 @@ }, "Y": { "Type": 3.0, - "Integer": 255.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -946,7 +946,7 @@ }, "Y": { "Type": 3.0, - "Integer": 255.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -987,7 +987,7 @@ }, "Y": { "Type": 3.0, - "Integer": 252.0 + "Integer": 291.0 }, "Width": { "Type": 3.0, @@ -1070,7 +1070,7 @@ }, "Y": { "Type": 3.0, - "Integer": 252.0 + "Integer": 291.0 }, "Width": { "Type": 3.0, @@ -1132,7 +1132,7 @@ }, "Y": { "Type": 3.0, - "Integer": 306.0 + "Integer": 345.0 }, "Width": { "Type": 3.0, @@ -1215,7 +1215,7 @@ }, "Y": { "Type": 3.0, - "Integer": 306.0 + "Integer": 345.0 }, "Width": { "Type": 3.0, @@ -1256,7 +1256,7 @@ }, "Y": { "Type": 3.0, - "Integer": 306.0 + "Integer": 345.0 }, "Width": { "Type": 3.0, @@ -1297,7 +1297,7 @@ }, "Y": { "Type": 3.0, - "Integer": 306.0 + "Integer": 345.0 }, "Width": { "Type": 3.0, @@ -1380,7 +1380,7 @@ }, "Y": { "Type": 3.0, - "Integer": 306.0 + "Integer": 345.0 }, "Width": { "Type": 3.0, @@ -1442,7 +1442,7 @@ }, "Y": { "Type": 3.0, - "Integer": 336.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -1525,7 +1525,7 @@ }, "Y": { "Type": 3.0, - "Integer": 336.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -1608,7 +1608,7 @@ }, "Y": { "Type": 3.0, - "Integer": 363.0 + "Integer": 402.0 }, "Width": { "Type": 3.0, @@ -1691,7 +1691,7 @@ }, "Y": { "Type": 3.0, - "Integer": 363.0 + "Integer": 402.0 }, "Width": { "Type": 3.0, @@ -1774,7 +1774,7 @@ }, "Y": { "Type": 3.0, - "Integer": 78.0 + "Integer": 117.0 }, "Width": { "Type": 3.0, @@ -1836,7 +1836,7 @@ }, "Y": { "Type": 3.0, - "Integer": 78.0 + "Integer": 117.0 }, "Width": { "Type": 3.0, @@ -1893,7 +1893,7 @@ }, "Height": { "Type": 3.0, - "Integer": 391.0 + "Integer": 448.0 }, "Tool Tip": { "Type": 5.0, @@ -1922,7 +1922,7 @@ }, "Y": { "Type": 3.0, - "Integer": 363.0 + "Integer": 402.0 }, "Width": { "Type": 3.0, @@ -1992,7 +1992,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 81.0 }, "Tool Tip": { "Type": 5.0, @@ -2046,7 +2046,7 @@ }, "Y": { "Type": 3.0, - "Integer": 336.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -2108,7 +2108,7 @@ }, "Y": { "Type": 3.0, - "Integer": 171.0 + "Integer": 210.0 }, "Width": { "Type": 3.0, @@ -2191,7 +2191,7 @@ }, "Y": { "Type": 3.0, - "Integer": 174.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -2232,7 +2232,7 @@ }, "Y": { "Type": 3.0, - "Integer": 174.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -2273,7 +2273,7 @@ }, "Y": { "Type": 3.0, - "Integer": 171.0 + "Integer": 210.0 }, "Width": { "Type": 3.0, @@ -2356,7 +2356,7 @@ }, "Y": { "Type": 3.0, - "Integer": 171.0 + "Integer": 210.0 }, "Width": { "Type": 3.0, @@ -2418,7 +2418,7 @@ }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 264.0 }, "Width": { "Type": 3.0, @@ -2501,7 +2501,7 @@ }, "Y": { "Type": 3.0, - "Integer": 228.0 + "Integer": 267.0 }, "Width": { "Type": 3.0, @@ -2542,7 +2542,7 @@ }, "Y": { "Type": 3.0, - "Integer": 228.0 + "Integer": 267.0 }, "Width": { "Type": 3.0, @@ -2583,7 +2583,7 @@ }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 264.0 }, "Width": { "Type": 3.0, @@ -2666,7 +2666,7 @@ }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 264.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Financial ITC Qualification.json b/deploy/runtime/ui/Financial ITC Qualification.json index 38e4bec41..1981da40e 100644 --- a/deploy/runtime/ui/Financial ITC Qualification.json +++ b/deploy/runtime/ui/Financial ITC Qualification.json @@ -1,7 +1,7 @@ { "Name": "Financial ITC Qualification", - "Width": 861.0, - "Height": 259.0, + "Width": 858.0, + "Height": 286.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 141.0 }, "Width": { "Type": 3.0, @@ -78,7 +78,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 141.0 }, "Width": { "Type": 3.0, @@ -140,7 +140,7 @@ }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 120.0 }, "Width": { "Type": 3.0, @@ -202,7 +202,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -285,7 +285,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -326,7 +326,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -367,7 +367,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -450,7 +450,7 @@ }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -512,7 +512,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, @@ -595,7 +595,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, @@ -678,7 +678,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 243.0 }, "Width": { "Type": 3.0, @@ -761,7 +761,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 243.0 }, "Width": { "Type": 3.0, @@ -844,7 +844,7 @@ }, "Y": { "Type": 3.0, - "Integer": 72.0 + "Integer": 93.0 }, "Width": { "Type": 3.0, @@ -906,7 +906,7 @@ }, "Y": { "Type": 3.0, - "Integer": 72.0 + "Integer": 93.0 }, "Width": { "Type": 3.0, @@ -963,7 +963,7 @@ }, "Height": { "Type": 3.0, - "Integer": 247.0 + "Integer": 271.0 }, "Tool Tip": { "Type": 5.0, @@ -992,7 +992,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, @@ -1054,7 +1054,7 @@ }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 243.0 }, "Width": { "Type": 3.0, @@ -1116,7 +1116,7 @@ }, "Y": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Width": { "Type": 3.0, @@ -1124,7 +1124,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 63.0 }, "Tool Tip": { "Type": 5.0, @@ -1178,7 +1178,7 @@ }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 162.0 }, "Width": { "Type": 3.0, @@ -1240,7 +1240,7 @@ }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 162.0 }, "Width": { "Type": 3.0, @@ -1323,7 +1323,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 165.0 }, "Width": { "Type": 3.0, @@ -1364,7 +1364,7 @@ }, "Y": { "Type": 3.0, - "Integer": 144.0 + "Integer": 165.0 }, "Width": { "Type": 3.0, @@ -1405,7 +1405,7 @@ }, "Y": { "Type": 3.0, - "Integer": 141.0 + "Integer": 162.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Financial Merchant Plant Description.json b/deploy/runtime/ui/Financial Merchant Plant Description.json index 5f51dc304..0e1ba4306 100644 --- a/deploy/runtime/ui/Financial Merchant Plant Description.json +++ b/deploy/runtime/ui/Financial Merchant Plant Description.json @@ -1,7 +1,7 @@ { "Name": "Financial Merchant Plant Description", - "Width": 864.0, - "Height": 126.0, + "Width": 863.0, + "Height": 182.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 119.0 + "Integer": 164.0 }, "Tool Tip": { "Type": 5.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 58.0 + "Integer": 91.0 }, "Tool Tip": { "Type": 5.0, @@ -115,7 +115,7 @@ }, "Y": { "Type": 3.0, - "Integer": 84.0 + "Integer": 120.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Financial Non Energy Revenue.json b/deploy/runtime/ui/Financial Non Energy Revenue.json index 7e40f5645..2da8638ef 100644 --- a/deploy/runtime/ui/Financial Non Energy Revenue.json +++ b/deploy/runtime/ui/Financial Non Energy Revenue.json @@ -1,7 +1,7 @@ { "Name": "Financial Non Energy Revenue", - "Width": 859.0, - "Height": 389.0, + "Width": 861.0, + "Height": 465.0, "FormObjects": { "SchedNumeric": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 333.0 + "Integer": 336.0 }, "Y": { "Type": 3.0, - "Integer": 354.0 + "Integer": 402.0 }, "Width": { "Type": 3.0, @@ -65,11 +65,11 @@ }, "X": { "Type": 3.0, - "Integer": 333.0 + "Integer": 336.0 }, "Y": { "Type": 3.0, - "Integer": 327.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -118,11 +118,11 @@ }, "X": { "Type": 3.0, - "Integer": 333.0 + "Integer": 336.0 }, "Y": { "Type": 3.0, - "Integer": 219.0 + "Integer": 267.0 }, "Width": { "Type": 3.0, @@ -171,15 +171,15 @@ }, "X": { "Type": 3.0, - "Integer": 717.0 + "Integer": 792.0 }, "Y": { "Type": 3.0, - "Integer": 219.0 + "Integer": 267.0 }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 40.0 }, "Height": { "Type": 3.0, @@ -212,11 +212,11 @@ }, "X": { "Type": 3.0, - "Integer": 333.0 + "Integer": 336.0 }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 297.0 }, "Width": { "Type": 3.0, @@ -295,11 +295,11 @@ }, "X": { "Type": 3.0, - "Integer": 333.0 + "Integer": 336.0 }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 324.0 }, "Width": { "Type": 3.0, @@ -348,11 +348,11 @@ }, "X": { "Type": 3.0, - "Integer": 336.0 + "Integer": 339.0 }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 168.0 }, "Width": { "Type": 3.0, @@ -401,15 +401,15 @@ }, "X": { "Type": 3.0, - "Integer": 717.0 + "Integer": 792.0 }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 168.0 }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 40.0 }, "Height": { "Type": 3.0, @@ -442,11 +442,11 @@ }, "X": { "Type": 3.0, - "Integer": 336.0 + "Integer": 339.0 }, "Y": { "Type": 3.0, - "Integer": 147.0 + "Integer": 195.0 }, "Width": { "Type": 3.0, @@ -525,11 +525,11 @@ }, "X": { "Type": 3.0, - "Integer": 336.0 + "Integer": 339.0 }, "Y": { "Type": 3.0, - "Integer": 174.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, @@ -578,11 +578,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 309.0 + "Integer": 357.0 }, "Width": { "Type": 3.0, @@ -628,11 +628,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 252.0 }, "Width": { "Type": 3.0, @@ -678,11 +678,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 105.0 + "Integer": 153.0 }, "Width": { "Type": 3.0, @@ -740,7 +740,7 @@ }, "Height": { "Type": 3.0, - "Integer": 381.0 + "Integer": 444.0 }, "Tool Tip": { "Type": 5.0, @@ -777,7 +777,7 @@ }, "Height": { "Type": 3.0, - "Integer": 78.0 + "Integer": 117.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Financial TOD Factors.json b/deploy/runtime/ui/Financial TOD Factors.json index 35fe09251..ab638910f 100644 --- a/deploy/runtime/ui/Financial TOD Factors.json +++ b/deploy/runtime/ui/Financial TOD Factors.json @@ -1,7 +1,7 @@ { "Name": "Financial TOD Factors", - "Width": 861.0, - "Height": 1002.0, + "Width": 864.0, + "Height": 1017.0, "FormObjects": { "Button": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 300.0 + "Integer": 306.0 }, "Width": { "Type": 3.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 963.0 + "Integer": 978.0 }, "Width": { "Type": 3.0, @@ -90,7 +90,7 @@ }, "Y": { "Type": 3.0, - "Integer": 963.0 + "Integer": 978.0 }, "Width": { "Type": 3.0, @@ -164,7 +164,7 @@ }, "Y": { "Type": 3.0, - "Integer": 966.0 + "Integer": 981.0 }, "Width": { "Type": 3.0, @@ -268,7 +268,7 @@ }, "Y": { "Type": 3.0, - "Integer": 375.0 + "Integer": 390.0 }, "Width": { "Type": 3.0, @@ -313,7 +313,7 @@ }, "Y": { "Type": 3.0, - "Integer": 672.0 + "Integer": 687.0 }, "Width": { "Type": 3.0, @@ -358,7 +358,7 @@ }, "Y": { "Type": 3.0, - "Integer": 375.0 + "Integer": 390.0 }, "Width": { "Type": 3.0, @@ -463,7 +463,7 @@ }, "Y": { "Type": 3.0, - "Integer": 648.0 + "Integer": 663.0 }, "Width": { "Type": 3.0, @@ -525,7 +525,7 @@ }, "Y": { "Type": 3.0, - "Integer": 945.0 + "Integer": 960.0 }, "Width": { "Type": 3.0, @@ -583,7 +583,7 @@ }, "Height": { "Type": 3.0, - "Integer": 993.0 + "Integer": 1008.0 }, "Tool Tip": { "Type": 5.0, @@ -612,7 +612,7 @@ }, "Y": { "Type": 3.0, - "Integer": 651.0 + "Integer": 666.0 }, "Width": { "Type": 3.0, @@ -674,7 +674,7 @@ }, "Y": { "Type": 3.0, - "Integer": 354.0 + "Integer": 369.0 }, "Width": { "Type": 3.0, @@ -744,7 +744,7 @@ }, "Height": { "Type": 3.0, - "Integer": 54.0 + "Integer": 69.0 }, "Tool Tip": { "Type": 5.0, @@ -798,7 +798,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 285.0 }, "Width": { "Type": 3.0, @@ -806,7 +806,7 @@ }, "Height": { "Type": 3.0, - "Integer": 66.0 + "Integer": 84.0 }, "Tool Tip": { "Type": 5.0, @@ -909,7 +909,7 @@ }, "Y": { "Type": 3.0, - "Integer": 621.0 + "Integer": 636.0 }, "Width": { "Type": 3.0, @@ -950,7 +950,7 @@ }, "Y": { "Type": 3.0, - "Integer": 135.0 + "Integer": 141.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Fuel Cell Costs Hybrid.json b/deploy/runtime/ui/Fuel Cell Costs Hybrid.json index a4354da3f..a774871b5 100644 --- a/deploy/runtime/ui/Fuel Cell Costs Hybrid.json +++ b/deploy/runtime/ui/Fuel Cell Costs Hybrid.json @@ -1,7 +1,7 @@ { "Name": "Fuel Cell Costs Hybrid", - "Width": 948.0, - "Height": 595.0, + "Width": 945.0, + "Height": 617.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -98,7 +98,7 @@ }, "Height": { "Type": 3.0, - "Integer": 92.0 + "Integer": 116.0 }, "Tool Tip": { "Type": 5.0, @@ -2763,7 +2763,7 @@ }, "Height": { "Type": 3.0, - "Integer": 72.0 + "Integer": 87.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Fuel Cell.json b/deploy/runtime/ui/Fuel Cell.json index 2a68cc434..853a36a7a 100644 --- a/deploy/runtime/ui/Fuel Cell.json +++ b/deploy/runtime/ui/Fuel Cell.json @@ -166,7 +166,7 @@ }, "Y": { "Type": 3.0, - "Integer": 489.0 + "Integer": 483.0 }, "Width": { "Type": 3.0, @@ -174,7 +174,7 @@ }, "Height": { "Type": 3.0, - "Integer": 96.0 + "Integer": 102.0 }, "Tool Tip": { "Type": 5.0, @@ -211,7 +211,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 60.0 }, "Tool Tip": { "Type": 5.0, @@ -302,7 +302,7 @@ }, "Y": { "Type": 3.0, - "Integer": 114.0 + "Integer": 108.0 }, "Width": { "Type": 3.0, @@ -483,7 +483,7 @@ }, "Height": { "Type": 3.0, - "Integer": 69.0 + "Integer": 81.0 }, "Tool Tip": { "Type": 5.0, @@ -650,7 +650,7 @@ }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -733,7 +733,7 @@ }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -816,7 +816,7 @@ }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Geothermal Costs.json b/deploy/runtime/ui/Geothermal Costs.json index d624da0c7..d28972501 100644 --- a/deploy/runtime/ui/Geothermal Costs.json +++ b/deploy/runtime/ui/Geothermal Costs.json @@ -283,7 +283,7 @@ }, "Height": { "Type": 3.0, - "Integer": 75.0 + "Integer": 102.0 }, "Tool Tip": { "Type": 5.0, @@ -4648,11 +4648,11 @@ }, "X": { "Type": 3.0, - "Integer": 192.0 + "Integer": 234.0 }, "Y": { "Type": 3.0, - "Integer": 1707.0 + "Integer": 1704.0 }, "Width": { "Type": 3.0, @@ -6430,11 +6430,11 @@ }, "X": { "Type": 3.0, - "Integer": 192.0 + "Integer": 234.0 }, "Y": { "Type": 3.0, - "Integer": 1677.0 + "Integer": 1674.0 }, "Width": { "Type": 3.0, @@ -6596,7 +6596,7 @@ }, "X": { "Type": 3.0, - "Integer": 531.0 + "Integer": 588.0 }, "Y": { "Type": 3.0, @@ -8089,7 +8089,7 @@ }, "X": { "Type": 3.0, - "Integer": 474.0 + "Integer": 573.0 }, "Y": { "Type": 3.0, @@ -8172,11 +8172,11 @@ }, "X": { "Type": 3.0, - "Integer": 192.0 + "Integer": 234.0 }, "Y": { "Type": 3.0, - "Integer": 1791.0 + "Integer": 1788.0 }, "Width": { "Type": 3.0, @@ -8717,7 +8717,7 @@ }, "X": { "Type": 3.0, - "Integer": 531.0 + "Integer": 588.0 }, "Y": { "Type": 3.0, @@ -8800,7 +8800,7 @@ }, "X": { "Type": 3.0, - "Integer": 711.0 + "Integer": 768.0 }, "Y": { "Type": 3.0, @@ -9086,7 +9086,7 @@ }, "X": { "Type": 3.0, - "Integer": 636.0 + "Integer": 693.0 }, "Y": { "Type": 3.0, @@ -9404,7 +9404,7 @@ }, "Width": { "Type": 3.0, - "Integer": 102.0 + "Integer": 120.0 }, "Height": { "Type": 3.0, @@ -9644,7 +9644,7 @@ }, "X": { "Type": 3.0, - "Integer": 681.0 + "Integer": 738.0 }, "Y": { "Type": 3.0, @@ -9706,7 +9706,7 @@ }, "X": { "Type": 3.0, - "Integer": 681.0 + "Integer": 738.0 }, "Y": { "Type": 3.0, @@ -9768,11 +9768,11 @@ }, "X": { "Type": 3.0, - "Integer": 348.0 + "Integer": 390.0 }, "Y": { "Type": 3.0, - "Integer": 1791.0 + "Integer": 1788.0 }, "Width": { "Type": 3.0, @@ -9830,11 +9830,11 @@ }, "X": { "Type": 3.0, - "Integer": 348.0 + "Integer": 390.0 }, "Y": { "Type": 3.0, - "Integer": 1704.0 + "Integer": 1701.0 }, "Width": { "Type": 3.0, @@ -9954,11 +9954,11 @@ }, "X": { "Type": 3.0, - "Integer": 333.0 + "Integer": 399.0 }, "Y": { "Type": 3.0, - "Integer": 1674.0 + "Integer": 1671.0 }, "Width": { "Type": 3.0, @@ -10367,7 +10367,7 @@ }, "X": { "Type": 3.0, - "Integer": 711.0 + "Integer": 768.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Geothermal Drilling.json b/deploy/runtime/ui/Geothermal Drilling.json index 94a6840b1..806dbe888 100644 --- a/deploy/runtime/ui/Geothermal Drilling.json +++ b/deploy/runtime/ui/Geothermal Drilling.json @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 75.0 + "Integer": 99.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Geothermal Plant and Equipment.json b/deploy/runtime/ui/Geothermal Plant and Equipment.json index 29aac7958..7c4844e99 100644 --- a/deploy/runtime/ui/Geothermal Plant and Equipment.json +++ b/deploy/runtime/ui/Geothermal Plant and Equipment.json @@ -1,7 +1,7 @@ { "Name": "Geothermal Plant and Equipment", - "Width": 844.0, - "Height": 774.0, + "Width": 849.0, + "Height": 823.0, "FormObjects": { "CheckBox": { "Visible": 1.0, @@ -102,7 +102,7 @@ }, "Height": { "Type": 3.0, - "Integer": 131.0 + "Integer": 161.0 }, "Tool Tip": { "Type": 5.0, @@ -131,7 +131,7 @@ }, "Y": { "Type": 3.0, - "Integer": 381.0 + "Integer": 429.0 }, "Width": { "Type": 3.0, @@ -168,7 +168,7 @@ }, "Y": { "Type": 3.0, - "Integer": 381.0 + "Integer": 429.0 }, "Width": { "Type": 3.0, @@ -205,7 +205,7 @@ }, "Y": { "Type": 3.0, - "Integer": 564.0 + "Integer": 612.0 }, "Width": { "Type": 3.0, @@ -242,7 +242,7 @@ }, "Y": { "Type": 3.0, - "Integer": 513.0 + "Integer": 561.0 }, "Width": { "Type": 3.0, @@ -489,7 +489,7 @@ }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 531.0 }, "Width": { "Type": 3.0, @@ -530,7 +530,7 @@ }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 531.0 }, "Width": { "Type": 3.0, @@ -752,11 +752,11 @@ }, "Y": { "Type": 3.0, - "Integer": 399.0 + "Integer": 447.0 }, "Width": { "Type": 3.0, - "Integer": 263.0 + "Integer": 278.0 }, "Height": { "Type": 3.0, @@ -801,7 +801,7 @@ }, "Y": { "Type": 3.0, - "Integer": 627.0 + "Integer": 675.0 }, "Width": { "Type": 3.0, @@ -1050,7 +1050,7 @@ }, "Y": { "Type": 3.0, - "Integer": 651.0 + "Integer": 699.0 }, "Width": { "Type": 3.0, @@ -1133,7 +1133,7 @@ }, "Y": { "Type": 3.0, - "Integer": 750.0 + "Integer": 798.0 }, "Width": { "Type": 3.0, @@ -1519,7 +1519,7 @@ }, "Y": { "Type": 3.0, - "Integer": 648.0 + "Integer": 696.0 }, "Width": { "Type": 3.0, @@ -1593,7 +1593,7 @@ }, "Y": { "Type": 3.0, - "Integer": 513.0 + "Integer": 561.0 }, "Width": { "Type": 3.0, @@ -1741,7 +1741,7 @@ }, "Y": { "Type": 3.0, - "Integer": 624.0 + "Integer": 672.0 }, "Width": { "Type": 3.0, @@ -1778,7 +1778,7 @@ }, "Y": { "Type": 3.0, - "Integer": 582.0 + "Integer": 630.0 }, "Width": { "Type": 3.0, @@ -1815,7 +1815,7 @@ }, "Y": { "Type": 3.0, - "Integer": 606.0 + "Integer": 654.0 }, "Width": { "Type": 3.0, @@ -1852,7 +1852,7 @@ }, "Y": { "Type": 3.0, - "Integer": 456.0 + "Integer": 504.0 }, "Width": { "Type": 3.0, @@ -1897,7 +1897,7 @@ }, "Height": { "Type": 3.0, - "Integer": 105.0 + "Integer": 129.0 }, "Tool Tip": { "Type": 5.0, @@ -2034,7 +2034,7 @@ }, "Y": { "Type": 3.0, - "Integer": 654.0 + "Integer": 702.0 }, "Width": { "Type": 3.0, @@ -2366,7 +2366,7 @@ }, "Y": { "Type": 3.0, - "Integer": 459.0 + "Integer": 507.0 }, "Width": { "Type": 3.0, @@ -2552,7 +2552,7 @@ }, "Y": { "Type": 3.0, - "Integer": 582.0 + "Integer": 630.0 }, "Width": { "Type": 3.0, @@ -2635,7 +2635,7 @@ }, "Y": { "Type": 3.0, - "Integer": 603.0 + "Integer": 651.0 }, "Width": { "Type": 3.0, @@ -2718,7 +2718,7 @@ }, "Y": { "Type": 3.0, - "Integer": 630.0 + "Integer": 678.0 }, "Width": { "Type": 3.0, @@ -2801,7 +2801,7 @@ }, "Y": { "Type": 3.0, - "Integer": 606.0 + "Integer": 654.0 }, "Width": { "Type": 3.0, @@ -2884,7 +2884,7 @@ }, "Y": { "Type": 3.0, - "Integer": 711.0 + "Integer": 759.0 }, "Width": { "Type": 3.0, @@ -2967,7 +2967,7 @@ }, "Y": { "Type": 3.0, - "Integer": 684.0 + "Integer": 732.0 }, "Width": { "Type": 3.0, @@ -3004,15 +3004,15 @@ }, "X": { "Type": 3.0, - "Integer": 309.0 + "Integer": 330.0 }, "Y": { "Type": 3.0, - "Integer": 513.0 + "Integer": 561.0 }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 80.0 }, "Height": { "Type": 3.0, @@ -3087,15 +3087,15 @@ }, "X": { "Type": 3.0, - "Integer": 309.0 + "Integer": 330.0 }, "Y": { "Type": 3.0, - "Integer": 459.0 + "Integer": 507.0 }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 80.0 }, "Height": { "Type": 3.0, @@ -3174,7 +3174,7 @@ }, "Y": { "Type": 3.0, - "Integer": 399.0 + "Integer": 447.0 }, "Width": { "Type": 3.0, @@ -3215,7 +3215,7 @@ }, "Y": { "Type": 3.0, - "Integer": 579.0 + "Integer": 627.0 }, "Width": { "Type": 3.0, @@ -3298,7 +3298,7 @@ }, "Y": { "Type": 3.0, - "Integer": 435.0 + "Integer": 483.0 }, "Width": { "Type": 3.0, @@ -3381,7 +3381,7 @@ }, "Y": { "Type": 3.0, - "Integer": 459.0 + "Integer": 507.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Inverter Datasheet.json b/deploy/runtime/ui/Inverter Datasheet.json index d39b360ea..2fa094b44 100644 --- a/deploy/runtime/ui/Inverter Datasheet.json +++ b/deploy/runtime/ui/Inverter Datasheet.json @@ -1962,7 +1962,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 45.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/MSLF IPH Dispatch Control.json b/deploy/runtime/ui/MSLF IPH Dispatch Control.json index 19cc227dd..a27fa84e3 100644 --- a/deploy/runtime/ui/MSLF IPH Dispatch Control.json +++ b/deploy/runtime/ui/MSLF IPH Dispatch Control.json @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 83.0 + "Integer": 116.0 }, "Tool Tip": { "Type": 5.0, @@ -86,7 +86,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 39.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/MSLF IPH System Design.json b/deploy/runtime/ui/MSLF IPH System Design.json index da490b461..6349bc28e 100644 --- a/deploy/runtime/ui/MSLF IPH System Design.json +++ b/deploy/runtime/ui/MSLF IPH System Design.json @@ -1630,7 +1630,7 @@ }, "Height": { "Type": 3.0, - "Integer": 57.0 + "Integer": 63.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/MSPT Dispatch Control.json b/deploy/runtime/ui/MSPT Dispatch Control.json index 49e9d9348..ffa7857df 100644 --- a/deploy/runtime/ui/MSPT Dispatch Control.json +++ b/deploy/runtime/ui/MSPT Dispatch Control.json @@ -86,7 +86,7 @@ }, "Height": { "Type": 3.0, - "Integer": 65.0 + "Integer": 110.0 }, "Tool Tip": { "Type": 5.0, @@ -140,7 +140,7 @@ }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 93.0 }, "Width": { "Type": 3.0, @@ -148,7 +148,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 42.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/MSPT IPH Capital Costs.json b/deploy/runtime/ui/MSPT IPH Capital Costs.json index 0ea027042..dcb20a3db 100644 --- a/deploy/runtime/ui/MSPT IPH Capital Costs.json +++ b/deploy/runtime/ui/MSPT IPH Capital Costs.json @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 6.0 + "Integer": 12.0 }, "Width": { "Type": 3.0, @@ -495,7 +495,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -503,7 +503,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -578,7 +578,7 @@ }, "X": { "Type": 3.0, - "Integer": 417.0 + "Integer": 444.0 }, "Y": { "Type": 3.0, @@ -661,7 +661,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -669,7 +669,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -744,7 +744,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -827,7 +827,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -1325,7 +1325,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -2072,7 +2072,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -2404,7 +2404,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -2487,7 +2487,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -2736,7 +2736,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -2819,7 +2819,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -2902,7 +2902,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -2910,7 +2910,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -2985,7 +2985,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -2993,7 +2993,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -3563,7 +3563,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -3613,7 +3613,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -3663,7 +3663,7 @@ }, "X": { "Type": 3.0, - "Integer": 303.0 + "Integer": 330.0 }, "Y": { "Type": 3.0, @@ -3937,7 +3937,7 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 507.0 }, "Y": { "Type": 3.0, @@ -3999,7 +3999,7 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 507.0 }, "Y": { "Type": 3.0, @@ -4144,7 +4144,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -4152,7 +4152,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -4227,7 +4227,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -4235,7 +4235,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -4310,7 +4310,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -4318,7 +4318,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -4476,7 +4476,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -4484,7 +4484,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -4559,7 +4559,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -4567,7 +4567,7 @@ }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 125.0 }, "Height": { "Type": 3.0, @@ -4642,7 +4642,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -4891,7 +4891,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -4974,7 +4974,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, @@ -5057,7 +5057,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/MSPT IPH Dispatch Control.json b/deploy/runtime/ui/MSPT IPH Dispatch Control.json index 03d3c4bf2..62a61d233 100644 --- a/deploy/runtime/ui/MSPT IPH Dispatch Control.json +++ b/deploy/runtime/ui/MSPT IPH Dispatch Control.json @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 65.0 + "Integer": 107.0 }, "Tool Tip": { "Type": 5.0, @@ -86,7 +86,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 42.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/MSPT IPH System Control.json b/deploy/runtime/ui/MSPT IPH System Control.json index ef6e877b1..ba21c18ac 100644 --- a/deploy/runtime/ui/MSPT IPH System Control.json +++ b/deploy/runtime/ui/MSPT IPH System Control.json @@ -1520,7 +1520,7 @@ }, "X": { "Type": 3.0, - "Integer": 672.0 + "Integer": 702.0 }, "Y": { "Type": 3.0, @@ -1603,7 +1603,7 @@ }, "X": { "Type": 3.0, - "Integer": 672.0 + "Integer": 702.0 }, "Y": { "Type": 3.0, @@ -1769,7 +1769,7 @@ }, "X": { "Type": 3.0, - "Integer": 672.0 + "Integer": 702.0 }, "Y": { "Type": 3.0, @@ -1852,7 +1852,7 @@ }, "X": { "Type": 3.0, - "Integer": 672.0 + "Integer": 702.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/MSPT Receiver.json b/deploy/runtime/ui/MSPT Receiver.json index d65c41218..5095bc93c 100644 --- a/deploy/runtime/ui/MSPT Receiver.json +++ b/deploy/runtime/ui/MSPT Receiver.json @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 89.0 + "Integer": 128.0 }, "Tool Tip": { "Type": 5.0, @@ -209,7 +209,7 @@ }, "Height": { "Type": 3.0, - "Integer": 39.0 + "Integer": 69.0 }, "Tool Tip": { "Type": 5.0, @@ -1909,7 +1909,7 @@ }, "Y": { "Type": 3.0, - "Integer": 507.0 + "Integer": 540.0 }, "Width": { "Type": 3.0, @@ -3119,7 +3119,7 @@ "REC_COPY_W_dot_rec_pump_tower_share_des": { "Version": 4.0, "Type": 1.0, - "Label": "Design HTF pump power due to tower height", + "Label": "Design HTF pump power due to tower ht.", "Units": "MWe", "Group": " ", "IndexLabels": "", diff --git a/deploy/runtime/ui/MSPT System Design.json b/deploy/runtime/ui/MSPT System Design.json index 746bb3a0e..dc89e21d1 100644 --- a/deploy/runtime/ui/MSPT System Design.json +++ b/deploy/runtime/ui/MSPT System Design.json @@ -1,7 +1,7 @@ { "Name": "MSPT System Design", - "Width": 866.0, - "Height": 1188.0, + "Width": 870.0, + "Height": 1256.0, "FormObjects": { "Numeric": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 714.0 }, "Y": { "Type": 3.0, - "Integer": 180.0 + "Integer": 192.0 }, "Width": { "Type": 3.0, @@ -95,11 +95,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 408.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -178,11 +178,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 456.0 + "Integer": 507.0 }, "Width": { "Type": 3.0, @@ -261,11 +261,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 432.0 + "Integer": 483.0 }, "Width": { "Type": 3.0, @@ -344,11 +344,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 714.0 }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, @@ -427,11 +427,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 258.0 }, "Y": { "Type": 3.0, - "Integer": 96.0 + "Integer": 117.0 }, "Width": { "Type": 3.0, @@ -510,11 +510,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 537.0 + "Integer": 588.0 }, "Width": { "Type": 3.0, @@ -593,15 +593,15 @@ }, "X": { "Type": 3.0, - "Integer": 621.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, - "Integer": 214.0 + "Integer": 250.0 }, "Height": { "Type": 3.0, @@ -642,11 +642,11 @@ }, "X": { "Type": 3.0, - "Integer": 306.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, - "Integer": 510.0 + "Integer": 561.0 }, "Width": { "Type": 3.0, @@ -687,7 +687,7 @@ }, "Y": { "Type": 3.0, - "Integer": 255.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -733,11 +733,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 714.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 339.0 }, "Width": { "Type": 3.0, @@ -816,11 +816,11 @@ }, "X": { "Type": 3.0, - "Integer": 12.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 492.0 + "Integer": 543.0 }, "Width": { "Type": 3.0, @@ -870,7 +870,7 @@ }, "Y": { "Type": 3.0, - "Integer": 624.0 + "Integer": 669.0 }, "Width": { "Type": 3.0, @@ -878,7 +878,7 @@ }, "Height": { "Type": 3.0, - "Integer": 556.0 + "Integer": 580.0 }, "Tool Tip": { "Type": 5.0, @@ -907,7 +907,7 @@ }, "Y": { "Type": 3.0, - "Integer": 78.0 + "Integer": 99.0 }, "Width": { "Type": 3.0, @@ -953,11 +953,11 @@ }, "X": { "Type": 3.0, - "Integer": 12.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 366.0 + "Integer": 417.0 }, "Width": { "Type": 3.0, @@ -1007,7 +1007,7 @@ }, "Y": { "Type": 3.0, - "Integer": 159.0 + "Integer": 180.0 }, "Width": { "Type": 3.0, @@ -1057,7 +1057,7 @@ }, "Y": { "Type": 3.0, - "Integer": 129.0 + "Integer": 138.0 }, "Width": { "Type": 3.0, @@ -1107,7 +1107,7 @@ }, "Y": { "Type": 3.0, - "Integer": 78.0 + "Integer": 99.0 }, "Width": { "Type": 3.0, @@ -1157,7 +1157,7 @@ }, "Y": { "Type": 3.0, - "Integer": 12.0 + "Integer": 27.0 }, "Width": { "Type": 3.0, @@ -1165,7 +1165,7 @@ }, "Height": { "Type": 3.0, - "Integer": 603.0 + "Integer": 636.0 }, "Tool Tip": { "Type": 5.0, @@ -1194,15 +1194,15 @@ }, "Y": { "Type": 3.0, - "Integer": 147.0 + "Integer": 159.0 }, "Width": { "Type": 3.0, - "Integer": 402.0 + "Integer": 414.0 }, "Height": { "Type": 3.0, - "Integer": 123.0 + "Integer": 204.0 }, "Tool Tip": { "Type": 5.0, @@ -1256,7 +1256,7 @@ }, "Y": { "Type": 3.0, - "Integer": 30.0 + "Integer": 39.0 }, "Width": { "Type": 3.0, @@ -1264,7 +1264,7 @@ }, "Height": { "Type": 3.0, - "Integer": 39.0 + "Integer": 60.0 }, "Tool Tip": { "Type": 5.0, @@ -1318,7 +1318,7 @@ }, "Y": { "Type": 3.0, - "Integer": 618.0 + "Integer": 666.0 }, "Width": { "Type": 3.0, @@ -1351,11 +1351,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 561.0 + "Integer": 612.0 }, "Width": { "Type": 3.0, @@ -1434,11 +1434,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 336.0 + "Integer": 387.0 }, "Width": { "Type": 3.0, @@ -1517,11 +1517,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 714.0 }, "Y": { "Type": 3.0, - "Integer": 228.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -1600,11 +1600,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 363.0 }, "Width": { "Type": 3.0, @@ -1683,11 +1683,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 384.0 + "Integer": 435.0 }, "Width": { "Type": 3.0, @@ -1766,11 +1766,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 714.0 }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 120.0 }, "Width": { "Type": 3.0, @@ -1849,11 +1849,11 @@ }, "X": { "Type": 3.0, - "Integer": 219.0 + "Integer": 261.0 }, "Y": { "Type": 3.0, - "Integer": 585.0 + "Integer": 636.0 }, "Width": { "Type": 3.0, @@ -1932,11 +1932,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 714.0 }, "Y": { "Type": 3.0, - "Integer": 126.0 + "Integer": 144.0 }, "Width": { "Type": 3.0, @@ -2019,7 +2019,7 @@ }, "Y": { "Type": 3.0, - "Integer": 357.0 + "Integer": 378.0 }, "Width": { "Type": 3.0, @@ -2077,11 +2077,11 @@ }, "X": { "Type": 3.0, - "Integer": 18.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, - "Integer": 273.0 + "Integer": 570.0 }, "Width": { "Type": 3.0, @@ -2089,7 +2089,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 33.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Marine Costs - Battery.json b/deploy/runtime/ui/Marine Costs - Battery.json index d59ec36ea..9ae79705e 100644 --- a/deploy/runtime/ui/Marine Costs - Battery.json +++ b/deploy/runtime/ui/Marine Costs - Battery.json @@ -355,7 +355,7 @@ }, "X": { "Type": 3.0, - "Integer": 474.0 + "Integer": 483.0 }, "Y": { "Type": 3.0, @@ -438,7 +438,7 @@ }, "X": { "Type": 3.0, - "Integer": 474.0 + "Integer": 483.0 }, "Y": { "Type": 3.0, @@ -678,6 +678,68 @@ } } }, + "Label": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "lblFinancingCost" + }, + "X": { + "Type": 3.0, + "Integer": 30.0 + }, + "Y": { + "Type": 3.0, + "Integer": 393.0 + }, + "Width": { + "Type": 3.0, + "Integer": 302.0 + }, + "Height": { + "Type": 3.0, + "Integer": 45.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Caption": { + "Type": 5.0, + "String": "Total Installed Cost excludes financing costs (if any, see Financial Parameters Page)" + }, + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } + }, + "Bold": { + "Type": 2.0, + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 1.0 + } + } + }, "Numeric": { "Visible": 1.0, "ObjectProperties": { @@ -1683,7 +1745,7 @@ }, "X": { "Type": 3.0, - "Integer": 645.0 + "Integer": 669.0 }, "Y": { "Type": 3.0, @@ -1766,7 +1828,7 @@ }, "X": { "Type": 3.0, - "Integer": 417.0 + "Integer": 441.0 }, "Y": { "Type": 3.0, @@ -1840,68 +1902,6 @@ } } }, - "Label": { - "Visible": 1.0, - "ObjectProperties": { - "Name": { - "Type": 5.0, - "String": "lblFinancingCost" - }, - "X": { - "Type": 3.0, - "Integer": 30.0 - }, - "Y": { - "Type": 3.0, - "Integer": 393.0 - }, - "Width": { - "Type": 3.0, - "Integer": 302.0 - }, - "Height": { - "Type": 3.0, - "Integer": 45.0 - }, - "Tool Tip": { - "Type": 5.0, - "String": "" - }, - "Caption": { - "Type": 5.0, - "String": "Total Installed Cost excludes financing costs (if any, see Financial Parameters Page)" - }, - "TextColour": { - "Type": 4.0, - "Color": { - "Red": 0.0, - "Green": 0.0, - "Blue": 0.0, - "Alpha": 255.0 - } - }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 - }, - "FontSize": { - "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 1.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 1.0 - } - } - }, "Divider": { "Visible": 1.0, "ObjectProperties": { @@ -2395,7 +2395,7 @@ }, "X": { "Type": 3.0, - "Integer": 498.0 + "Integer": 510.0 }, "Y": { "Type": 3.0, @@ -2403,7 +2403,7 @@ }, "Width": { "Type": 3.0, - "Integer": 144.0 + "Integer": 156.0 }, "Height": { "Type": 3.0, @@ -2519,7 +2519,7 @@ }, "X": { "Type": 3.0, - "Integer": 468.0 + "Integer": 453.0 }, "Y": { "Type": 3.0, @@ -2527,7 +2527,7 @@ }, "Width": { "Type": 3.0, - "Integer": 171.0 + "Integer": 186.0 }, "Height": { "Type": 3.0, @@ -2953,7 +2953,7 @@ }, "X": { "Type": 3.0, - "Integer": 621.0 + "Integer": 630.0 }, "Y": { "Type": 3.0, @@ -3015,7 +3015,7 @@ }, "X": { "Type": 3.0, - "Integer": 621.0 + "Integer": 630.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Marine Costs - BoS.json b/deploy/runtime/ui/Marine Costs - BoS.json index a8d963f89..15f2c8971 100644 --- a/deploy/runtime/ui/Marine Costs - BoS.json +++ b/deploy/runtime/ui/Marine Costs - BoS.json @@ -1,7 +1,7 @@ { "Name": "Marine Costs - BoS", - "Width": 1070.0, - "Height": 560.0, + "Width": 1052.0, + "Height": 612.0, "FormObjects": { "Numeric": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 426.0 }, "Width": { "Type": 3.0, @@ -95,11 +95,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 426.0 }, "Width": { "Type": 3.0, @@ -178,11 +178,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 273.0 }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 426.0 }, "Width": { "Type": 3.0, @@ -219,11 +219,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 471.0 }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 426.0 }, "Width": { "Type": 3.0, @@ -302,11 +302,11 @@ }, "X": { "Type": 3.0, - "Integer": 699.0 + "Integer": 732.0 }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 426.0 }, "Width": { "Type": 3.0, @@ -385,11 +385,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 426.0 }, "Width": { "Type": 3.0, @@ -468,11 +468,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 465.0 + "Integer": 513.0 }, "Width": { "Type": 3.0, @@ -551,11 +551,11 @@ }, "X": { "Type": 3.0, - "Integer": 645.0 + "Integer": 678.0 }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, @@ -592,11 +592,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 465.0 + "Integer": 513.0 }, "Width": { "Type": 3.0, @@ -675,11 +675,11 @@ }, "X": { "Type": 3.0, - "Integer": 117.0 + "Integer": 150.0 }, "Y": { "Type": 3.0, - "Integer": 459.0 + "Integer": 507.0 }, "Width": { "Type": 3.0, @@ -737,11 +737,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, @@ -820,11 +820,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, @@ -903,11 +903,11 @@ }, "X": { "Type": 3.0, - "Integer": 543.0 + "Integer": 576.0 }, "Y": { "Type": 3.0, - "Integer": 186.0 + "Integer": 234.0 }, "Width": { "Type": 3.0, @@ -965,11 +965,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 273.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, @@ -1006,11 +1006,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 471.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, @@ -1089,11 +1089,11 @@ }, "X": { "Type": 3.0, - "Integer": 699.0 + "Integer": 732.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, @@ -1172,11 +1172,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, @@ -1255,11 +1255,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -1338,11 +1338,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -1421,11 +1421,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 273.0 }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -1462,11 +1462,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 471.0 }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -1545,11 +1545,11 @@ }, "X": { "Type": 3.0, - "Integer": 699.0 + "Integer": 732.0 }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -1628,11 +1628,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -1711,11 +1711,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -1794,11 +1794,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -1877,11 +1877,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 273.0 }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -1918,11 +1918,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 471.0 }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -2001,11 +2001,11 @@ }, "X": { "Type": 3.0, - "Integer": 699.0 + "Integer": 732.0 }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -2084,11 +2084,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -2167,11 +2167,11 @@ }, "X": { "Type": 3.0, - "Integer": 897.0 + "Integer": 930.0 }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 426.0 }, "Width": { "Type": 3.0, @@ -2229,11 +2229,11 @@ }, "X": { "Type": 3.0, - "Integer": 897.0 + "Integer": 930.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -2291,11 +2291,11 @@ }, "X": { "Type": 3.0, - "Integer": 897.0 + "Integer": 930.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, @@ -2353,11 +2353,11 @@ }, "X": { "Type": 3.0, - "Integer": 897.0 + "Integer": 930.0 }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -2415,11 +2415,11 @@ }, "X": { "Type": 3.0, - "Integer": 897.0 + "Integer": 930.0 }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -2477,11 +2477,11 @@ }, "X": { "Type": 3.0, - "Integer": 897.0 + "Integer": 930.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -2539,11 +2539,11 @@ }, "X": { "Type": 3.0, - "Integer": 897.0 + "Integer": 930.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -2601,11 +2601,11 @@ }, "X": { "Type": 3.0, - "Integer": 762.0 + "Integer": 795.0 }, "Y": { "Type": 3.0, - "Integer": 444.0 + "Integer": 492.0 }, "Width": { "Type": 3.0, @@ -2663,7 +2663,7 @@ }, "Height": { "Type": 3.0, - "Integer": 540.0 + "Integer": 594.0 }, "Tool Tip": { "Type": 5.0, @@ -2688,11 +2688,11 @@ }, "X": { "Type": 3.0, - "Integer": 291.0 + "Integer": 324.0 }, "Y": { "Type": 3.0, - "Integer": 186.0 + "Integer": 234.0 }, "Width": { "Type": 3.0, @@ -2754,7 +2754,7 @@ }, "Y": { "Type": 3.0, - "Integer": 126.0 + "Integer": 174.0 }, "Width": { "Type": 3.0, @@ -2812,11 +2812,11 @@ }, "X": { "Type": 3.0, - "Integer": 432.0 + "Integer": 465.0 }, "Y": { "Type": 3.0, - "Integer": 186.0 + "Integer": 234.0 }, "Width": { "Type": 3.0, @@ -2874,11 +2874,11 @@ }, "X": { "Type": 3.0, - "Integer": 798.0 + "Integer": 831.0 }, "Y": { "Type": 3.0, - "Integer": 186.0 + "Integer": 234.0 }, "Width": { "Type": 3.0, @@ -2936,11 +2936,11 @@ }, "X": { "Type": 3.0, - "Integer": 666.0 + "Integer": 699.0 }, "Y": { "Type": 3.0, - "Integer": 186.0 + "Integer": 234.0 }, "Width": { "Type": 3.0, @@ -2998,11 +2998,11 @@ }, "X": { "Type": 3.0, - "Integer": 600.0 + "Integer": 633.0 }, "Y": { "Type": 3.0, - "Integer": 465.0 + "Integer": 513.0 }, "Width": { "Type": 3.0, @@ -3072,7 +3072,7 @@ }, "Height": { "Type": 3.0, - "Integer": 87.0 + "Integer": 135.0 }, "Tool Tip": { "Type": 5.0, @@ -3122,11 +3122,11 @@ }, "X": { "Type": 3.0, - "Integer": 40.0 + "Integer": 72.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -3184,11 +3184,11 @@ }, "X": { "Type": 3.0, - "Integer": 57.0 + "Integer": 90.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, @@ -3246,11 +3246,11 @@ }, "X": { "Type": 3.0, - "Integer": 12.0 + "Integer": 45.0 }, "Y": { "Type": 3.0, - "Integer": 246.0 + "Integer": 294.0 }, "Width": { "Type": 3.0, @@ -3308,11 +3308,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 48.0 }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 327.0 }, "Width": { "Type": 3.0, @@ -3370,11 +3370,11 @@ }, "X": { "Type": 3.0, - "Integer": 30.0 + "Integer": 63.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -3432,11 +3432,11 @@ }, "X": { "Type": 3.0, - "Integer": 30.0 + "Integer": 63.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3494,11 +3494,11 @@ }, "X": { "Type": 3.0, - "Integer": 30.0 + "Integer": 63.0 }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 426.0 }, "Width": { "Type": 3.0, @@ -3556,11 +3556,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3639,11 +3639,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3722,11 +3722,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 273.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3763,11 +3763,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 471.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3846,11 +3846,11 @@ }, "X": { "Type": 3.0, - "Integer": 699.0 + "Integer": 732.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3929,11 +3929,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -4012,11 +4012,11 @@ }, "X": { "Type": 3.0, - "Integer": 540.0 + "Integer": 573.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -4095,11 +4095,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -4178,11 +4178,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -4261,11 +4261,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 273.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -4302,11 +4302,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 471.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -4385,11 +4385,11 @@ }, "X": { "Type": 3.0, - "Integer": 699.0 + "Integer": 732.0 }, "Y": { "Type": 3.0, - "Integer": 312.0 + "Integer": 360.0 }, "Width": { "Type": 3.0, @@ -4468,11 +4468,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 840.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -4551,11 +4551,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -4634,11 +4634,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 273.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -4675,11 +4675,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 471.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -4758,11 +4758,11 @@ }, "X": { "Type": 3.0, - "Integer": 699.0 + "Integer": 732.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -4841,11 +4841,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 591.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Marine Costs - Device Costs.json b/deploy/runtime/ui/Marine Costs - Device Costs.json index 7b63c2e76..2e0e41b53 100644 --- a/deploy/runtime/ui/Marine Costs - Device Costs.json +++ b/deploy/runtime/ui/Marine Costs - Device Costs.json @@ -1,7 +1,7 @@ { "Name": "Marine Costs - Device Costs", - "Width": 1057.0, - "Height": 432.0, + "Width": 1050.0, + "Height": 478.0, "FormObjects": { "Numeric": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 903.0 + "Integer": 900.0 }, "Y": { "Type": 3.0, - "Integer": 318.0 + "Integer": 363.0 }, "Width": { "Type": 3.0, @@ -95,11 +95,11 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -157,11 +157,11 @@ }, "X": { "Type": 3.0, - "Integer": 804.0 + "Integer": 801.0 }, "Y": { "Type": 3.0, - "Integer": 357.0 + "Integer": 402.0 }, "Width": { "Type": 3.0, @@ -198,11 +198,11 @@ }, "X": { "Type": 3.0, - "Integer": 903.0 + "Integer": 900.0 }, "Y": { "Type": 3.0, - "Integer": 318.0 + "Integer": 363.0 }, "Width": { "Type": 3.0, @@ -281,11 +281,11 @@ }, "X": { "Type": 3.0, - "Integer": 102.0 + "Integer": 99.0 }, "Y": { "Type": 3.0, - "Integer": 369.0 + "Integer": 414.0 }, "Width": { "Type": 3.0, @@ -343,11 +343,11 @@ }, "X": { "Type": 3.0, - "Integer": 108.0 + "Integer": 105.0 }, "Y": { "Type": 3.0, - "Integer": 351.0 + "Integer": 396.0 }, "Width": { "Type": 3.0, @@ -405,11 +405,11 @@ }, "X": { "Type": 3.0, - "Integer": 126.0 + "Integer": 123.0 }, "Y": { "Type": 3.0, - "Integer": 363.0 + "Integer": 408.0 }, "Width": { "Type": 3.0, @@ -467,11 +467,11 @@ }, "X": { "Type": 3.0, - "Integer": 903.0 + "Integer": 900.0 }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -550,11 +550,11 @@ }, "X": { "Type": 3.0, - "Integer": 612.0 + "Integer": 609.0 }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -633,11 +633,11 @@ }, "X": { "Type": 3.0, - "Integer": 291.0 + "Integer": 288.0 }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -674,11 +674,11 @@ }, "X": { "Type": 3.0, - "Integer": 489.0 + "Integer": 486.0 }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -757,11 +757,11 @@ }, "X": { "Type": 3.0, - "Integer": 780.0 + "Integer": 777.0 }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -840,11 +840,11 @@ }, "X": { "Type": 3.0, - "Integer": 612.0 + "Integer": 609.0 }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -923,11 +923,11 @@ }, "X": { "Type": 3.0, - "Integer": 849.0 + "Integer": 846.0 }, "Y": { "Type": 3.0, - "Integer": 297.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -985,7 +985,7 @@ }, "Height": { "Type": 3.0, - "Integer": 408.0 + "Integer": 468.0 }, "Tool Tip": { "Type": 5.0, @@ -1010,11 +1010,11 @@ }, "X": { "Type": 3.0, - "Integer": 381.0 + "Integer": 378.0 }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -1076,7 +1076,7 @@ }, "Y": { "Type": 3.0, - "Integer": 129.0 + "Integer": 165.0 }, "Width": { "Type": 3.0, @@ -1146,7 +1146,7 @@ }, "Height": { "Type": 3.0, - "Integer": 84.0 + "Integer": 108.0 }, "Tool Tip": { "Type": 5.0, @@ -1196,11 +1196,11 @@ }, "X": { "Type": 3.0, - "Integer": 894.0 + "Integer": 891.0 }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -1258,11 +1258,11 @@ }, "X": { "Type": 3.0, - "Integer": 63.0 + "Integer": 60.0 }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -1320,11 +1320,11 @@ }, "X": { "Type": 3.0, - "Integer": 63.0 + "Integer": 60.0 }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -1382,11 +1382,11 @@ }, "X": { "Type": 3.0, - "Integer": 108.0 + "Integer": 105.0 }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -1444,11 +1444,11 @@ }, "X": { "Type": 3.0, - "Integer": 690.0 + "Integer": 687.0 }, "Y": { "Type": 3.0, - "Integer": 318.0 + "Integer": 363.0 }, "Width": { "Type": 3.0, @@ -1506,11 +1506,11 @@ }, "X": { "Type": 3.0, - "Integer": 903.0 + "Integer": 900.0 }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -1589,11 +1589,11 @@ }, "X": { "Type": 3.0, - "Integer": 612.0 + "Integer": 609.0 }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -1672,11 +1672,11 @@ }, "X": { "Type": 3.0, - "Integer": 291.0 + "Integer": 288.0 }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -1713,11 +1713,11 @@ }, "X": { "Type": 3.0, - "Integer": 489.0 + "Integer": 486.0 }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -1796,11 +1796,11 @@ }, "X": { "Type": 3.0, - "Integer": 780.0 + "Integer": 777.0 }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -1879,11 +1879,11 @@ }, "X": { "Type": 3.0, - "Integer": 612.0 + "Integer": 609.0 }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -1962,11 +1962,11 @@ }, "X": { "Type": 3.0, - "Integer": 735.0 + "Integer": 732.0 }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -2024,11 +2024,11 @@ }, "X": { "Type": 3.0, - "Integer": 591.0 + "Integer": 588.0 }, "Y": { "Type": 3.0, - "Integer": 168.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -2086,11 +2086,11 @@ }, "X": { "Type": 3.0, - "Integer": 903.0 + "Integer": 900.0 }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -2169,11 +2169,11 @@ }, "X": { "Type": 3.0, - "Integer": 612.0 + "Integer": 609.0 }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -2252,11 +2252,11 @@ }, "X": { "Type": 3.0, - "Integer": 291.0 + "Integer": 288.0 }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -2293,11 +2293,11 @@ }, "X": { "Type": 3.0, - "Integer": 489.0 + "Integer": 486.0 }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -2376,11 +2376,11 @@ }, "X": { "Type": 3.0, - "Integer": 780.0 + "Integer": 777.0 }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, @@ -2459,11 +2459,11 @@ }, "X": { "Type": 3.0, - "Integer": 612.0 + "Integer": 609.0 }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 240.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Marine Costs - Financial.json b/deploy/runtime/ui/Marine Costs - Financial.json index fe5e219d4..d16b90d40 100644 --- a/deploy/runtime/ui/Marine Costs - Financial.json +++ b/deploy/runtime/ui/Marine Costs - Financial.json @@ -1,7 +1,7 @@ { "Name": "Marine Costs - Financial", - "Width": 1093.0, - "Height": 469.0, + "Width": 1059.0, + "Height": 518.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 12.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -74,11 +74,11 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -136,11 +136,11 @@ }, "X": { "Type": 3.0, - "Integer": 12.0 + "Integer": 15.0 }, "Y": { "Type": 3.0, - "Integer": 258.0 + "Integer": 309.0 }, "Width": { "Type": 3.0, @@ -198,11 +198,11 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Y": { "Type": 3.0, - "Integer": 291.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -260,11 +260,11 @@ }, "X": { "Type": 3.0, - "Integer": 834.0 + "Integer": 837.0 }, "Y": { "Type": 3.0, - "Integer": 363.0 + "Integer": 414.0 }, "Width": { "Type": 3.0, @@ -343,11 +343,11 @@ }, "X": { "Type": 3.0, - "Integer": 663.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, - "Integer": 393.0 + "Integer": 444.0 }, "Width": { "Type": 3.0, @@ -384,11 +384,11 @@ }, "X": { "Type": 3.0, - "Integer": 834.0 + "Integer": 837.0 }, "Y": { "Type": 3.0, - "Integer": 363.0 + "Integer": 414.0 }, "Width": { "Type": 3.0, @@ -467,11 +467,11 @@ }, "X": { "Type": 3.0, - "Integer": 834.0 + "Integer": 837.0 }, "Y": { "Type": 3.0, - "Integer": 258.0 + "Integer": 309.0 }, "Width": { "Type": 3.0, @@ -550,11 +550,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 564.0 }, "Y": { "Type": 3.0, - "Integer": 258.0 + "Integer": 309.0 }, "Width": { "Type": 3.0, @@ -633,11 +633,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 243.0 }, "Y": { "Type": 3.0, - "Integer": 258.0 + "Integer": 309.0 }, "Width": { "Type": 3.0, @@ -674,11 +674,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 441.0 }, "Y": { "Type": 3.0, - "Integer": 258.0 + "Integer": 309.0 }, "Width": { "Type": 3.0, @@ -757,11 +757,11 @@ }, "X": { "Type": 3.0, - "Integer": 714.0 + "Integer": 717.0 }, "Y": { "Type": 3.0, - "Integer": 258.0 + "Integer": 309.0 }, "Width": { "Type": 3.0, @@ -840,15 +840,15 @@ }, "X": { "Type": 3.0, - "Integer": 993.0 + "Integer": 978.0 }, "Y": { "Type": 3.0, - "Integer": 273.0 + "Integer": 324.0 }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 60.0 }, "Height": { "Type": 3.0, @@ -902,15 +902,15 @@ }, "X": { "Type": 3.0, - "Integer": 993.0 + "Integer": 978.0 }, "Y": { "Type": 3.0, - "Integer": 240.0 + "Integer": 291.0 }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 60.0 }, "Height": { "Type": 3.0, @@ -964,15 +964,15 @@ }, "X": { "Type": 3.0, - "Integer": 993.0 + "Integer": 978.0 }, "Y": { "Type": 3.0, - "Integer": 339.0 + "Integer": 390.0 }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 60.0 }, "Height": { "Type": 3.0, @@ -1026,15 +1026,15 @@ }, "X": { "Type": 3.0, - "Integer": 993.0 + "Integer": 978.0 }, "Y": { "Type": 3.0, - "Integer": 306.0 + "Integer": 357.0 }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 60.0 }, "Height": { "Type": 3.0, @@ -1088,11 +1088,11 @@ }, "X": { "Type": 3.0, - "Integer": 807.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, - "Integer": 351.0 + "Integer": 402.0 }, "Width": { "Type": 3.0, @@ -1146,11 +1146,11 @@ }, "Width": { "Type": 3.0, - "Integer": 1062.0 + "Integer": 1032.0 }, "Height": { "Type": 3.0, - "Integer": 429.0 + "Integer": 489.0 }, "Tool Tip": { "Type": 5.0, @@ -1175,11 +1175,11 @@ }, "X": { "Type": 3.0, - "Integer": 288.0 + "Integer": 291.0 }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -1241,7 +1241,7 @@ }, "Y": { "Type": 3.0, - "Integer": 138.0 + "Integer": 168.0 }, "Width": { "Type": 3.0, @@ -1299,11 +1299,11 @@ }, "X": { "Type": 3.0, - "Integer": 603.0 + "Integer": 606.0 }, "Y": { "Type": 3.0, - "Integer": 363.0 + "Integer": 414.0 }, "Width": { "Type": 3.0, @@ -1361,11 +1361,11 @@ }, "X": { "Type": 3.0, - "Integer": 431.0 + "Integer": 435.0 }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -1435,7 +1435,7 @@ }, "Height": { "Type": 3.0, - "Integer": 78.0 + "Integer": 117.0 }, "Tool Tip": { "Type": 5.0, @@ -1485,11 +1485,11 @@ }, "X": { "Type": 3.0, - "Integer": 678.0 + "Integer": 681.0 }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -1547,11 +1547,11 @@ }, "X": { "Type": 3.0, - "Integer": 819.0 + "Integer": 822.0 }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -1609,11 +1609,11 @@ }, "X": { "Type": 3.0, - "Integer": 834.0 + "Integer": 837.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -1692,11 +1692,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 564.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -1775,11 +1775,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 243.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -1816,11 +1816,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 441.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -1899,11 +1899,11 @@ }, "X": { "Type": 3.0, - "Integer": 714.0 + "Integer": 717.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -1982,11 +1982,11 @@ }, "X": { "Type": 3.0, - "Integer": 714.0 + "Integer": 717.0 }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2065,11 +2065,11 @@ }, "X": { "Type": 3.0, - "Integer": 834.0 + "Integer": 837.0 }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2148,11 +2148,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 564.0 }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2231,11 +2231,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 243.0 }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2272,11 +2272,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 441.0 }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2355,11 +2355,11 @@ }, "X": { "Type": 3.0, - "Integer": 834.0 + "Integer": 837.0 }, "Y": { "Type": 3.0, - "Integer": 291.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -2438,11 +2438,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 564.0 }, "Y": { "Type": 3.0, - "Integer": 291.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -2521,11 +2521,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 243.0 }, "Y": { "Type": 3.0, - "Integer": 291.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -2562,11 +2562,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 441.0 }, "Y": { "Type": 3.0, - "Integer": 291.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -2645,11 +2645,11 @@ }, "X": { "Type": 3.0, - "Integer": 714.0 + "Integer": 717.0 }, "Y": { "Type": 3.0, - "Integer": 291.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -2728,11 +2728,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 564.0 }, "Y": { "Type": 3.0, - "Integer": 291.0 + "Integer": 342.0 }, "Width": { "Type": 3.0, @@ -2811,11 +2811,11 @@ }, "X": { "Type": 3.0, - "Integer": 939.0 + "Integer": 942.0 }, "Y": { "Type": 3.0, - "Integer": 258.0 + "Integer": 309.0 }, "Width": { "Type": 3.0, @@ -2848,11 +2848,11 @@ }, "X": { "Type": 3.0, - "Integer": 939.0 + "Integer": 942.0 }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 375.0 }, "Width": { "Type": 3.0, @@ -2885,11 +2885,11 @@ }, "X": { "Type": 3.0, - "Integer": 939.0 + "Integer": 942.0 }, "Y": { "Type": 3.0, - "Integer": 225.0 + "Integer": 276.0 }, "Width": { "Type": 3.0, @@ -2922,11 +2922,11 @@ }, "X": { "Type": 3.0, - "Integer": 549.0 + "Integer": 552.0 }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Marine Costs - O&M.json b/deploy/runtime/ui/Marine Costs - O&M.json index 9e472f2fa..611126153 100644 --- a/deploy/runtime/ui/Marine Costs - O&M.json +++ b/deploy/runtime/ui/Marine Costs - O&M.json @@ -1,7 +1,7 @@ { "Name": "Marine Costs - O&M", - "Width": 1031.0, - "Height": 485.0, + "Width": 1021.0, + "Height": 484.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -12,15 +12,15 @@ }, "X": { "Type": 3.0, - "Integer": 912.0 + "Integer": 936.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 321.0 }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 60.0 }, "Height": { "Type": 3.0, @@ -74,15 +74,15 @@ }, "X": { "Type": 3.0, - "Integer": 912.0 + "Integer": 936.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 285.0 }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 60.0 }, "Height": { "Type": 3.0, @@ -136,11 +136,11 @@ }, "X": { "Type": 3.0, - "Integer": 852.0 + "Integer": 834.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -219,11 +219,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 543.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -302,11 +302,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 222.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -343,11 +343,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 420.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -426,11 +426,11 @@ }, "X": { "Type": 3.0, - "Integer": 717.0 + "Integer": 699.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -509,11 +509,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 543.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -592,11 +592,11 @@ }, "X": { "Type": 3.0, - "Integer": 540.0 + "Integer": 522.0 }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 252.0 }, "Width": { "Type": 3.0, @@ -745,7 +745,7 @@ }, "Y": { "Type": 3.0, - "Integer": 162.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -803,11 +803,11 @@ }, "X": { "Type": 3.0, - "Integer": 594.0 + "Integer": 576.0 }, "Y": { "Type": 3.0, - "Integer": 309.0 + "Integer": 357.0 }, "Width": { "Type": 3.0, @@ -865,11 +865,11 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 213.0 }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 252.0 }, "Width": { "Type": 3.0, @@ -939,7 +939,7 @@ }, "Height": { "Type": 3.0, - "Integer": 111.0 + "Integer": 135.0 }, "Tool Tip": { "Type": 5.0, @@ -989,11 +989,11 @@ }, "X": { "Type": 3.0, - "Integer": 66.0 + "Integer": 48.0 }, "Y": { "Type": 3.0, - "Integer": 270.0 + "Integer": 318.0 }, "Width": { "Type": 3.0, @@ -1051,11 +1051,11 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 411.0 }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 252.0 }, "Width": { "Type": 3.0, @@ -1113,11 +1113,11 @@ }, "X": { "Type": 3.0, - "Integer": 681.0 + "Integer": 663.0 }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 252.0 }, "Width": { "Type": 3.0, @@ -1175,11 +1175,11 @@ }, "X": { "Type": 3.0, - "Integer": 834.0 + "Integer": 816.0 }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 252.0 }, "Width": { "Type": 3.0, @@ -1237,11 +1237,11 @@ }, "X": { "Type": 3.0, - "Integer": 66.0 + "Integer": 48.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -1299,11 +1299,11 @@ }, "X": { "Type": 3.0, - "Integer": 852.0 + "Integer": 834.0 }, "Y": { "Type": 3.0, - "Integer": 309.0 + "Integer": 357.0 }, "Width": { "Type": 3.0, @@ -1382,11 +1382,11 @@ }, "X": { "Type": 3.0, - "Integer": 633.0 + "Integer": 615.0 }, "Y": { "Type": 3.0, - "Integer": 345.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -1423,11 +1423,11 @@ }, "X": { "Type": 3.0, - "Integer": 852.0 + "Integer": 834.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -1506,11 +1506,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 543.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -1589,11 +1589,11 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 222.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -1630,11 +1630,11 @@ }, "X": { "Type": 3.0, - "Integer": 438.0 + "Integer": 420.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -1713,11 +1713,11 @@ }, "X": { "Type": 3.0, - "Integer": 717.0 + "Integer": 699.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -1796,11 +1796,11 @@ }, "X": { "Type": 3.0, - "Integer": 561.0 + "Integer": 543.0 }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -1879,11 +1879,11 @@ }, "X": { "Type": 3.0, - "Integer": 852.0 + "Integer": 834.0 }, "Y": { "Type": 3.0, - "Integer": 309.0 + "Integer": 357.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Marine Wave Resource Header.json b/deploy/runtime/ui/Marine Wave Resource Header.json index 93b23d8f8..397185c56 100644 --- a/deploy/runtime/ui/Marine Wave Resource Header.json +++ b/deploy/runtime/ui/Marine Wave Resource Header.json @@ -1,7 +1,7 @@ { "Name": "Marine Wave Resource Header", - "Width": 1118.0, - "Height": 148.0, + "Width": 1100.0, + "Height": 180.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 138.0 + "Integer": 156.0 }, "Tool Tip": { "Type": 5.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 45.0 + "Integer": 66.0 }, "Tool Tip": { "Type": 5.0, @@ -115,7 +115,7 @@ }, "Y": { "Type": 3.0, - "Integer": 72.0 + "Integer": 90.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Marine Wave Resource Time Series.json b/deploy/runtime/ui/Marine Wave Resource Time Series.json index 5dc8e1c69..635fa509b 100644 --- a/deploy/runtime/ui/Marine Wave Resource Time Series.json +++ b/deploy/runtime/ui/Marine Wave Resource Time Series.json @@ -1,7 +1,7 @@ { "Name": "Marine Wave Resource Time Series", - "Width": 1097.0, - "Height": 731.0, + "Width": 1095.0, + "Height": 748.0, "FormObjects": { "Hyperlink": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 546.0 + "Integer": 567.0 }, "Width": { "Type": 3.0, @@ -168,7 +168,7 @@ }, "Y": { "Type": 3.0, - "Integer": 510.0 + "Integer": 531.0 }, "Width": { "Type": 3.0, @@ -275,7 +275,7 @@ }, "Height": { "Type": 3.0, - "Integer": 43.0 + "Integer": 70.0 }, "Tool Tip": { "Type": 5.0, @@ -366,7 +366,7 @@ }, "Y": { "Type": 3.0, - "Integer": 621.0 + "Integer": 636.0 }, "Width": { "Type": 3.0, @@ -374,7 +374,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 51.0 }, "Tool Tip": { "Type": 5.0, @@ -428,7 +428,7 @@ }, "Y": { "Type": 3.0, - "Integer": 678.0 + "Integer": 696.0 }, "Width": { "Type": 3.0, @@ -623,7 +623,7 @@ }, "Y": { "Type": 3.0, - "Integer": 597.0 + "Integer": 612.0 }, "Width": { "Type": 3.0, @@ -631,7 +631,7 @@ }, "Height": { "Type": 3.0, - "Integer": 126.0 + "Integer": 129.0 }, "Tool Tip": { "Type": 5.0, @@ -668,7 +668,7 @@ }, "Height": { "Type": 3.0, - "Integer": 159.0 + "Integer": 174.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Marine Wave Resource.json b/deploy/runtime/ui/Marine Wave Resource.json index c97b3ad20..20da5ac71 100644 --- a/deploy/runtime/ui/Marine Wave Resource.json +++ b/deploy/runtime/ui/Marine Wave Resource.json @@ -213,7 +213,7 @@ }, "Height": { "Type": 3.0, - "Integer": 43.0 + "Integer": 52.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Operating Costs Fuel Cell.json b/deploy/runtime/ui/Operating Costs Fuel Cell.json index 6496c07ab..2b0d70435 100644 --- a/deploy/runtime/ui/Operating Costs Fuel Cell.json +++ b/deploy/runtime/ui/Operating Costs Fuel Cell.json @@ -1040,7 +1040,7 @@ }, "Width": { "Type": 3.0, - "Integer": 126.0 + "Integer": 141.0 }, "Height": { "Type": 3.0, @@ -1102,7 +1102,7 @@ }, "Width": { "Type": 3.0, - "Integer": 45.0 + "Integer": 72.0 }, "Height": { "Type": 3.0, @@ -1660,7 +1660,7 @@ }, "Width": { "Type": 3.0, - "Integer": 48.0 + "Integer": 66.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/Operating Costs IPH.json b/deploy/runtime/ui/Operating Costs IPH.json index 1e195ab2a..b4e21f80b 100644 --- a/deploy/runtime/ui/Operating Costs IPH.json +++ b/deploy/runtime/ui/Operating Costs IPH.json @@ -185,7 +185,7 @@ }, "Height": { "Type": 3.0, - "Integer": 101.0 + "Integer": 131.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Operating Costs PV Battery.json b/deploy/runtime/ui/Operating Costs PV Battery.json index e0cd4a458..90ed9e73c 100644 --- a/deploy/runtime/ui/Operating Costs PV Battery.json +++ b/deploy/runtime/ui/Operating Costs PV Battery.json @@ -739,7 +739,7 @@ }, "Width": { "Type": 3.0, - "Integer": 60.0 + "Integer": 72.0 }, "Height": { "Type": 3.0, @@ -987,7 +987,7 @@ }, "Width": { "Type": 3.0, - "Integer": 60.0 + "Integer": 75.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/PTES Heat Pump.json b/deploy/runtime/ui/PTES Heat Pump.json index 4ec9a78a3..f12221e62 100644 --- a/deploy/runtime/ui/PTES Heat Pump.json +++ b/deploy/runtime/ui/PTES Heat Pump.json @@ -12,7 +12,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -95,7 +95,7 @@ }, "X": { "Type": 3.0, - "Integer": 279.0 + "Integer": 294.0 }, "Y": { "Type": 3.0, @@ -178,7 +178,7 @@ }, "X": { "Type": 3.0, - "Integer": 279.0 + "Integer": 294.0 }, "Y": { "Type": 3.0, @@ -261,7 +261,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -344,7 +344,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -427,7 +427,7 @@ }, "X": { "Type": 3.0, - "Integer": 279.0 + "Integer": 294.0 }, "Y": { "Type": 3.0, @@ -834,7 +834,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -917,7 +917,7 @@ }, "X": { "Type": 3.0, - "Integer": 279.0 + "Integer": 294.0 }, "Y": { "Type": 3.0, @@ -1332,7 +1332,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -1415,7 +1415,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -1498,7 +1498,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -1581,7 +1581,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -1747,7 +1747,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -1830,7 +1830,7 @@ }, "X": { "Type": 3.0, - "Integer": 765.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/PTES Power Cycle.json b/deploy/runtime/ui/PTES Power Cycle.json index 274bc0533..2a6af11a1 100644 --- a/deploy/runtime/ui/PTES Power Cycle.json +++ b/deploy/runtime/ui/PTES Power Cycle.json @@ -95,7 +95,7 @@ }, "X": { "Type": 3.0, - "Integer": 330.0 + "Integer": 321.0 }, "Y": { "Type": 3.0, @@ -178,7 +178,7 @@ }, "X": { "Type": 3.0, - "Integer": 330.0 + "Integer": 321.0 }, "Y": { "Type": 3.0, @@ -801,7 +801,7 @@ }, "X": { "Type": 3.0, - "Integer": 330.0 + "Integer": 321.0 }, "Y": { "Type": 3.0, @@ -884,7 +884,7 @@ }, "X": { "Type": 3.0, - "Integer": 330.0 + "Integer": 321.0 }, "Y": { "Type": 3.0, @@ -967,7 +967,7 @@ }, "X": { "Type": 3.0, - "Integer": 330.0 + "Integer": 321.0 }, "Y": { "Type": 3.0, @@ -1054,7 +1054,7 @@ }, "Y": { "Type": 3.0, - "Integer": 51.0 + "Integer": 57.0 }, "Width": { "Type": 3.0, @@ -1137,7 +1137,7 @@ }, "Y": { "Type": 3.0, - "Integer": 75.0 + "Integer": 81.0 }, "Width": { "Type": 3.0, @@ -1220,7 +1220,7 @@ }, "Y": { "Type": 3.0, - "Integer": 51.0 + "Integer": 57.0 }, "Width": { "Type": 3.0, @@ -1303,7 +1303,7 @@ }, "Y": { "Type": 3.0, - "Integer": 75.0 + "Integer": 81.0 }, "Width": { "Type": 3.0, @@ -1718,7 +1718,7 @@ }, "Y": { "Type": 3.0, - "Integer": 27.0 + "Integer": 33.0 }, "Width": { "Type": 3.0, @@ -2050,7 +2050,7 @@ }, "Y": { "Type": 3.0, - "Integer": 27.0 + "Integer": 33.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/PTES System Design.json b/deploy/runtime/ui/PTES System Design.json index 1146277e8..dbf59c2f5 100644 --- a/deploy/runtime/ui/PTES System Design.json +++ b/deploy/runtime/ui/PTES System Design.json @@ -12,7 +12,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -95,7 +95,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -178,7 +178,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -261,7 +261,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -344,7 +344,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -630,7 +630,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -796,7 +796,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -1261,7 +1261,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -1344,7 +1344,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -1842,7 +1842,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, @@ -1925,7 +1925,7 @@ }, "X": { "Type": 3.0, - "Integer": 231.0 + "Integer": 264.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/PV Albedo and Radiation.json b/deploy/runtime/ui/PV Albedo and Radiation.json index d1d6242d0..e77065b59 100644 --- a/deploy/runtime/ui/PV Albedo and Radiation.json +++ b/deploy/runtime/ui/PV Albedo and Radiation.json @@ -2100,7 +2100,7 @@ }, "Height": { "Type": 3.0, - "Integer": 76.0 + "Integer": 82.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/PV Battery Capital Costs.json b/deploy/runtime/ui/PV Battery Capital Costs.json index d08cdd5dc..0a06c8529 100644 --- a/deploy/runtime/ui/PV Battery Capital Costs.json +++ b/deploy/runtime/ui/PV Battery Capital Costs.json @@ -6841,7 +6841,7 @@ }, "X": { "Type": 3.0, - "Integer": 501.0 + "Integer": 465.0 }, "Y": { "Type": 3.0, @@ -6849,7 +6849,7 @@ }, "Width": { "Type": 3.0, - "Integer": 210.0 + "Integer": 246.0 }, "Height": { "Type": 3.0, @@ -6965,7 +6965,7 @@ }, "X": { "Type": 3.0, - "Integer": 501.0 + "Integer": 468.0 }, "Y": { "Type": 3.0, @@ -6973,7 +6973,7 @@ }, "Width": { "Type": 3.0, - "Integer": 210.0 + "Integer": 243.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/PV Capital Cost Curve.json b/deploy/runtime/ui/PV Capital Cost Curve.json index f2b615ccc..7ee397b0a 100644 --- a/deploy/runtime/ui/PV Capital Cost Curve.json +++ b/deploy/runtime/ui/PV Capital Cost Curve.json @@ -1,7 +1,7 @@ { "Name": "PV Capital Cost Curve", - "Width": 825.0, - "Height": 228.0, + "Width": 826.0, + "Height": 273.0, "FormObjects": { "Numeric": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 657.0 + "Integer": 663.0 }, "Y": { "Type": 3.0, - "Integer": 129.0 + "Integer": 159.0 }, "Width": { "Type": 3.0, @@ -95,11 +95,11 @@ }, "X": { "Type": 3.0, - "Integer": 657.0 + "Integer": 663.0 }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 132.0 }, "Width": { "Type": 3.0, @@ -178,11 +178,11 @@ }, "X": { "Type": 3.0, - "Integer": 657.0 + "Integer": 663.0 }, "Y": { "Type": 3.0, - "Integer": 156.0 + "Integer": 186.0 }, "Width": { "Type": 3.0, @@ -261,11 +261,11 @@ }, "X": { "Type": 3.0, - "Integer": 477.0 + "Integer": 483.0 }, "Y": { "Type": 3.0, - "Integer": 129.0 + "Integer": 159.0 }, "Width": { "Type": 3.0, @@ -323,11 +323,11 @@ }, "X": { "Type": 3.0, - "Integer": 477.0 + "Integer": 483.0 }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 132.0 }, "Width": { "Type": 3.0, @@ -385,11 +385,11 @@ }, "X": { "Type": 3.0, - "Integer": 462.0 + "Integer": 468.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, @@ -447,11 +447,11 @@ }, "X": { "Type": 3.0, - "Integer": 477.0 + "Integer": 483.0 }, "Y": { "Type": 3.0, - "Integer": 156.0 + "Integer": 186.0 }, "Width": { "Type": 3.0, @@ -509,11 +509,11 @@ }, "X": { "Type": 3.0, - "Integer": 651.0 + "Integer": 657.0 }, "Y": { "Type": 3.0, - "Integer": 183.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, @@ -571,7 +571,7 @@ }, "Height": { "Type": 3.0, - "Integer": 217.0 + "Integer": 256.0 }, "Tool Tip": { "Type": 5.0, @@ -608,7 +608,7 @@ }, "Height": { "Type": 3.0, - "Integer": 67.0 + "Integer": 88.0 }, "Tool Tip": { "Type": 5.0, @@ -658,11 +658,11 @@ }, "X": { "Type": 3.0, - "Integer": 657.0 + "Integer": 663.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 222.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/PV Capital Costs.json b/deploy/runtime/ui/PV Capital Costs.json index d6b92be03..79adfe8a5 100644 --- a/deploy/runtime/ui/PV Capital Costs.json +++ b/deploy/runtime/ui/PV Capital Costs.json @@ -1975,7 +1975,7 @@ }, "Caption": { "Type": 5.0, - "String": "grpTotalInstalledCost" + "String": "Total Installed Cost" }, "Bold": { "Type": 2.0, diff --git a/deploy/runtime/ui/PV DC Losses.json b/deploy/runtime/ui/PV DC Losses.json index 5f87923d3..cf08bbf4a 100644 --- a/deploy/runtime/ui/PV DC Losses.json +++ b/deploy/runtime/ui/PV DC Losses.json @@ -1239,15 +1239,15 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 102.0 }, "Width": { "Type": 3.0, - "Integer": 813.0 + "Integer": 903.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/PV Land Area.json b/deploy/runtime/ui/PV Land Area.json index 8191a71b4..0ebbdadb3 100644 --- a/deploy/runtime/ui/PV Land Area.json +++ b/deploy/runtime/ui/PV Land Area.json @@ -359,7 +359,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 45.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/PV Losses.json b/deploy/runtime/ui/PV Losses.json index 15fa39227..f97a16332 100644 --- a/deploy/runtime/ui/PV Losses.json +++ b/deploy/runtime/ui/PV Losses.json @@ -1,7 +1,7 @@ { "Name": "PV Losses", "Width": 856.0, - "Height": 1113.0, + "Height": 1134.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 972.0 + "Integer": 996.0 }, "Width": { "Type": 3.0, @@ -90,7 +90,7 @@ }, "Y": { "Type": 3.0, - "Integer": 570.0 + "Integer": 567.0 }, "Width": { "Type": 3.0, @@ -98,7 +98,7 @@ }, "Height": { "Type": 3.0, - "Integer": 200.0 + "Integer": 209.0 }, "Tool Tip": { "Type": 5.0, @@ -127,7 +127,7 @@ }, "Y": { "Type": 3.0, - "Integer": 771.0 + "Integer": 774.0 }, "Width": { "Type": 3.0, @@ -135,7 +135,7 @@ }, "Height": { "Type": 3.0, - "Integer": 120.0 + "Integer": 141.0 }, "Tool Tip": { "Type": 5.0, @@ -164,7 +164,7 @@ }, "Y": { "Type": 3.0, - "Integer": 891.0 + "Integer": 921.0 }, "Width": { "Type": 3.0, @@ -172,7 +172,7 @@ }, "Height": { "Type": 3.0, - "Integer": 77.0 + "Integer": 74.0 }, "Tool Tip": { "Type": 5.0, @@ -1317,7 +1317,7 @@ }, "Y": { "Type": 3.0, - "Integer": 993.0 + "Integer": 1017.0 }, "Width": { "Type": 3.0, @@ -1450,7 +1450,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1014.0 + "Integer": 1038.0 }, "Width": { "Type": 3.0, @@ -1700,11 +1700,11 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 258.0 }, "Y": { "Type": 3.0, - "Integer": 714.0 + "Integer": 723.0 }, "Width": { "Type": 3.0, @@ -1753,7 +1753,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1014.0 + "Integer": 1038.0 }, "Width": { "Type": 3.0, @@ -1814,7 +1814,7 @@ }, "Y": { "Type": 3.0, - "Integer": 993.0 + "Integer": 1017.0 }, "Width": { "Type": 3.0, @@ -1943,11 +1943,11 @@ }, "X": { "Type": 3.0, - "Integer": 243.0 + "Integer": 228.0 }, "Y": { "Type": 3.0, - "Integer": 687.0 + "Integer": 699.0 }, "Width": { "Type": 3.0, @@ -2034,11 +2034,11 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 642.0 + "Integer": 639.0 }, "Width": { "Type": 3.0, @@ -2129,11 +2129,11 @@ }, "Width": { "Type": 3.0, - "Integer": 813.0 + "Integer": 822.0 }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 39.0 }, "Tool Tip": { "Type": 5.0, @@ -2141,7 +2141,7 @@ }, "Caption": { "Type": 5.0, - "String": "Clipping correction accounts for inverter power limiting that may occur within the hour on partly cloudy days (hourly simulations only)." + "String": "Clipping correction accounts for inverter power limiting that may occur within the hour on partly cloudy days (hourly simulation only)" }, "TextColour": { "Type": 4.0, @@ -2162,7 +2162,7 @@ }, "WordWrap": { "Type": 2.0, - "Boolean": 0.0 + "Boolean": 1.0 }, "AlignRight": { "Type": 2.0, @@ -2170,7 +2170,7 @@ }, "AlignTop": { "Type": 2.0, - "Boolean": 0.0 + "Boolean": 1.0 } } }, @@ -2183,19 +2183,19 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 6.0 }, "Y": { "Type": 3.0, - "Integer": 222.0 + "Integer": 225.0 }, "Width": { "Type": 3.0, - "Integer": 813.0 + "Integer": 840.0 }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 27.0 }, "Tool Tip": { "Type": 5.0, @@ -2493,7 +2493,7 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 9.0 }, "Y": { "Type": 3.0, @@ -2501,7 +2501,7 @@ }, "Width": { "Type": 3.0, - "Integer": 813.0 + "Integer": 837.0 }, "Height": { "Type": 3.0, @@ -2555,19 +2555,19 @@ }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 9.0 }, "Y": { "Type": 3.0, - "Integer": 789.0 + "Integer": 792.0 }, "Width": { "Type": 3.0, - "Integer": 813.0 + "Integer": 834.0 }, "Height": { "Type": 3.0, - "Integer": 42.0 + "Integer": 63.0 }, "Tool Tip": { "Type": 5.0, @@ -2621,7 +2621,7 @@ }, "Y": { "Type": 3.0, - "Integer": 990.0 + "Integer": 1014.0 }, "Width": { "Type": 3.0, @@ -2629,7 +2629,7 @@ }, "Height": { "Type": 3.0, - "Integer": 72.0 + "Integer": 105.0 }, "Tool Tip": { "Type": 5.0, @@ -2745,7 +2745,7 @@ }, "Y": { "Type": 3.0, - "Integer": 909.0 + "Integer": 942.0 }, "Width": { "Type": 3.0, @@ -6275,7 +6275,7 @@ }, "Y": { "Type": 3.0, - "Integer": 861.0 + "Integer": 888.0 }, "Width": { "Type": 3.0, @@ -6354,11 +6354,11 @@ }, "X": { "Type": 3.0, - "Integer": 252.0 + "Integer": 249.0 }, "Y": { "Type": 3.0, - "Integer": 834.0 + "Integer": 858.0 }, "Width": { "Type": 3.0, @@ -6441,7 +6441,7 @@ }, "Y": { "Type": 3.0, - "Integer": 936.0 + "Integer": 969.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/PV Row Dimensions and Spacing.json b/deploy/runtime/ui/PV Row Dimensions and Spacing.json index bef581627..fca0a2a39 100644 --- a/deploy/runtime/ui/PV Row Dimensions and Spacing.json +++ b/deploy/runtime/ui/PV Row Dimensions and Spacing.json @@ -1,7 +1,7 @@ { "Name": "PV Row Dimensions and Spacing", - "Width": 1009.0, - "Height": 567.0, + "Width": 1011.0, + "Height": 602.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -78,7 +78,7 @@ }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 339.0 }, "Width": { "Type": 3.0, @@ -140,7 +140,7 @@ }, "Y": { "Type": 3.0, - "Integer": 351.0 + "Integer": 366.0 }, "Width": { "Type": 3.0, @@ -202,7 +202,7 @@ }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -264,7 +264,7 @@ }, "Y": { "Type": 3.0, - "Integer": 297.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -322,11 +322,11 @@ }, "X": { "Type": 3.0, - "Integer": 168.0 + "Integer": 177.0 }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 546.0 }, "Width": { "Type": 3.0, @@ -384,11 +384,11 @@ }, "X": { "Type": 3.0, - "Integer": 168.0 + "Integer": 177.0 }, "Y": { "Type": 3.0, - "Integer": 477.0 + "Integer": 519.0 }, "Width": { "Type": 3.0, @@ -446,11 +446,11 @@ }, "X": { "Type": 3.0, - "Integer": 168.0 + "Integer": 177.0 }, "Y": { "Type": 3.0, - "Integer": 531.0 + "Integer": 573.0 }, "Width": { "Type": 3.0, @@ -508,15 +508,15 @@ }, "X": { "Type": 3.0, - "Integer": 24.0 + "Integer": 30.0 }, "Y": { "Type": 3.0, - "Integer": 477.0 + "Integer": 519.0 }, "Width": { "Type": 3.0, - "Integer": 141.0 + "Integer": 144.0 }, "Height": { "Type": 3.0, @@ -561,7 +561,7 @@ }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -619,11 +619,11 @@ }, "X": { "Type": 3.0, - "Integer": 792.0 + "Integer": 801.0 }, "Y": { "Type": 3.0, - "Integer": 477.0 + "Integer": 519.0 }, "Width": { "Type": 3.0, @@ -685,7 +685,7 @@ }, "Y": { "Type": 3.0, - "Integer": 147.0 + "Integer": 162.0 }, "Width": { "Type": 3.0, @@ -768,7 +768,7 @@ }, "Y": { "Type": 3.0, - "Integer": 174.0 + "Integer": 189.0 }, "Width": { "Type": 3.0, @@ -851,7 +851,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 135.0 }, "Width": { "Type": 3.0, @@ -934,7 +934,7 @@ }, "Y": { "Type": 3.0, - "Integer": 93.0 + "Integer": 108.0 }, "Width": { "Type": 3.0, @@ -1017,7 +1017,7 @@ }, "Y": { "Type": 3.0, - "Integer": 72.0 + "Integer": 87.0 }, "Width": { "Type": 3.0, @@ -1054,7 +1054,7 @@ }, "Y": { "Type": 3.0, - "Integer": 195.0 + "Integer": 210.0 }, "Width": { "Type": 3.0, @@ -1104,7 +1104,7 @@ }, "Y": { "Type": 3.0, - "Integer": 72.0 + "Integer": 87.0 }, "Width": { "Type": 3.0, @@ -1162,7 +1162,7 @@ }, "Height": { "Type": 3.0, - "Integer": 560.0 + "Integer": 596.0 }, "Tool Tip": { "Type": 5.0, @@ -1191,7 +1191,7 @@ }, "Y": { "Type": 3.0, - "Integer": 426.0 + "Integer": 447.0 }, "Width": { "Type": 3.0, @@ -1199,7 +1199,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 60.0 }, "Tool Tip": { "Type": 5.0, @@ -1253,7 +1253,7 @@ }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 228.0 }, "Width": { "Type": 3.0, @@ -1323,7 +1323,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 63.0 }, "Tool Tip": { "Type": 5.0, @@ -1373,11 +1373,11 @@ }, "X": { "Type": 3.0, - "Integer": 300.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, - "Integer": 477.0 + "Integer": 519.0 }, "Width": { "Type": 3.0, @@ -1460,7 +1460,7 @@ }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -1501,7 +1501,7 @@ }, "Y": { "Type": 3.0, - "Integer": 351.0 + "Integer": 366.0 }, "Width": { "Type": 3.0, @@ -1584,7 +1584,7 @@ }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 339.0 }, "Width": { "Type": 3.0, @@ -1663,11 +1663,11 @@ }, "X": { "Type": 3.0, - "Integer": 300.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, - "Integer": 531.0 + "Integer": 573.0 }, "Width": { "Type": 3.0, @@ -1750,7 +1750,7 @@ }, "Y": { "Type": 3.0, - "Integer": 297.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -1833,7 +1833,7 @@ }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -1912,11 +1912,11 @@ }, "X": { "Type": 3.0, - "Integer": 300.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 546.0 }, "Width": { "Type": 3.0, @@ -1995,11 +1995,11 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 438.0 }, "Y": { "Type": 3.0, - "Integer": 477.0 + "Integer": 519.0 }, "Width": { "Type": 3.0, @@ -2082,7 +2082,7 @@ }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -2123,7 +2123,7 @@ }, "Y": { "Type": 3.0, - "Integer": 351.0 + "Integer": 366.0 }, "Width": { "Type": 3.0, @@ -2206,7 +2206,7 @@ }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 339.0 }, "Width": { "Type": 3.0, @@ -2285,11 +2285,11 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 438.0 }, "Y": { "Type": 3.0, - "Integer": 531.0 + "Integer": 573.0 }, "Width": { "Type": 3.0, @@ -2372,7 +2372,7 @@ }, "Y": { "Type": 3.0, - "Integer": 297.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -2455,7 +2455,7 @@ }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -2534,11 +2534,11 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 438.0 }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 546.0 }, "Width": { "Type": 3.0, @@ -2617,11 +2617,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 567.0 }, "Y": { "Type": 3.0, - "Integer": 477.0 + "Integer": 519.0 }, "Width": { "Type": 3.0, @@ -2704,7 +2704,7 @@ }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -2745,7 +2745,7 @@ }, "Y": { "Type": 3.0, - "Integer": 351.0 + "Integer": 366.0 }, "Width": { "Type": 3.0, @@ -2828,7 +2828,7 @@ }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 339.0 }, "Width": { "Type": 3.0, @@ -2907,11 +2907,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 567.0 }, "Y": { "Type": 3.0, - "Integer": 531.0 + "Integer": 573.0 }, "Width": { "Type": 3.0, @@ -2994,7 +2994,7 @@ }, "Y": { "Type": 3.0, - "Integer": 297.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -3077,7 +3077,7 @@ }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -3156,11 +3156,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 567.0 }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 546.0 }, "Width": { "Type": 3.0, @@ -3239,11 +3239,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 696.0 }, "Y": { "Type": 3.0, - "Integer": 477.0 + "Integer": 519.0 }, "Width": { "Type": 3.0, @@ -3326,7 +3326,7 @@ }, "Y": { "Type": 3.0, - "Integer": 267.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -3367,7 +3367,7 @@ }, "Y": { "Type": 3.0, - "Integer": 351.0 + "Integer": 366.0 }, "Width": { "Type": 3.0, @@ -3450,7 +3450,7 @@ }, "Y": { "Type": 3.0, - "Integer": 324.0 + "Integer": 339.0 }, "Width": { "Type": 3.0, @@ -3529,11 +3529,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 696.0 }, "Y": { "Type": 3.0, - "Integer": 531.0 + "Integer": 573.0 }, "Width": { "Type": 3.0, @@ -3616,7 +3616,7 @@ }, "Y": { "Type": 3.0, - "Integer": 297.0 + "Integer": 312.0 }, "Width": { "Type": 3.0, @@ -3699,7 +3699,7 @@ }, "Y": { "Type": 3.0, - "Integer": 378.0 + "Integer": 393.0 }, "Width": { "Type": 3.0, @@ -3778,11 +3778,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 696.0 }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 546.0 }, "Width": { "Type": 3.0, @@ -3861,11 +3861,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 12.0 }, "Y": { "Type": 3.0, - "Integer": 408.0 + "Integer": 420.0 }, "Width": { "Type": 3.0, @@ -3873,7 +3873,7 @@ }, "Height": { "Type": 3.0, - "Integer": 16.0 + "Integer": 22.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/PV Soiling Shading Snow.json b/deploy/runtime/ui/PV Soiling Shading Snow.json index 290a0bce1..11fd755f9 100644 --- a/deploy/runtime/ui/PV Soiling Shading Snow.json +++ b/deploy/runtime/ui/PV Soiling Shading Snow.json @@ -1,7 +1,7 @@ { "Name": "PV Soiling Shading Snow", - "Width": 1008.0, - "Height": 683.0, + "Width": 1003.0, + "Height": 734.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -74,11 +74,11 @@ }, "X": { "Type": 3.0, - "Integer": 30.0 + "Integer": 24.0 }, "Y": { "Type": 3.0, - "Integer": 444.0 + "Integer": 501.0 }, "Width": { "Type": 3.0, @@ -425,11 +425,11 @@ }, "X": { "Type": 3.0, - "Integer": 822.0 + "Integer": 816.0 }, "Y": { "Type": 3.0, - "Integer": 327.0 + "Integer": 354.0 }, "Width": { "Type": 3.0, @@ -462,11 +462,11 @@ }, "X": { "Type": 3.0, - "Integer": 24.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 561.0 + "Integer": 618.0 }, "Width": { "Type": 3.0, @@ -503,11 +503,11 @@ }, "X": { "Type": 3.0, - "Integer": 6.0 + "Integer": 0.0 }, "Y": { "Type": 3.0, - "Integer": 369.0 + "Integer": 396.0 }, "Width": { "Type": 3.0, @@ -515,7 +515,7 @@ }, "Height": { "Type": 3.0, - "Integer": 117.0 + "Integer": 150.0 }, "Tool Tip": { "Type": 5.0, @@ -589,7 +589,7 @@ }, "Height": { "Type": 3.0, - "Integer": 111.0 + "Integer": 141.0 }, "Tool Tip": { "Type": 5.0, @@ -614,11 +614,11 @@ }, "X": { "Type": 3.0, - "Integer": 393.0 + "Integer": 387.0 }, "Y": { "Type": 3.0, - "Integer": 561.0 + "Integer": 618.0 }, "Width": { "Type": 3.0, @@ -924,11 +924,11 @@ }, "X": { "Type": 3.0, - "Integer": 849.0 + "Integer": 843.0 }, "Y": { "Type": 3.0, - "Integer": 588.0 + "Integer": 645.0 }, "Width": { "Type": 3.0, @@ -983,11 +983,11 @@ }, "X": { "Type": 3.0, - "Integer": 393.0 + "Integer": 387.0 }, "Y": { "Type": 3.0, - "Integer": 588.0 + "Integer": 645.0 }, "Width": { "Type": 3.0, @@ -1020,11 +1020,11 @@ }, "X": { "Type": 3.0, - "Integer": 849.0 + "Integer": 843.0 }, "Y": { "Type": 3.0, - "Integer": 642.0 + "Integer": 699.0 }, "Width": { "Type": 3.0, @@ -1079,11 +1079,11 @@ }, "X": { "Type": 3.0, - "Integer": 393.0 + "Integer": 387.0 }, "Y": { "Type": 3.0, - "Integer": 642.0 + "Integer": 699.0 }, "Width": { "Type": 3.0, @@ -1120,11 +1120,11 @@ }, "X": { "Type": 3.0, - "Integer": 849.0 + "Integer": 843.0 }, "Y": { "Type": 3.0, - "Integer": 615.0 + "Integer": 672.0 }, "Width": { "Type": 3.0, @@ -1179,11 +1179,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 9.0 }, "Y": { "Type": 3.0, - "Integer": 507.0 + "Integer": 564.0 }, "Width": { "Type": 3.0, @@ -1241,11 +1241,11 @@ }, "X": { "Type": 3.0, - "Integer": 6.0 + "Integer": 0.0 }, "Y": { "Type": 3.0, - "Integer": 492.0 + "Integer": 549.0 }, "Width": { "Type": 3.0, @@ -1327,7 +1327,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 78.0 }, "Tool Tip": { "Type": 5.0, @@ -1377,11 +1377,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 9.0 }, "Y": { "Type": 3.0, - "Integer": 387.0 + "Integer": 420.0 }, "Width": { "Type": 3.0, @@ -1389,7 +1389,7 @@ }, "Height": { "Type": 3.0, - "Integer": 48.0 + "Integer": 66.0 }, "Tool Tip": { "Type": 5.0, @@ -1563,11 +1563,11 @@ }, "X": { "Type": 3.0, - "Integer": 393.0 + "Integer": 387.0 }, "Y": { "Type": 3.0, - "Integer": 615.0 + "Integer": 672.0 }, "Width": { "Type": 3.0, @@ -1774,11 +1774,11 @@ }, "X": { "Type": 3.0, - "Integer": 300.0 + "Integer": 294.0 }, "Y": { "Type": 3.0, - "Integer": 444.0 + "Integer": 501.0 }, "Width": { "Type": 3.0, @@ -1815,11 +1815,11 @@ }, "X": { "Type": 3.0, - "Integer": 300.0 + "Integer": 294.0 }, "Y": { "Type": 3.0, - "Integer": 327.0 + "Integer": 354.0 }, "Width": { "Type": 3.0, @@ -2142,11 +2142,11 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 423.0 }, "Y": { "Type": 3.0, - "Integer": 444.0 + "Integer": 501.0 }, "Width": { "Type": 3.0, @@ -2183,11 +2183,11 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 423.0 }, "Y": { "Type": 3.0, - "Integer": 327.0 + "Integer": 354.0 }, "Width": { "Type": 3.0, @@ -2510,11 +2510,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 552.0 }, "Y": { "Type": 3.0, - "Integer": 444.0 + "Integer": 501.0 }, "Width": { "Type": 3.0, @@ -2551,11 +2551,11 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 552.0 }, "Y": { "Type": 3.0, - "Integer": 327.0 + "Integer": 354.0 }, "Width": { "Type": 3.0, @@ -2878,11 +2878,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 681.0 }, "Y": { "Type": 3.0, - "Integer": 444.0 + "Integer": 501.0 }, "Width": { "Type": 3.0, @@ -2919,11 +2919,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 681.0 }, "Y": { "Type": 3.0, - "Integer": 327.0 + "Integer": 354.0 }, "Width": { "Type": 3.0, @@ -3080,11 +3080,11 @@ }, "X": { "Type": 3.0, - "Integer": 42.0 + "Integer": 36.0 }, "Y": { "Type": 3.0, - "Integer": 588.0 + "Integer": 645.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/PV Spectral Correction.json b/deploy/runtime/ui/PV Spectral Correction.json index 0d09a3151..743977e12 100644 --- a/deploy/runtime/ui/PV Spectral Correction.json +++ b/deploy/runtime/ui/PV Spectral Correction.json @@ -1,7 +1,7 @@ { "Name": "PV Spectral Correction", - "Width": 1008.0, - "Height": 190.0, + "Width": 1016.0, + "Height": 261.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 182.0 + "Integer": 236.0 }, "Tool Tip": { "Type": 5.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Width": { "Type": 3.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 51.0 + "Integer": 93.0 }, "Tool Tip": { "Type": 5.0, @@ -111,11 +111,11 @@ }, "X": { "Type": 3.0, - "Integer": 360.0 + "Integer": 363.0 }, "Y": { "Type": 3.0, - "Integer": 78.0 + "Integer": 135.0 }, "Width": { "Type": 3.0, @@ -170,11 +170,11 @@ }, "X": { "Type": 3.0, - "Integer": 24.0 + "Integer": 27.0 }, "Y": { "Type": 3.0, - "Integer": 75.0 + "Integer": 132.0 }, "Width": { "Type": 3.0, @@ -219,11 +219,11 @@ }, "X": { "Type": 3.0, - "Integer": 297.0 + "Integer": 300.0 }, "Y": { "Type": 3.0, - "Integer": 111.0 + "Integer": 168.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/PV System Availability.json b/deploy/runtime/ui/PV System Availability.json index afe492f56..6076ff2db 100644 --- a/deploy/runtime/ui/PV System Availability.json +++ b/deploy/runtime/ui/PV System Availability.json @@ -1,7 +1,7 @@ { "Name": "PV System Availability", - "Width": 1010.0, - "Height": 169.0, + "Width": 1011.0, + "Height": 189.0, "FormObjects": { "Divider": { "Visible": 1.0, @@ -12,11 +12,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 21.0 }, "Y": { "Type": 3.0, - "Integer": 51.0 + "Integer": 78.0 }, "Width": { "Type": 3.0, @@ -62,11 +62,11 @@ }, "X": { "Type": 3.0, - "Integer": 540.0 + "Integer": 546.0 }, "Y": { "Type": 3.0, - "Integer": 75.0 + "Integer": 102.0 }, "Width": { "Type": 3.0, @@ -123,11 +123,11 @@ }, "X": { "Type": 3.0, - "Integer": 39.0 + "Integer": 45.0 }, "Y": { "Type": 3.0, - "Integer": 75.0 + "Integer": 102.0 }, "Width": { "Type": 3.0, @@ -184,11 +184,11 @@ }, "X": { "Type": 3.0, - "Integer": 516.0 + "Integer": 522.0 }, "Y": { "Type": 3.0, - "Integer": 51.0 + "Integer": 78.0 }, "Width": { "Type": 3.0, @@ -246,7 +246,7 @@ }, "Height": { "Type": 3.0, - "Integer": 161.0 + "Integer": 182.0 }, "Tool Tip": { "Type": 5.0, @@ -271,11 +271,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Width": { "Type": 3.0, @@ -283,7 +283,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 51.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/PV System Size.json b/deploy/runtime/ui/PV System Size.json index ecf9eae5f..af931c7ef 100644 --- a/deploy/runtime/ui/PV System Size.json +++ b/deploy/runtime/ui/PV System Size.json @@ -178,7 +178,7 @@ }, "X": { "Type": 3.0, - "Integer": 518.0 + "Integer": 534.0 }, "Y": { "Type": 3.0, @@ -261,7 +261,7 @@ }, "X": { "Type": 3.0, - "Integer": 518.0 + "Integer": 534.0 }, "Y": { "Type": 3.0, @@ -393,7 +393,7 @@ }, "X": { "Type": 3.0, - "Integer": 518.0 + "Integer": 534.0 }, "Y": { "Type": 3.0, @@ -974,11 +974,11 @@ }, "Width": { "Type": 3.0, - "Integer": 351.0 + "Integer": 369.0 }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 27.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/PV Tracking and Orientation.json b/deploy/runtime/ui/PV Tracking and Orientation.json index b0e4610c1..567b98b0c 100644 --- a/deploy/runtime/ui/PV Tracking and Orientation.json +++ b/deploy/runtime/ui/PV Tracking and Orientation.json @@ -421,7 +421,7 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, @@ -483,7 +483,7 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, @@ -545,7 +545,7 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 744.0 }, "Y": { "Type": 3.0, @@ -607,19 +607,19 @@ }, "X": { "Type": 3.0, - "Integer": 792.0 + "Integer": 849.0 }, "Y": { "Type": 3.0, - "Integer": 315.0 + "Integer": 285.0 }, "Width": { "Type": 3.0, - "Integer": 210.0 + "Integer": 153.0 }, "Height": { "Type": 3.0, - "Integer": 132.0 + "Integer": 162.0 }, "Tool Tip": { "Type": 5.0, @@ -1243,7 +1243,7 @@ }, "Width": { "Type": 3.0, - "Integer": 128.0 + "Integer": 135.0 }, "Height": { "Type": 3.0, @@ -1284,7 +1284,7 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, @@ -1367,7 +1367,7 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, @@ -1408,7 +1408,7 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, @@ -1445,7 +1445,7 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, @@ -1528,7 +1528,7 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, @@ -1611,7 +1611,7 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, @@ -1652,7 +1652,7 @@ }, "X": { "Type": 3.0, - "Integer": 429.0 + "Integer": 447.0 }, "Y": { "Type": 3.0, @@ -1660,7 +1660,7 @@ }, "Width": { "Type": 3.0, - "Integer": 128.0 + "Integer": 135.0 }, "Height": { "Type": 3.0, @@ -1701,7 +1701,7 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, @@ -1784,7 +1784,7 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, @@ -1825,7 +1825,7 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, @@ -1862,7 +1862,7 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, @@ -1945,7 +1945,7 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, @@ -2028,7 +2028,7 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, @@ -2069,7 +2069,7 @@ }, "X": { "Type": 3.0, - "Integer": 558.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, @@ -2077,7 +2077,7 @@ }, "Width": { "Type": 3.0, - "Integer": 128.0 + "Integer": 135.0 }, "Height": { "Type": 3.0, @@ -2118,7 +2118,7 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 744.0 }, "Y": { "Type": 3.0, @@ -2201,7 +2201,7 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 744.0 }, "Y": { "Type": 3.0, @@ -2242,7 +2242,7 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 744.0 }, "Y": { "Type": 3.0, @@ -2279,7 +2279,7 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 744.0 }, "Y": { "Type": 3.0, @@ -2362,7 +2362,7 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 744.0 }, "Y": { "Type": 3.0, @@ -2445,7 +2445,7 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 744.0 }, "Y": { "Type": 3.0, @@ -2486,7 +2486,7 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 744.0 }, "Y": { "Type": 3.0, @@ -2494,7 +2494,7 @@ }, "Width": { "Type": 3.0, - "Integer": 128.0 + "Integer": 135.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/PVWatts Advanced Inputs.json b/deploy/runtime/ui/PVWatts Advanced Inputs.json index 352282536..0142f6df9 100644 --- a/deploy/runtime/ui/PVWatts Advanced Inputs.json +++ b/deploy/runtime/ui/PVWatts Advanced Inputs.json @@ -49,11 +49,11 @@ }, "X": { "Type": 3.0, - "Integer": 66.0 + "Integer": 60.0 }, "Y": { "Type": 3.0, - "Integer": 528.0 + "Integer": 555.0 }, "Width": { "Type": 3.0, @@ -114,7 +114,7 @@ }, "Y": { "Type": 3.0, - "Integer": 318.0 + "Integer": 354.0 }, "Width": { "Type": 3.0, @@ -151,7 +151,7 @@ }, "Y": { "Type": 3.0, - "Integer": 420.0 + "Integer": 450.0 }, "Width": { "Type": 3.0, @@ -192,7 +192,7 @@ }, "Y": { "Type": 3.0, - "Integer": 87.0 + "Integer": 102.0 }, "Width": { "Type": 3.0, @@ -254,7 +254,7 @@ }, "Y": { "Type": 3.0, - "Integer": 420.0 + "Integer": 450.0 }, "Width": { "Type": 3.0, @@ -362,11 +362,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 504.0 }, "Width": { "Type": 3.0, @@ -416,7 +416,7 @@ }, "Y": { "Type": 3.0, - "Integer": 135.0 + "Integer": 159.0 }, "Width": { "Type": 3.0, @@ -466,7 +466,7 @@ }, "Y": { "Type": 3.0, - "Integer": 255.0 + "Integer": 273.0 }, "Width": { "Type": 3.0, @@ -524,7 +524,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 48.0 }, "Tool Tip": { "Type": 5.0, @@ -578,7 +578,7 @@ }, "Y": { "Type": 3.0, - "Integer": 279.0 + "Integer": 300.0 }, "Width": { "Type": 3.0, @@ -586,7 +586,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 48.0 }, "Tool Tip": { "Type": 5.0, @@ -640,7 +640,7 @@ }, "Y": { "Type": 3.0, - "Integer": 381.0 + "Integer": 405.0 }, "Width": { "Type": 3.0, @@ -648,7 +648,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 45.0 }, "Tool Tip": { "Type": 5.0, @@ -702,7 +702,7 @@ }, "Y": { "Type": 3.0, - "Integer": 156.0 + "Integer": 180.0 }, "Width": { "Type": 3.0, @@ -710,7 +710,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 51.0 }, "Tool Tip": { "Type": 5.0, @@ -760,11 +760,11 @@ }, "X": { "Type": 3.0, - "Integer": 24.0 + "Integer": 27.0 }, "Y": { "Type": 3.0, - "Integer": 501.0 + "Integer": 522.0 }, "Width": { "Type": 3.0, @@ -826,7 +826,7 @@ }, "Y": { "Type": 3.0, - "Integer": 318.0 + "Integer": 354.0 }, "Width": { "Type": 3.0, @@ -867,7 +867,7 @@ }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 234.0 }, "Width": { "Type": 3.0, @@ -904,7 +904,7 @@ }, "Y": { "Type": 3.0, - "Integer": 87.0 + "Integer": 102.0 }, "Width": { "Type": 3.0, @@ -953,7 +953,7 @@ }, "Y": { "Type": 3.0, - "Integer": 87.0 + "Integer": 102.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Physical Trough Dispatch Control.json b/deploy/runtime/ui/Physical Trough Dispatch Control.json index a0ffe359c..b373eeb24 100644 --- a/deploy/runtime/ui/Physical Trough Dispatch Control.json +++ b/deploy/runtime/ui/Physical Trough Dispatch Control.json @@ -148,7 +148,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 39.0 }, "Tool Tip": { "Type": 5.0, @@ -239,7 +239,7 @@ }, "Y": { "Type": 3.0, - "Integer": 132.0 + "Integer": 144.0 }, "Width": { "Type": 3.0, @@ -276,7 +276,7 @@ }, "Y": { "Type": 3.0, - "Integer": 435.0 + "Integer": 447.0 }, "Width": { "Type": 3.0, @@ -3211,7 +3211,7 @@ }, "Y": { "Type": 3.0, - "Integer": 153.0 + "Integer": 165.0 }, "Width": { "Type": 3.0, @@ -3256,7 +3256,7 @@ }, "Y": { "Type": 3.0, - "Integer": 456.0 + "Integer": 468.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Physical Trough IPH Dispatch Control.json b/deploy/runtime/ui/Physical Trough IPH Dispatch Control.json index 24129b904..87f15795e 100644 --- a/deploy/runtime/ui/Physical Trough IPH Dispatch Control.json +++ b/deploy/runtime/ui/Physical Trough IPH Dispatch Control.json @@ -1,7 +1,7 @@ { "Name": "Physical Trough IPH Dispatch Control", - "Width": 844.0, - "Height": 719.0, + "Width": 843.0, + "Height": 731.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -86,7 +86,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 39.0 }, "Tool Tip": { "Type": 5.0, @@ -148,7 +148,7 @@ }, "Height": { "Type": 3.0, - "Integer": 713.0 + "Integer": 731.0 }, "Tool Tip": { "Type": 5.0, @@ -177,7 +177,7 @@ }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 120.0 }, "Width": { "Type": 3.0, @@ -214,7 +214,7 @@ }, "Y": { "Type": 3.0, - "Integer": 402.0 + "Integer": 423.0 }, "Width": { "Type": 3.0, @@ -953,7 +953,7 @@ }, "Width": { "Type": 3.0, - "Integer": 286.0 + "Integer": 382.0 }, "Height": { "Type": 3.0, @@ -1782,7 +1782,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 141.0 }, "Width": { "Type": 3.0, @@ -1827,7 +1827,7 @@ }, "Y": { "Type": 3.0, - "Integer": 423.0 + "Integer": 444.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Physical Trough IPH System Control.json b/deploy/runtime/ui/Physical Trough IPH System Control.json index dbdd2e259..bf6f380fc 100644 --- a/deploy/runtime/ui/Physical Trough IPH System Control.json +++ b/deploy/runtime/ui/Physical Trough IPH System Control.json @@ -1354,7 +1354,7 @@ }, "X": { "Type": 3.0, - "Integer": 234.0 + "Integer": 267.0 }, "Y": { "Type": 3.0, @@ -1437,7 +1437,7 @@ }, "X": { "Type": 3.0, - "Integer": 234.0 + "Integer": 267.0 }, "Y": { "Type": 3.0, @@ -1852,7 +1852,7 @@ }, "X": { "Type": 3.0, - "Integer": 300.0 + "Integer": 336.0 }, "Y": { "Type": 3.0, @@ -2112,7 +2112,7 @@ }, "X": { "Type": 3.0, - "Integer": 234.0 + "Integer": 267.0 }, "Y": { "Type": 3.0, @@ -2195,7 +2195,7 @@ }, "X": { "Type": 3.0, - "Integer": 234.0 + "Integer": 267.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Physical Trough IPH System Design.json b/deploy/runtime/ui/Physical Trough IPH System Design.json index b9a8d16fe..cca912d79 100644 --- a/deploy/runtime/ui/Physical Trough IPH System Design.json +++ b/deploy/runtime/ui/Physical Trough IPH System Design.json @@ -12,7 +12,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 315.0 }, "Y": { "Type": 3.0, @@ -95,11 +95,11 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 315.0 }, "Y": { "Type": 3.0, - "Integer": 231.0 + "Integer": 234.0 }, "Width": { "Type": 3.0, @@ -261,7 +261,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 315.0 }, "Y": { "Type": 3.0, @@ -427,7 +427,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 315.0 }, "Y": { "Type": 3.0, @@ -510,7 +510,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 315.0 }, "Y": { "Type": 3.0, @@ -1215,7 +1215,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 315.0 }, "Y": { "Type": 3.0, @@ -2169,7 +2169,7 @@ }, "X": { "Type": 3.0, - "Integer": 258.0 + "Integer": 303.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Physical Trough System Design.json b/deploy/runtime/ui/Physical Trough System Design.json index f63b9b088..f4287f888 100644 --- a/deploy/runtime/ui/Physical Trough System Design.json +++ b/deploy/runtime/ui/Physical Trough System Design.json @@ -12,7 +12,7 @@ }, "X": { "Type": 3.0, - "Integer": 280.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, @@ -95,7 +95,7 @@ }, "X": { "Type": 3.0, - "Integer": 280.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, @@ -261,7 +261,7 @@ }, "X": { "Type": 3.0, - "Integer": 280.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, @@ -344,7 +344,7 @@ }, "X": { "Type": 3.0, - "Integer": 760.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -427,7 +427,7 @@ }, "X": { "Type": 3.0, - "Integer": 280.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, @@ -510,7 +510,7 @@ }, "X": { "Type": 3.0, - "Integer": 280.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, @@ -593,7 +593,7 @@ }, "X": { "Type": 3.0, - "Integer": 760.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -676,7 +676,7 @@ }, "X": { "Type": 3.0, - "Integer": 760.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -759,7 +759,7 @@ }, "X": { "Type": 3.0, - "Integer": 760.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -842,7 +842,7 @@ }, "X": { "Type": 3.0, - "Integer": 280.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, @@ -1248,7 +1248,7 @@ }, "X": { "Type": 3.0, - "Integer": 760.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, @@ -1580,7 +1580,7 @@ }, "X": { "Type": 3.0, - "Integer": 760.0 + "Integer": 771.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Sandia PV Array Performance Model with Module Database.json b/deploy/runtime/ui/Sandia PV Array Performance Model with Module Database.json index 60b7105bd..eefbc88cd 100644 --- a/deploy/runtime/ui/Sandia PV Array Performance Model with Module Database.json +++ b/deploy/runtime/ui/Sandia PV Array Performance Model with Module Database.json @@ -1,7 +1,7 @@ { "Name": "Sandia PV Array Performance Model with Module Database", - "Width": 1017.0, - "Height": 778.0, + "Width": 1019.0, + "Height": 827.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 158.0 + "Integer": 179.0 }, "Tool Tip": { "Type": 5.0, @@ -428,7 +428,7 @@ }, "Height": { "Type": 3.0, - "Integer": 51.0 + "Integer": 69.0 }, "Tool Tip": { "Type": 5.0, @@ -614,7 +614,7 @@ }, "Height": { "Type": 3.0, - "Integer": 329.0 + "Integer": 347.0 }, "Tool Tip": { "Type": 5.0, @@ -693,7 +693,7 @@ }, "Y": { "Type": 3.0, - "Integer": 690.0 + "Integer": 711.0 }, "Width": { "Type": 3.0, @@ -3368,7 +3368,7 @@ }, "Y": { "Type": 3.0, - "Integer": 717.0 + "Integer": 738.0 }, "Width": { "Type": 3.0, @@ -3534,7 +3534,7 @@ }, "Y": { "Type": 3.0, - "Integer": 702.0 + "Integer": 723.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Solar Resource Information.json b/deploy/runtime/ui/Solar Resource Information.json index 4c552405e..9162b891b 100644 --- a/deploy/runtime/ui/Solar Resource Information.json +++ b/deploy/runtime/ui/Solar Resource Information.json @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 387.0 + "Integer": 399.0 }, "Width": { "Type": 3.0, @@ -348,7 +348,7 @@ }, "Y": { "Type": 3.0, - "Integer": 360.0 + "Integer": 372.0 }, "Width": { "Type": 3.0, @@ -431,7 +431,7 @@ }, "Y": { "Type": 3.0, - "Integer": 333.0 + "Integer": 345.0 }, "Width": { "Type": 3.0, @@ -1223,7 +1223,7 @@ }, "Height": { "Type": 3.0, - "Integer": 28.0 + "Integer": 43.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Solar Resource Library.json b/deploy/runtime/ui/Solar Resource Library.json index 4f89eddce..621c95b74 100644 --- a/deploy/runtime/ui/Solar Resource Library.json +++ b/deploy/runtime/ui/Solar Resource Library.json @@ -1,7 +1,7 @@ { "Name": "Solar Resource Library", "Width": 882.0, - "Height": 534.0, + "Height": 556.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 525.0 + "Integer": 543.0 }, "Tool Tip": { "Type": 5.0, @@ -90,7 +90,7 @@ }, "Y": { "Type": 3.0, - "Integer": 495.0 + "Integer": 513.0 }, "Width": { "Type": 3.0, @@ -172,7 +172,7 @@ }, "Height": { "Type": 3.0, - "Integer": 28.0 + "Integer": 37.0 }, "Tool Tip": { "Type": 5.0, @@ -455,7 +455,7 @@ }, "Height": { "Type": 3.0, - "Integer": 28.0 + "Integer": 40.0 }, "Tool Tip": { "Type": 5.0, @@ -626,11 +626,11 @@ }, "X": { "Type": 3.0, - "Integer": 15.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 108.0 + "Integer": 117.0 }, "Width": { "Type": 3.0, @@ -667,7 +667,7 @@ }, "Y": { "Type": 3.0, - "Integer": 495.0 + "Integer": 513.0 }, "Width": { "Type": 3.0, @@ -708,7 +708,7 @@ }, "Y": { "Type": 3.0, - "Integer": 495.0 + "Integer": 513.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Standalone Battery Costs.json b/deploy/runtime/ui/Standalone Battery Costs.json index dacde20ed..bd2f8f155 100644 --- a/deploy/runtime/ui/Standalone Battery Costs.json +++ b/deploy/runtime/ui/Standalone Battery Costs.json @@ -707,7 +707,7 @@ }, "Caption": { "Type": 5.0, - "String": "grpTotalInstalledCost" + "String": "Total Installed Cost" }, "Bold": { "Type": 2.0, diff --git a/deploy/runtime/ui/TES Common.json b/deploy/runtime/ui/TES Common.json index ddf3d3450..4f82e2cc5 100644 --- a/deploy/runtime/ui/TES Common.json +++ b/deploy/runtime/ui/TES Common.json @@ -1302,7 +1302,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 108.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/TES Pressurized Water Cylinder with Piston Separator.json b/deploy/runtime/ui/TES Pressurized Water Cylinder with Piston Separator.json index 68490203b..6f437c9dd 100644 --- a/deploy/runtime/ui/TES Pressurized Water Cylinder with Piston Separator.json +++ b/deploy/runtime/ui/TES Pressurized Water Cylinder with Piston Separator.json @@ -57,7 +57,7 @@ }, "Width": { "Type": 3.0, - "Integer": 312.0 + "Integer": 363.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/Thermal Rate IPH.json b/deploy/runtime/ui/Thermal Rate IPH.json index 24c809e79..5dfe0dac2 100644 --- a/deploy/runtime/ui/Thermal Rate IPH.json +++ b/deploy/runtime/ui/Thermal Rate IPH.json @@ -273,7 +273,7 @@ }, "X": { "Type": 3.0, - "Integer": 243.0 + "Integer": 270.0 }, "Y": { "Type": 3.0, @@ -364,7 +364,7 @@ }, "Width": { "Type": 3.0, - "Integer": 129.0 + "Integer": 162.0 }, "Height": { "Type": 3.0, @@ -488,7 +488,7 @@ }, "X": { "Type": 3.0, - "Integer": 243.0 + "Integer": 270.0 }, "Y": { "Type": 3.0, @@ -578,7 +578,7 @@ }, "X": { "Type": 3.0, - "Integer": 243.0 + "Integer": 270.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Tower SolarPilot Capital Costs.json b/deploy/runtime/ui/Tower SolarPilot Capital Costs.json index a7ac603dd..c3196600d 100644 --- a/deploy/runtime/ui/Tower SolarPilot Capital Costs.json +++ b/deploy/runtime/ui/Tower SolarPilot Capital Costs.json @@ -495,7 +495,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -578,7 +578,7 @@ }, "X": { "Type": 3.0, - "Integer": 417.0 + "Integer": 441.0 }, "Y": { "Type": 3.0, @@ -661,7 +661,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -744,7 +744,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -827,7 +827,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -1325,7 +1325,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -1408,7 +1408,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -1657,7 +1657,7 @@ }, "X": { "Type": 3.0, - "Integer": 477.0 + "Integer": 498.0 }, "Y": { "Type": 3.0, @@ -2072,7 +2072,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -2155,7 +2155,7 @@ }, "X": { "Type": 3.0, - "Integer": 141.0 + "Integer": 147.0 }, "Y": { "Type": 3.0, @@ -2238,7 +2238,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -2570,7 +2570,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -2653,7 +2653,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -2902,7 +2902,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -2985,7 +2985,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -3068,7 +3068,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -3151,7 +3151,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -3234,7 +3234,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -3812,7 +3812,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -3862,7 +3862,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -3912,7 +3912,7 @@ }, "X": { "Type": 3.0, - "Integer": 303.0 + "Integer": 327.0 }, "Y": { "Type": 3.0, @@ -4186,7 +4186,7 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 504.0 }, "Y": { "Type": 3.0, @@ -4248,7 +4248,7 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 504.0 }, "Y": { "Type": 3.0, @@ -4310,7 +4310,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -4476,7 +4476,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -4559,7 +4559,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -4642,7 +4642,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -4808,7 +4808,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -4891,7 +4891,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -4974,7 +4974,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, @@ -5223,7 +5223,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -5306,7 +5306,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 477.0 }, "Y": { "Type": 3.0, @@ -5389,7 +5389,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 666.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Tower SolarPilot Solar Field.json b/deploy/runtime/ui/Tower SolarPilot Solar Field.json index c409037d7..82d97c4d5 100644 --- a/deploy/runtime/ui/Tower SolarPilot Solar Field.json +++ b/deploy/runtime/ui/Tower SolarPilot Solar Field.json @@ -1,7 +1,7 @@ { "Name": "Tower SolarPilot Solar Field", - "Width": 855.0, - "Height": 1188.0, + "Width": 856.0, + "Height": 1215.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -1560,7 +1560,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1101.0 + "Integer": 1122.0 }, "Width": { "Type": 3.0, @@ -2789,7 +2789,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1080.0 + "Integer": 1101.0 }, "Width": { "Type": 3.0, @@ -2835,11 +2835,11 @@ }, "X": { "Type": 3.0, - "Integer": 393.0 + "Integer": 396.0 }, "Y": { "Type": 3.0, - "Integer": 1074.0 + "Integer": 1092.0 }, "Width": { "Type": 3.0, @@ -2889,7 +2889,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1080.0 + "Integer": 1101.0 }, "Width": { "Type": 3.0, @@ -2993,7 +2993,7 @@ }, "Width": { "Type": 3.0, - "Integer": 300.0 + "Integer": 336.0 }, "Height": { "Type": 3.0, @@ -3047,7 +3047,7 @@ }, "Height": { "Type": 3.0, - "Integer": 180.0 + "Integer": 201.0 }, "Tool Tip": { "Type": 5.0, @@ -3121,7 +3121,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 45.0 }, "Tool Tip": { "Type": 5.0, @@ -3183,7 +3183,7 @@ }, "Height": { "Type": 3.0, - "Integer": 36.0 + "Integer": 63.0 }, "Tool Tip": { "Type": 5.0, @@ -3689,7 +3689,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1101.0 + "Integer": 1122.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/User Defined Power Cycle.json b/deploy/runtime/ui/User Defined Power Cycle.json index c985f57e7..0e16adc35 100644 --- a/deploy/runtime/ui/User Defined Power Cycle.json +++ b/deploy/runtime/ui/User Defined Power Cycle.json @@ -3097,7 +3097,7 @@ }, "Width": { "Type": 3.0, - "Integer": 363.0 + "Integer": 483.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/User-Defined Power Cycle.json b/deploy/runtime/ui/User-Defined Power Cycle.json index 2e72e2411..d2f33e418 100644 --- a/deploy/runtime/ui/User-Defined Power Cycle.json +++ b/deploy/runtime/ui/User-Defined Power Cycle.json @@ -3097,7 +3097,7 @@ }, "Width": { "Type": 3.0, - "Integer": 363.0 + "Integer": 507.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/Utility Rate - Billing Demand.json b/deploy/runtime/ui/Utility Rate - Billing Demand.json index ba14b4a82..a3b371765 100644 --- a/deploy/runtime/ui/Utility Rate - Billing Demand.json +++ b/deploy/runtime/ui/Utility Rate - Billing Demand.json @@ -489,7 +489,7 @@ }, "X": { "Type": 3.0, - "Integer": 165.0 + "Integer": 183.0 }, "Y": { "Type": 3.0, @@ -572,7 +572,7 @@ }, "X": { "Type": 3.0, - "Integer": 165.0 + "Integer": 183.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Utility Rate - Flat.json b/deploy/runtime/ui/Utility Rate - Flat.json index 7f7c9c839..ca457d465 100644 --- a/deploy/runtime/ui/Utility Rate - Flat.json +++ b/deploy/runtime/ui/Utility Rate - Flat.json @@ -1,7 +1,7 @@ { "Name": "Utility Rate - Flat", - "Width": 1413.0, - "Height": 567.0, + "Width": 1418.0, + "Height": 622.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 492.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, @@ -127,7 +127,7 @@ }, "Y": { "Type": 3.0, - "Integer": 441.0 + "Integer": 477.0 }, "Width": { "Type": 3.0, @@ -172,7 +172,7 @@ }, "Height": { "Type": 3.0, - "Integer": 225.0 + "Integer": 267.0 }, "Tool Tip": { "Type": 5.0, @@ -201,7 +201,7 @@ }, "Y": { "Type": 3.0, - "Integer": 441.0 + "Integer": 477.0 }, "Width": { "Type": 3.0, @@ -238,7 +238,7 @@ }, "Y": { "Type": 3.0, - "Integer": 492.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, @@ -477,11 +477,11 @@ }, "Width": { "Type": 3.0, - "Integer": 622.0 + "Integer": 583.0 }, "Height": { "Type": 3.0, - "Integer": 58.0 + "Integer": 91.0 }, "Tool Tip": { "Type": 5.0, @@ -539,7 +539,7 @@ }, "Width": { "Type": 3.0, - "Integer": 737.0 + "Integer": 950.0 }, "Height": { "Type": 3.0, @@ -597,7 +597,7 @@ }, "Y": { "Type": 3.0, - "Integer": 465.0 + "Integer": 501.0 }, "Width": { "Type": 3.0, @@ -650,7 +650,7 @@ }, "Y": { "Type": 3.0, - "Integer": 531.0 + "Integer": 567.0 }, "Width": { "Type": 3.0, @@ -729,7 +729,7 @@ }, "X": { "Type": 3.0, - "Integer": 657.0 + "Integer": 618.0 }, "Y": { "Type": 3.0, @@ -737,7 +737,7 @@ }, "Width": { "Type": 3.0, - "Integer": 348.0 + "Integer": 378.0 }, "Height": { "Type": 3.0, @@ -770,7 +770,7 @@ }, "X": { "Type": 3.0, - "Integer": 657.0 + "Integer": 618.0 }, "Y": { "Type": 3.0, @@ -778,7 +778,7 @@ }, "Width": { "Type": 3.0, - "Integer": 348.0 + "Integer": 378.0 }, "Height": { "Type": 3.0, @@ -864,7 +864,7 @@ }, "Y": { "Type": 3.0, - "Integer": 456.0 + "Integer": 492.0 }, "Width": { "Type": 3.0, @@ -947,7 +947,7 @@ }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 540.0 }, "Width": { "Type": 3.0, @@ -1034,7 +1034,7 @@ }, "Width": { "Type": 3.0, - "Integer": 391.0 + "Integer": 390.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/Wind Resource File.json b/deploy/runtime/ui/Wind Resource File.json index 628da0186..41861e21c 100644 --- a/deploy/runtime/ui/Wind Resource File.json +++ b/deploy/runtime/ui/Wind Resource File.json @@ -49,11 +49,11 @@ }, "X": { "Type": 3.0, - "Integer": 546.0 + "Integer": 594.0 }, "Y": { "Type": 3.0, - "Integer": 339.0 + "Integer": 366.0 }, "Width": { "Type": 3.0, @@ -646,7 +646,7 @@ }, "Width": { "Type": 3.0, - "Integer": 425.0 + "Integer": 569.0 }, "Height": { "Type": 3.0,