Skip to content
Snippets Groups Projects
Commit ad73f445 authored by Smit, P.J.M. (Peter, Student M-CS)'s avatar Smit, P.J.M. (Peter, Student M-CS)
Browse files

Dotview reverts to last working parameters if current parameter set returns an error. 

Also fixed bug with cancelling requests
parent 0c812cfb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
media/dotview.css
+ 7
− 0
View file @ ad73f445
......@@ -39,6 +39,13 @@ button {
top: 20px;
right: 20px;
}
#openOptions i {
transition: 0.2s;
}
#openOptions i:hover {
transform: rotate(45deg);
}
#paramContainer {
......
media/dotview.js
+ 24
− 31
View file @ ad73f445
......@@ -30,10 +30,6 @@ window.addEventListener('message', event => {
case 'zoomOut':
zoom(false);
break;
case 'params':
event.data.params.forEach(addParameterItem);
parameterDefinitions = event.data.params;
break;
case 'svg':
const newSvg = event.data.svg;
if (svgImage === undefined) {
......@@ -47,34 +43,28 @@ window.addEventListener('message', event => {
svgImage.innerHTML = newSvg.match(/(?<=<svg(?:.|\n|\r)+?>)(?:(?:.|\n|\r)+)(?=<\/svg>)/)[0];
}
break;
case 'allData':
if (svgImage === undefined && event.data.svg) {
// Set svg again
svgContainer.innerHTML = event.data.svg.replace('<svg', '<svg id="svgImage"');
svgImage = document.getElementById("svgImage");
scale = 1;
viewBox = { x: 0, y: 0, w: svgImage.clientWidth, h: svgImage.clientHeight };
svgImage.setAttribute('viewBox', `0 0 ${svgImage.clientWidth} ${svgImage.clientHeight}`);
}
case 'params':
if (paramList.innerHTML === '') {
// Set parameters again
event.data.params.forEach(addParameterItem);
parameterDefinitions = event.data.params;
// Set all the updated values
const values = event.data.values;
for (const entry of values) {
const id = entry[0];
const value = entry[1];
const valueElem = document.getElementById('value-' + id);
if (valueElem.type === 'checkbox') {
valueElem.checked = value;
} else {
valueElem.value = value;
}
}
break;
case 'paramValues':
resetParams();
// Set all the new values
const values = event.data.values;
for (const entry of values) {
const id = entry[0];
const value = entry[1];
const valueElem = document.getElementById('value-' + id);
if (valueElem.type === 'checkbox') {
valueElem.checked = value;
} else {
valueElem.value = value;
}
}
break;
case 'optionsOpen':
if (event.data.optionsOpen) {
paramContainer.style.maxHeight = '450px';
} else {
......@@ -102,9 +92,6 @@ function resetParams() {
break;
}
});
vscode.postMessage({
type: 'paramReset',
});
}
}
......@@ -223,7 +210,13 @@ document.getElementById("closeOptions").onclick = () => {
});
};
document.getElementById("revert").onclick = resetParams;
document.getElementById("revert").onclick = ()=>{
resetParams();
vscode.postMessage({
type: 'paramReset',
});
};
......
src/dotViewer.ts
+ 23
− 4
View file @ ad73f445
......@@ -78,6 +78,7 @@ export namespace DotViewer {
private lastDotString: string | undefined;
private lastSvgString: string | undefined;
private dotParameters: Map<string, string> = new Map();
private lastWorkingParameters: Map<string, string> = new Map();
private lastRunToken: string | undefined;
private optionsOpen: boolean = false;
......@@ -115,10 +116,19 @@ export namespace DotViewer {
LiveDotView.currentDotView = this;
}
this.postMessage({
type: 'allData',
type: 'svg',
svg: this.lastSvgString,
});
this.postMessage({
type: 'params',
params: LiveDotView.availableParameters,
});
this.postMessage({
type: 'paramValues',
values: Array.from(this.dotParameters.entries()),
});
this.postMessage({
type: 'optionsOpen',
optionsOpen: this.optionsOpen,
});
},
......@@ -131,15 +141,16 @@ export namespace DotViewer {
switch (message.type) {
case 'paramUpdate':
this.dotParameters.set(message.id, message.value);
this.updateDot();
break;
case 'paramReset':
this.dotParameters = new Map();
this.updateDot();
break;
case 'toggleOptions':
this.optionsOpen = !this.optionsOpen;
break;
}
this.updateDot();
},
undefined,
undefined
......@@ -246,6 +257,8 @@ export namespace DotViewer {
value: entry[1]
});
}
let dotParametersCopy = new Map(this.dotParameters);
let runToken = uri + JSON.stringify(this.dotParameters) + Date.now();
let jsonObject = {
......@@ -253,7 +266,7 @@ export namespace DotViewer {
toolName: "mosta (export-to-dot)",
constants: [],
parameters: parameters,
runToken: "dot" + runToken
runToken: runToken
};
vscode.window.withProgress({ location: vscode.ProgressLocation.Window, title: `Loading new dot for ${this.fileUri.path.split("/").pop()}` }, async (progress, token) => {
await new Promise<null>(async (resolveProgress, _) => {
......@@ -262,6 +275,7 @@ export namespace DotViewer {
if (data.runToken === jsonObject.runToken) {
if (data.data && data.data !== "") {
try {
this.lastWorkingParameters = dotParametersCopy;
this.lastDotString = data.data;
this.dotToSvg(runToken, resolveProgress);
} catch (error) {
......@@ -270,6 +284,11 @@ export namespace DotViewer {
resolveProgress(null);
}
} else {
this.dotParameters = new Map(this.lastWorkingParameters);
this.postMessage({
type: 'paramValues',
values: Array.from(this.dotParameters.entries())
});
resultHandlers.splice(resultHandlers.indexOf(resultHandler), 1);
resolveProgress(null);
}
......@@ -295,7 +314,7 @@ export namespace DotViewer {
private dotToSvg(runToken: string, resolveProgress: (value: any | PromiseLike<any>) => void) {
let jsonObject = {
dot: this.lastDotString,
runToken: "svg" + runToken
runToken: runToken
};
if (this.lastRunToken) {
client?.sendRequest("modest/cancelRun", { runToken: this.lastRunToken });
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment