UI fixes 2024 (#1926)

* initial MSPT fixes * IPH UI fixes * UI fixes for Linux * IPH MSLF UI fixes * Revert to ^2 and ^3 to be consistent with ^4 * fixes for mac (#1929) Co-authored-by: Paul Gilman <[email protected]> * Remove unused UI form for IPH electricity purchases --------- Co-authored-by: Darice L Guittet <[email protected]> Co-authored-by: Brian Mirletz <[email protected]>
NREL · Dec 9, 2024 · 137893c · 137893c
1 parent 26e1192
commit 137893c
Show file tree

Hide file tree

Showing 35 changed files with 822 additions and 1,028 deletions.
diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk
@@ -1985,7 +1985,6 @@ setmodules(['mspt_iph', 'utilityrate5', 'singleowner_heat']);
 setup_MSPT_IPH_pages();
 setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR);
 addpage( [['MSPT IPH Capital Costs' ]],{ 'sidebar'='Installation Costs', 'help'='cc_tower' } );
-//addpage([['Electricity Purchases Heat Model','Operating Costs']], {'sidebar' = 'Operating Costs', 'help'='oc_operating'} );
 addpage([['Operating Costs IPH']], {'sidebar' = 'Operating Costs', 'help'='oc_operating'} );
 addpage( [[ 'Utility Rate - Flat',
 			    { 'name'='Utility Rate - Description', 'caption'='Description and Applicability', 'collapsible'=true, 'collapsible_var'='ur_desc_is_shown', 'collapsed_by_default'=true },

diff --git a/deploy/runtime/ui/Battery Thermal.json b/deploy/runtime/ui/Battery Thermal.json
@@ -53,7 +53,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 102.0
+                    "Integer": 96.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -136,7 +136,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 129.0
+                    "Integer": 123.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -679,15 +679,15 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 156.0
+                    "Integer": 150.0
                 },
                 "Width": {
                     "Type": 3.0,
                     "Integer": 249.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 24.0
+                    "Integer": 28.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,

diff --git a/deploy/runtime/ui/Custom Generation Plant.json b/deploy/runtime/ui/Custom Generation Plant.json
@@ -24,7 +24,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 437.0
+                    "Integer": 440.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -308,7 +308,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 411.0
+                    "Integer": 414.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1338,7 +1338,7 @@
             "IndexLabels": "",
             "Flags": 0.0,
             "DefaultValue": 0.0,
-            "UIObject": "",
+            "UIObject": "LossAdjustment",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -1554,7 +1554,7 @@
             "IndexLabels": "",
             "Flags": 0.0,
             "DefaultValue": 0.0,
-            "UIObject": "Default",
+            "UIObject": "Numeric",
             "sscVariableName": "",
             "sscVariableValue": ""
         },

diff --git a/deploy/runtime/ui/Electricity Purchases Heat Model.json b/deploy/runtime/ui/Electricity Purchases Heat Model.json
diff --git a/deploy/runtime/ui/Financial DSIRE Download.json b/deploy/runtime/ui/Financial DSIRE Download.json
@@ -57,11 +57,11 @@
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 110.0
+                    "Integer": 130.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 28.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,

diff --git a/deploy/runtime/ui/Financial Depreciation Simple.json b/deploy/runtime/ui/Financial Depreciation Simple.json
@@ -363,7 +363,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 120.0
+                    "Integer": 123.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -425,7 +425,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 120.0
+                    "Integer": 123.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -487,15 +487,15 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 120.0
+                    "Integer": 123.0
                 },
                 "Width": {
                     "Type": 3.0,
                     "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 28.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -672,15 +672,15 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 120.0
+                    "Integer": 123.0
                 },
                 "Width": {
                     "Type": 3.0,
                     "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 28.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,