diff --git a/ignored/ad b/ignored/ad
deleted file mode 100644
index 1c19624..0000000
--- a/ignored/ad
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ignored/complex_encapsulation.xml b/ignored/complex_encapsulation.xml
deleted file mode 100644
index 6525147..0000000
--- a/ignored/complex_encapsulation.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ignored/connection b/ignored/connection
deleted file mode 100644
index 3e4b4e5..0000000
--- a/ignored/connection
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ignored/hereSave b/ignored/hereSave
deleted file mode 100644
index a6935d3..0000000
--- a/ignored/hereSave
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/ignored/import-multiple-units.cellml b/ignored/import-multiple-units.cellml
deleted file mode 100644
index d505e4a..0000000
--- a/ignored/import-multiple-units.cellml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/ignored/localmath.xml b/ignored/localmath.xml
deleted file mode 100644
index fd68161..0000000
--- a/ignored/localmath.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/ignored/logistic-model-of-bacterial-growth.cellml b/ignored/logistic-model-of-bacterial-growth.cellml
deleted file mode 100644
index 3a2b35d..0000000
--- a/ignored/logistic-model-of-bacterial-growth.cellml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ignored/out.html b/ignored/out.html
deleted file mode 100644
index e69de29..0000000
diff --git a/ignored/presentation b/ignored/presentation
deleted file mode 100644
index 7b4e3c2..0000000
--- a/ignored/presentation
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/ignored/raw-edit.cellml b/ignored/raw-edit.cellml
deleted file mode 100644
index 316be24..0000000
--- a/ignored/raw-edit.cellml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/ignored/reset-incl.cellml b/ignored/reset-incl.cellml
deleted file mode 100644
index f30ffdb..0000000
--- a/ignored/reset-incl.cellml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ignored/test b/ignored/test
deleted file mode 100644
index c9b9c1c..0000000
--- a/ignored/test
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/ignored/van-der-pol-oscillator.cellml b/ignored/van-der-pol-oscillator.cellml
deleted file mode 100644
index 0e8621d..0000000
--- a/ignored/van-der-pol-oscillator.cellml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/package.json b/package.json
index 684cfc7..d00e202 100644
--- a/package.json
+++ b/package.json
@@ -119,9 +119,9 @@
"mathjax3-react": "^1.0.11",
"mini-css-extract-plugin": "^1.6.0",
"module-alias": "^2.2.2",
- "monaco-editor": "^0.25.2",
"node": "^16.6.0",
"notistack": "^1.0.10",
+ "monaco-editor": "^0.25.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-pdf": "^5.3.0",
@@ -131,10 +131,10 @@
"sass-loader": "^12.1.0",
"selenium-webdriver": "^4.0.0-beta.4",
"tar": "^6.1.6",
+ "xmldom": "^0.6.0",
"trim-newlines": "^4.0.2",
"webpack-shell-plugin": "^0.5.0",
"xml-js": "^1.6.11",
- "xmldom": "^0.6.0",
"yup": "^0.32.9"
}
}
diff --git a/src/backend/FileManagement.ts b/src/backend/FileManagement.ts
index f9591a1..1a59b44 100644
--- a/src/backend/FileManagement.ts
+++ b/src/backend/FileManagement.ts
@@ -1,4 +1,4 @@
-99; /* eslint-disable no-case-declarations */
+/* eslint-disable no-case-declarations */
import { ipcMain, BrowserWindow, IpcMainEvent } from "electron";
import { convertSelectedElement } from "./converter/convertElement";
import { Elements, elmToStr } from "../types/Elements";
@@ -31,11 +31,6 @@ const fs = require("fs");
declare const MAIN_WINDOW_WEBPACK_ENTRY: string;
-// const libcellModule = require("libcellml.js/libcellml.common");
-
-// import libCellMLModule from "./mainLibcellml/libcellml.js";
-// import libCellMLWasm from "./mainLibcellml/libcellml.wasm";
-
import { IProperties } from "../types/IProperties";
import { IssueDescriptor } from "../frontend/sidebar/issues/Issue";
import {
@@ -281,36 +276,33 @@ export default class FileManagement {
await this.saveFile();
event.reply("receive-filename", this._model.getFile());
}
+ // const type = this._model.getType();
+ // if (type === Elements.model) return;
+ // const cur = this._model.getCurrent();
+ // const parent = cur.parent();
+ // console.log("To Parent");
+ // console.log("From " + elmToStr(type));
+ // let newType = Elements.component;
+ // switch (type) {
+ // case Elements.component:
+ // if (
+ // this._processor.matchElement(
+ // parent as EditorElement,
+ // Elements.model
+ // )
+ // ) {
+ // newType = Elements.model;
+ // }
+ // break;
+ // case Elements.units:
+ // newType = Elements.model;
+ // break;
+ // }
+ // this._model.setCurrent(parent as EditorElement, newType);
+ // const selection = this.getCurrentAsSelection();
+ // event.reply("res-select-element", selection);
);
- ipcMain.on("to-parent", async (event: IpcMainEvent) => {
- const type = this._model.getType();
- if (type === Elements.model) return;
- const cur = this._model.getCurrent();
- const parent = cur.parent();
- console.log("To Parent");
- console.log("From " + elmToStr(type));
- let newType = Elements.component;
- switch (type) {
- case Elements.component:
- if (
- this._processor.matchElement(
- parent as EditorElement,
- Elements.model
- )
- ) {
- newType = Elements.model;
- }
- break;
- case Elements.units:
- newType = Elements.model;
- break;
- }
- this._model.setCurrent(parent as EditorElement, newType);
- const selection = this.getCurrentAsSelection();
- event.reply("res-select-element", selection);
- });
-
// Used in Spatial view
// Assume starting valid
ipcMain.on(
diff --git a/src/backend/converter/convertElement.ts b/src/backend/converter/convertElement.ts
index a44736b..5968923 100644
--- a/src/backend/converter/convertElement.ts
+++ b/src/backend/converter/convertElement.ts
@@ -12,6 +12,7 @@ import { convertComponent } from "./convertComponent";
import { convertModel } from "./convertModel";
import { convertReset } from "./convertReset";
import { convertUnits } from "./convertUnits";
+
import { convertVariable } from "./convertVariable";
// Convert currently selected element into properties-ready format
diff --git a/src/frontend/sidebar/component/OptionWidget.tsx b/src/frontend/sidebar/component/OptionWidget.tsx
index c4345c3..72f24ce 100644
--- a/src/frontend/sidebar/component/OptionWidget.tsx
+++ b/src/frontend/sidebar/component/OptionWidget.tsx
@@ -17,8 +17,6 @@ import createStyles from "@material-ui/core/styles/createStyles";
import makeStyles from "@material-ui/core/styles/makeStyles";
import { ISidebar } from "../ISidebar";
import { SearchElement } from "./search/SearchElement";
-import SearchIcon from "@material-ui/icons/Search";
-import NoteAddIcon from "@material-ui/icons/NoteAdd";
import { NewFileButton } from "./NewFileButton";
const useStyle = makeStyles(() =>
@@ -41,7 +39,6 @@ const OptionWidget: React.FunctionComponent = ({
const style = useStyle();
const [baseContent, setBaseContent] = useState("");
const [elementSearch, setElementSearch] = useState(false);
-
useEffect(() => {
setBaseContent(content);
}, []);
diff --git a/src/frontend/sidebar/help/HelpPopup.tsx b/src/frontend/sidebar/help/HelpPopup.tsx
index c8f7ff7..c5a493d 100644
--- a/src/frontend/sidebar/help/HelpPopup.tsx
+++ b/src/frontend/sidebar/help/HelpPopup.tsx
@@ -1,7 +1,6 @@
import DialogContent from "@material-ui/core/DialogContent";
import DialogTitle from "@material-ui/core/DialogTitle";
import Button from "@material-ui/core/Button";
-import IconButton from "@material-ui/core/IconButton";
import Dialog from "@material-ui/core/Dialog";
import HelpIcon from "@material-ui/icons/Help";
import React, { useState, FunctionComponent } from "react";
@@ -38,9 +37,9 @@ const HelpPopup: FunctionComponent = ({
const style = useStyle();
return (
-
setOpenHelp(true)} color="primary">
+
+