linny-r 1.9.3 → 2.0.1

package/static/linny-r.css

@@ -10,7 +10,7 @@ file that implements the graphical user interface for Linny-R.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -947,6 +947,157 @@ img.inline-cancel-btn {
   border-top: 1px solid Silver;
 }
 
+/* styles for the NEW POWER GRID dialog */
+#new-power-grid-modal {
+  z-index: 115; /* on top of the POWER GRIDS modal */
+}
+
+#new-power-grid-dlg {
+  width: 225px;
+  height: min-content;
+  max-height: 450px;
+}
+
+#new-power-grid-name {
+  width: 170px;
+}
+
+#new-power-grid-voltage {
+  width: 45px;
+}
+
+#new-power-grid-color {
+  display: inline-block;
+  width: 24px;
+  height: 22px;
+}
+
+#new-power-grid-unit {
+  font-size: 12px;
+  margin-left: 3px;
+}
+
+#new-power-grid-losses {
+  font-size: 12px;
+}
+
+/* styles for the POWER GRIDS dialog */
+#power-grids-modal {
+  z-index: 110; /* on top of the SETTINGS dialog */
+}
+
+#power-grids-dlg {
+  width: 280px;
+  height: min-content;
+  max-height: 250px;
+}
+
+#power-grids-buttons > img.btn {
+  height: 20px;
+  width: 20px;
+}
+
+#power-grids-scroll-area {
+  margin: 2px;
+  width: calc(100% - 4px);
+  max-height: 250px;
+  overflow-y: auto;
+  border-top: 1px solid Silver;
+}
+
+div.menu-plate,
+div.no-grid-plate,
+div.grid-kV-plate {
+  display: inline-block;
+  height: 17px;
+  min-width: 30px;
+  color: White;
+  text-shadow: 1px 1px 1px Black;  
+  background-color: #0000ff;
+  font-size: 9px;
+  text-align: center;
+  padding: 1px;
+  padding-bottom: 0px;
+  border-radius: 3px;
+  margin-right: 3px;
+}
+
+div.no-grid-plate {
+  color: Gray;
+  border: 1px solid Gray !important;
+  box-shadow: Gray 0px 0px 3px 1px inset;
+  margin: 1px !important;
+  padding: 0px !important;
+  text-shadow: none;
+  background-color: #f4f0f2 !important;
+  font-size: 10px;
+  height: 16px;
+  max-height: 17px !important;
+}
+
+div.menu-plate {
+  width: calc(100% - 4px);
+  margin: 1px;
+  border: 1px solid silver;
+  padding-top: 3px;
+  max-height: 14px;
+}
+
+div.menu-plate:hover {
+  border: 1px solid black;
+  box-shadow: black 0px 0px 1px 2px;
+}
+
+div.grid-watts {
+  display: inline-block;
+  vertical-align: middle;
+  height: 15px;
+  min-width: 18px;
+  color: gray;
+  border: 1px solid #b8b8b8;
+  background-color: #f0f0f0;
+  font-size: 9px;
+  text-align: center;
+  padding: 1px;
+  padding-bottom: 0px;
+  margin-right: 3px;  
+}
+
+div.grid-kcl-symbol {
+  display: inline-block;
+  height: 17px;
+  font-size: 19px;
+  color: #0000a0;
+  text-shadow: 0px 0px 2px #00c0f0;
+  margin-right: 3px;
+  vertical-align: top;
+}
+
+div.grid-loss-symbol {
+  background-color: #202020;
+  color: white;
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 12px;
+  padding-left: 2px;
+  padding-right: 2px;
+  border-radius: 3px;
+  margin-right: 3px;
+}
+
+table.power-flow th {
+  text-align: left;
+}
+
+table.power-flow td:not(:first-child) {
+  text-align: right;
+}
+
+table.power-flow th:not(:first-child) {
+  text-align: right;
+  min-width: 40px;
+}
+
 /* styles for the MODEL SETTINGS dialog */
 #settings-dlg {
   width: min-content;
@@ -967,6 +1118,17 @@ img.inline-cancel-btn {
   filter: brightness(200%);
 }
 
+#settings-power-btn {
+  margin-left: 0px;
+  margin-right: 7px;
+  margin-top: -3px;
+  cursor: pointer;
+}
+
+#settings-power-btn:hover {
+  filter: brightness(160%);
+}
+
 #password-dlg {
   width: min-content;
   height: min-content;
@@ -1208,7 +1370,7 @@ td.import {
 }
 
 td.export {
-  color: #0000b0;
+  color: #00000b;
 }
 
 /* styles for the SERVER dialog */
@@ -1460,6 +1622,78 @@ td.export {
   width: 65px;
 }
 
+#process-grid-plate {
+  position: absolute;
+  top: 191px;
+  left: 185px;
+  margin: 1px;
+  padding-top: 3px;
+  max-height: 14px;
+  cursor: pointer;
+}
+
+#process-grid-plate-menu {
+  position: absolute;
+  top: 191px;
+  left: 185px;
+  width: 33px;
+  cursor: pointer;
+}
+
+#process-grid-overlay {
+  position: absolute;
+  background-color: inherit;
+  top: 117px;
+  left: 1px;
+  width: calc(100% - 8px);
+  height: 66px;
+  padding: 3px;
+}
+
+#process-negated {
+  position: absolute;
+  top: -38px;
+  left: 0px;
+  height: 32px;
+}
+
+#process-negated-msg {
+  position: absolute;
+  top: -47px;
+  left: 92px;
+  max-height: 24px;
+  width: 210px;
+  padding: 5px;
+  font-style: italic;
+  color: #8050a0;
+  background-color: #f4f0f2;
+}
+
+#process-grid-msg {
+  padding-left: 6px;
+  font-style: italic;
+  color: #8050a0;
+}
+
+#process-length-div {
+  margin-top: 4px;
+}
+
+#process-length {
+  width: 30px;
+  margin-left: 2px;
+}
+
+#process-tex-id {
+  bottom: 3px;
+  position: absolute;
+  right: 3px;
+  width: 45px;
+  height: 14px !important;
+  font-size: 11px;
+  background: #ecd8ec;
+}
+
 /* styles for the PRODUCT properties dialog */
 #product-dlg {
   width: 360px;
@@ -1634,6 +1868,15 @@ td.export {
   width: 120px;
 }
 
+#product-tex-id {
+  bottom: 3px;
+  position: absolute;
+  left: 293px;
+  width: 45px;
+  height: 14px !important;
+  font-size: 11px;
+  background: #ecd8ec;
+}
 
 /* NOTE: actors, datasets and products have import/export toggle boxes */
 #actor-io {
@@ -2069,6 +2312,10 @@ div.menu-item:hover {
 }
 
 /* the BOUNDLINE POINT DIALOG allows entering precise coordinates */
+#boundline-point-modal {
+  z-index: 101;
+}
+
 #boundline-point-dlg {
   width: 200px;
   height: 67px;
@@ -2112,10 +2359,140 @@ div.menu-item:hover {
   left: 188px;
 }
 
