various functional improvements & fixes

Author: istefanis

model/blockStateService.js

@@ -16,7 +16,14 @@ import {
 } from "./elementService.js";
 import { resetCanvas } from "../view/services/core/canvasService.js";
 import { resetElementRenderingService } from "../view/services/core/elementRenderingService.js";
-import { resetLineRenderingService } from "../view/services/core/lineRenderingService.js";
+import {
+  getLineViewsNumber,
+  resetLineRenderingService,
+} from "../view/services/core/lineRenderingService.js";
+
+const optimizeTopologyButton = document.getElementById(
+  "optimize-topology-button"
+);
 
 /**
  * Clear current block state
@@ -54,6 +61,8 @@ export const setBlockState = function (state) {
       getElementFromElementId(x[1])
     );
   });
+
+  optimizeTopologyButton.disabled = getLineViewsNumber() === 0 ? true : false;
 };
 
 /**

model/elementService.js

@@ -43,6 +43,13 @@ export const setElementIdForElement = function (elementId, element) {
   elementsMap.set(elementId, element);
 };
 
+/**
+ * Remove element
+ */
+export const removeElementWithElementId = function (elementId) {
+  elementsMap.delete(elementId);
+};
+
 /**
  * Reset the elementMap and elementId
  */
@@ -54,7 +61,7 @@ export const resetElementService = () => {
 /**
  * Delete element from block
  */
-export const deleteElement = function (element) {
+export const deleteElement = function (element, doNotStoreNewState) {
   disableHistoricalStateStorage();
   const block = element.getBlock();
   if (element.hasInput()) {
@@ -89,5 +96,7 @@ export const deleteElement = function (element) {
   }
 
   enableHistoricalStateStorage();
-  block.storeNewHistoricalState();
+  if (!doNotStoreNewState) {
+    block.storeNewHistoricalState();
+  }
 };

model/elements/block.js

@@ -19,6 +19,7 @@ import {
   storeNewHistoricalBlockState,
   clearBlockStateHistory,
 } from "../blockStateService.js";
+import { removeElementWithElementId } from "../elementService.js";
 
 /**
  * Circuit elements (tfs, adders and blocks) are implemented as objects, using the message-passing style
@@ -90,6 +91,7 @@ export class Block {
     this._iAmSimplified = false;
     this._blocks = this._blocks.filter((y) => y !== x);
     removeRenderedElement(x.getElementId());
+    removeElementWithElementId(x.getElementId());
     storeNewHistoricalBlockState.call(this);
   };
 
@@ -107,6 +109,7 @@ export class Block {
     this._iAmSimplified = false;
     this._tfs = this._tfs.filter((y) => y !== x);
     removeRenderedElement(x.getElementId());
+    removeElementWithElementId(x.getElementId());
     storeNewHistoricalBlockState.call(this);
   };
 
@@ -124,6 +127,7 @@ export class Block {
     this._iAmSimplified = false;
     this._adders = this._adders.filter((y) => y !== x);
     removeRenderedElement(x.getElementId());
+    removeElementWithElementId(x.getElementId());
     storeNewHistoricalBlockState.call(this);
   };
 

model/simplificationAlgorithms/mergeFeedbackLoop.js

@@ -193,15 +193,15 @@ const checkTfOutput = async function (tf, outputs) {
                 // tf step 2 - remove output to feedbackTf:
                 tf.removeOutput(feedbackTf);
 
+                // adder step 1 - remove feedbackTf input:
+                firstAdder.removeInput(feedbackTf);
+
                 // remove feedbackTf from tfs:
                 // this._internalRemoveFromTfs(feedbackTf);
                 feedbackTf.isBlock()
                   ? getBlock(feedbackTf).removeFromBlocks(feedbackTf)
                   : this._internalRemoveFromTfs(feedbackTf);
 
-                // adder step 1 - remove feedbackTf input:
-                firstAdder.removeInput(feedbackTf);
-
                 // adder step 2 - remove adder from adders, since it has no input or only one input left:
                 const previousBlock = firstAdder.getInput()[0];
                 // remove output from previous block to adder:
@@ -218,14 +218,14 @@ const checkTfOutput = async function (tf, outputs) {
                 // tf step 2 - remove output to feedbackTf:
                 tf.removeOutput(feedbackTf);
 
+                // adder step 1 - remove feedbackTf input:
+                firstAdder.removeInput(feedbackTf);
+
                 // remove feedbackTf from tfs:
                 // this._internalRemoveFromTfs(feedbackTf);
                 feedbackTf.isBlock()
                   ? getBlock(feedbackTf).removeFromBlocks(feedbackTf)
                   : this._internalRemoveFromTfs(feedbackTf);
-
-                // adder step 1 - remove feedbackTf input:
-                firstAdder.removeInput(feedbackTf);
               }
             } else {
               //case: has only one input
@@ -235,15 +235,15 @@ const checkTfOutput = async function (tf, outputs) {
               // tf step 2 - remove output to feedbackTf:
               tf.removeOutput(feedbackTf);
 
+              // adder step 1 - remove feedbackTf input:
+              firstAdder.removeInput(feedbackTf);
+
               // remove feedbackTf from tfs:
               // this._internalRemoveFromTfs(feedbackTf);
               feedbackTf.isBlock()
                 ? getBlock(feedbackTf).removeFromBlocks(feedbackTf)
                 : this._internalRemoveFromTfs(feedbackTf);
 
-              // adder step 1 - remove feedbackTf input:
-              firstAdder.removeInput(feedbackTf);
-
               // tf step 2 - remove output to adder:
               tf.setInput(null);
 

view/navbarView.js

@@ -18,7 +18,10 @@ import {
   deleteExpandedOrSelectedElements,
   toggleNewConnectionMode,
 } from "./services/core/elementSelectingAndDraggingService.js";
-import { renderAllLines } from "./services/core/lineRenderingService.js";
+import {
+  getLineViewsNumber,
+  renderAllLines,
+} from "./services/core/lineRenderingService.js";
 import { resetCanvas } from "./services/core/canvasService.js";
 import { closeElementAnalysisWindow } from "./elementAnalysisWindowView.js";
 import { openNewReadyMadeTfPopupWindow } from "./services/feature/readyMadeTfCreationService.js";
@@ -234,7 +237,9 @@ simplifyButton.addEventListener("click", async function (e) {
 
     simplificationStarted = false;
     simplifyButton.innerHTML = runButtonMarkup;
-    optimizeTopologyButton.disabled = false;
+    if (getLineViewsNumber() > 0) {
+      optimizeTopologyButton.disabled = false;
+    }
     previousButton.disabled = false;
     pauseButtonDisplayed = false;
     pauseButtonClicked = false;

view/services/core/elementSelectingAndDraggingService.js

@@ -97,16 +97,20 @@ export const resetExpandedOrSelectedElements = function () {
 
 export const deleteExpandedOrSelectedElements = function () {
   if (expandedElement) {
-    closeElementAnalysisWindow();
     const element = getElementFromElementId(+expandedElement.dataset.elementId);
+    closeElementAnalysisWindow();
     deleteElement(element);
     expandedElement = null;
     deleteButton.disabled = true;
   } else if (selectedElements.length !== 0) {
+    const block = getElementFromElementId(
+      +selectedElements[0].dataset.elementId
+    ).getBlock();
     selectedElements.forEach((x) => {
       const element = getElementFromElementId(+x.dataset.elementId);
-      deleteElement(element);
+      deleteElement(element, true);
     });
+    block.storeNewHistoricalState();
     selectedElements = [];
     deleteButton.disabled = true;
   }

view/services/core/lineRenderingService.js

@@ -14,10 +14,22 @@ import {
   enableLineDrawingStyle,
 } from "./canvasService.js";
 
+const optimizeTopologyButton = document.getElementById(
+  "optimize-topology-button"
+);
+
+/**
+ * Array storing all the lineViews
+ */
 let lineViews = [];
 
+export const getLineViewsNumber = () => lineViews.length;
+
 export const registerLineView = function (lineView) {
   lineViews.push(lineView);
+  if (lineViews.length === 1) {
+    optimizeTopologyButton.disabled = false;
+  }
 };
 
 export const resetLineRenderingService = function () {
@@ -39,6 +51,12 @@ export const removeLineRender = function (element1Id, element2Id) {
   lineViews = lineViews.filter(
     (x) => !x.isLineConnectingElements(element1Id, element2Id)
   );
+
+  //disable optimize topology button if there are no lines left
+  if (lineViews.length === 0) {
+    optimizeTopologyButton.disabled = true;
+  }
+
   renderAllLines();
 };