+/* the BOUNDLINE DATA DIALOG allows entering series data for bound lines */
+#boundline-data-modal {
+  z-index: 101;
+}
+
+#boundline-data-dlg {
+  width: 330px;
+  height: 350px;
+  margin-left: calc(50vw + 170px);
+}
+
+#boundline-data-remote {
+  position: absolute;
+  top: 24px;
+  left: 2px;
+  width: calc(100% - 4px);
+}
+
+#boundline-data-clip {
+  height: 12px;
+  width: 12px;
+  vertical-align: middle;
+}
+
+#boundline-data-url {
+  width: calc(100% - 17px);
+  font-size: 12px;
+}
+
+#boundline-data-series-lbl {
+  position: absolute;
+  top: 47px;
+  left: 2px;
+}
+
+#boundline-data-edit-btn,
+#boundline-data-save-btn,
+#boundline-data-cancel-btn {
+  position: absolute;
+  top: 46px;
+  left: 65px;
+  width: 14px;
+  height: 14px;
+}
+
+#boundline-data-save-btn,
+#boundline-data-cancel-btn {
+  top: 48px;
+}
+
+#boundline-data-cancel-btn {
+  left: 82px;
+}
+
+#boundline-data-series,
+#boundline-data-series-area {
+  position: absolute;
+  top: 64px;
+  left: 3px;
+  width: calc(100% - 6px);
+  height: 120px;
+}
+
+#boundline-data-series-area {
+  overflow: auto;
+}
+
+#boundline-data-series-table {
+  border-top: 1px solid Silver
+}
+
+#boundline-data-series-table tr:first-child {
+  background-color: #e0e0e0;
+}
+
+td.bl-odnr {
+  text-align: right;
+  padding-left: 3px;
+  padding-right: 6px;
+  width: 1px;
+  color: #a05090;
+  font-weight: bold;  
+}
+
+td.bl-od {
+  width: 100%;
+  border-left: 1px solid silver;
+  padding-left: 6px;
+}
+
+span.grit {
+  color: #a05090;
+  font-style: italic;
+  margin-left: 8px;
+}
+
+#boundline-data-line {
+  position: absolute;
+  top: 52px;
+  right: 4px;
+  font-size: 10px;
+}
+
+#boundline-data-sel-titles {
+  position: absolute;
+  top: 189px;
+  left: 4px;
+}
+
+#boundline-data-sel-area {
+  position: absolute;
+  top: 205px;
+  left: 3px;
+  overflow: scroll;
+  width: calc(100% - 6px);
+  height: 120px;
+  border-top: 1px solid Silver;
+}
+
+#boundline-data-sel-buttons {
+  position: absolute;
+  bottom: 2px;
+  left: 2px;
+}
+
+#boundline-data-sel-buttons > img.btn {
+  height: 18px;
+  width: 18px;
+}
+
 /* NOTE: The following dialogs are not modal, but "stay-on-top",
          i.e., windows that remain open (until dismissed) and above
          the main window, and they are draggable and resizable.
-         The z-indices are lower (5-50) than those of modal dialogs. */
+         The z-indices are lower (5-95) than those of modal dialogs. */
 
 /* all resizable dialogs have a striped triangle at the bottom right */
 div.resizer {
@@ -2225,6 +2602,7 @@ div.io-box {
 }
 
 #scale-units-table,
+#power-grids-table,
 #dataset-table,
 #dataset-modif-table,
 #equation-table,
@@ -2237,6 +2615,8 @@ div.io-box {
 #finder-table,
 #finder-item-table,
 #finder-expression-table,
+#boundline-data-series-table,
+#boundline-data-sel-table,
 #restore-table {
   width: 100%;
   max-width: 100%;
@@ -2310,7 +2690,7 @@ div.io-box {
   top: 60px;
   left: calc(40% + 4px);
   width: calc(60% - 6px);
-  height: calc(100% - 122px);
+  height: calc(100% - 85px);
   overflow-y: auto;
   border-top: 1px solid Silver;
 }
@@ -2377,6 +2757,18 @@ div.modif::before {
   margin-right: 2px;
 }
 
+span.blpoints {
+  color: #8020a0;
+  text-shadow: #b9c 0.5px 0.5px;
+}
+
+span.blpoints::before {
+  content: ' \2234';
+  color: #b00080;
+  font-weight: bolder;
+  margin-right: 2px;  
+}
+
 div.outcome::before,
 span.outcome::before {
   content: ' \25C8';
@@ -2603,6 +2995,12 @@ td.equation-expression-multi {
   width: calc(100% - 6px);
 }
 
+/* NOTE: New and Rename modals must be above boundline data modal */
+#new-selector-modal,
+#rename-selector-modal {
+  z-index: 102;
+}
+
 #new-selector-dlg,
 #rename-selector-dlg {
   width: 215px;
@@ -2755,7 +3153,7 @@ td.equation-expression-multi {
 
 #series-clip {
   height: 12px;
-  width: 132x;
+  width: 12px;
   vertical-align: middle;
 }
 
@@ -3256,7 +3654,7 @@ img.v-disab {
 /* the SENSITIVITY DIALOG displays the sensitivity analysis */
 #sensitivity-dlg {
   display: none;
-  z-index: 15;
+  z-index: 20;
   margin: 0;
   width: 500px;
   height: 265px;
@@ -3296,7 +3694,7 @@ td.sa-ds-sel {
 }
 
 td.sa-ds-sel:hover {
-  text-decoration: underline solid #b00090;
+  text-decoration: underline solid #b00080;
   text-decoration-thickness: 1.5px;
 }
 
@@ -3541,7 +3939,7 @@ td.sa-not-run {
 /* the EXPERIMENT DIALOG displays the experiment manager */
 #experiment-dlg {
   display: none;
-  z-index: 20;
+  z-index: 25;
   margin: 0;
   width: 450px;
   height: 275px;
@@ -3755,6 +4153,7 @@ td.sa-not-run {
   margin-left: 2px;
   font-weight: 600;
   font-style: italic;
+  width: calc(100% - 120px);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -4836,6 +5235,53 @@ div.sel-tab {
   box-shadow: inset #bfc0e2 0 0 7px 2px; 
 }
 
+/* the TEX DIALOG displays mathematical formulas */
+#tex-dlg {
+  display: none;
+  z-index: 45;
+  margin: 0;
+  width: 300px;
+  height: 200px;
+  min-width: 250px;
+  min-height: 150px;
+  max-height: 99vh;
+  max-width: 99vw;
+}
+
+#tex-entity {
+  position: absolute;
+  left: 3px;
+  bottom: 2px;
+  width: calc(100% - 24px);
+  white-space: nowrap;
+}
+
+#tex-tabs {
+  width: calc(100% - 6px);
+}
+
+#tex-formula {
+  position: absolute;
+  left: 3px;
+  top: 43px;
+  padding: 6px;
+  width: calc(100% - 20px);
+  height: calc(100% - 73px);
+  border: 1px solid silver;
+  background-color: white;
+  overflow: scroll;
+}
+
+#tex-code {
+  position: absolute;
+  left: 3px;
+  top: 42px;
+  width: calc(100% - 6px);
+  height: calc(100% - 60px);
+  font: 12px monospace;
+  border: 1px solid Black;
+}
+
 /* the CHANNEL DIALOG configures and activates the receiver */
 #channel-dlg {
   width: 258px;
@@ -5096,6 +5542,10 @@ div.call-stack-expr {
 }
 
 /* the CHECK UPDATE modal asks for permission to update the software */
+#check-update-modal {
+  z-index: 150;
+}
+
 #check-update-dlg {
   width: 500px;
   height: min-content;

package/static/scripts/linny-r-ctrl.js

@@ -12,7 +12,7 @@ file all have their graphical extensions in file linny-r-gui.js.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -124,6 +124,7 @@ class Controller {
         decimal_comma: 'Use decimal comma',
         grid_pixels: 'Grid resolution',
         align_to_grid: 'Align to grid',
+        with_power_flow: 'Add power flow constraints',
         infer_cost_prices: 'Infer cost prices',
         show_block_arrows: 'Show block arrows',
         timeout_period: 'Solver time-out',
@@ -135,13 +136,14 @@ class Controller {
       ENTITY_PROPS: ['units', 'actors', 'clusters', 'processes', 'products',
         'datasets', 'equations', 'links', 'constraints'],
       UNIT_PROPS: ['multiplier', 'base_unit'],
-      ACTOR_PROPS: ['weight', 'comments'],
+      ACTOR_PROPS: ['weight', 'comments', 'TEX_id'],
       CLUSTER_PROPS: ['comments', 'collapsed', 'ignore'],
       PROCESS_PROPS: ['comments', 'lower_bound', 'upper_bound', 'initial_level',
-        'pace_expression', 'equal_bounds', 'level_to_zero', 'integer_level', 'collapsed'],
+        'pace_expression', 'equal_bounds', 'level_to_zero', 'integer_level',
+        'collapsed', 'TEX_id'],
       PRODUCT_PROPS: ['comments', 'lower_bound', 'upper_bound', 'initial_level',
         'scale_unit', 'equal_bounds', 'price', 'is_source', 'is_sink', 'is_buffer',
-        'is_data', 'integer_level', 'no_slack'],
+        'is_data', 'integer_level', 'no_slack', 'TEX_id'],
       DATASET_PROPS: ['comments', 'default_value', 'scale_unit', 'time_scale',
         'time_unit', 'method', 'periodic', 'array', 'url', 'default_selector'],
       LINK_PROPS: ['comments', 'multiplier', 'relative_rate', 'share_of_cost',

package/static/scripts/linny-r-gui-actor-manager.js

@@ -11,7 +11,7 @@ functionality for the Linny-R Actor Manager dialog.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal