summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data_structures_correct/CMSCOPE.js37
-rw-r--r--data_structures_correct/CONST_m.js2
-rw-r--r--dependencies.js12
-rw-r--r--finalmodsheet.xsl11
-rw-r--r--images/ScilabExecute.pngbin0 -> 660 bytes
-rw-r--r--index.html569
6 files changed, 427 insertions, 204 deletions
diff --git a/data_structures_correct/CMSCOPE.js b/data_structures_correct/CMSCOPE.js
index b5d1562..e00ee14 100644
--- a/data_structures_correct/CMSCOPE.js
+++ b/data_structures_correct/CMSCOPE.js
@@ -1,4 +1,41 @@
function CMSCOPE() {
+ CMSCOPE.prototype.get = function CMSCOPE() {
+
+ var options = {
+ in1: ["Input ports sizes", this.in1.toString().replace(/,/g, " ")],
+ clrs: ["Drawing colors (>0) or mark (<0)", this.clrs.toString().replace(/,/g, " ")],
+ win: ["Output window number (-1 for automatic)", this.win],
+ wpos: ["Output window position", sci2exp([])],
+ wdim: ["Output window sizes", sci2exp([])],
+ ymin: ["Ymin vector", this.ymin.toString().replace(/,/g, " ")],
+ ymax: ["Ymax vector", this.ymax.toString().replace(/,/g, " ")],
+ per: ["Refresh period", this.per.toString().replace(/,/g, " ")],
+ N: ["Buffer size", this.N],
+ heritance: ["Accept herited events 0/1", 0],
+ nom: ["Name of Scope (label&Id)", ""]
+ };
+ return options;
+ }
+ CMSCOPE.prototype.set = function CMSCOPE() {
+ this.in1 = inverse(arguments[0]["in1"]);
+ this.clrs = inverse(arguments[0]["clrs"]);
+ this.win = parseInt((arguments[0]["win"]));
+ this.ymin = inverse(arguments[0]["ymin"]);
+ this.ymax = inverse(arguments[0]["ymax"]);
+ this.per = inverse(arguments[0]["per"]);
+ this.N = parseInt((arguments[0]["N"]));
+ this.heritance = parseInt((arguments[0]["heritance"]));
+ this.nom = arguments[0]["nom"];
+ this.yy = [...transpose(this.ymin), ...transpose(this.ymax)];
+ this.period = transpose(this.per);
+ this.x.model.ipar = new ScilabDouble([this.win], [this.in1.length], [this.N], ...this.wpos, ...this.wdim, ...this.in1, this.clrs[0], this.clrs[1],[this.heritance]);
+ this.x.model.label = new ScilabString([this.nom]);
+ this.x.model.evtin = new ScilabDouble(...ones(1-this.heritance,1));
+ this.x.graphics.id = new ScilabString([this.nom]);
+ this.x.model.rpar = new ScilabDouble([0], ...colon_operator(this.period), ...colon_operator(this.yy));
+ this.x.graphics.exprs = new ScilabString([this.in1.toString().replace(/,/g, " ")], [this.clrs.toString().replace(/,/g, " ")], [this.win], [sci2exp([])], [sci2exp([])], [this.ymin.toString().replace(/,/g, " ")], [this.ymax.toString().replace(/,/g, " ")], [this.per.toString().replace(/,/g, " ")], [this.N], [0], [""]);
+ return new BasicBlock(this.x);
+ }
CMSCOPE.prototype.define = function CMSCOPE() {
this.win = -1;
this.in1 = [
diff --git a/data_structures_correct/CONST_m.js b/data_structures_correct/CONST_m.js
index 410fffa..b96a0e7 100644
--- a/data_structures_correct/CONST_m.js
+++ b/data_structures_correct/CONST_m.js
@@ -8,6 +8,8 @@ function CONST_m() {
}
CONST_m.prototype.set = function CONST_m() {
this.c = [arguments[0]["vec"]];
+ this.x.model.sim = list(new ScilabString(["cstblk4_m"]), new ScilabDouble([4]));
+ this.x.model.opar = list(new ScilabDouble(this.c));
this.x.model.rpar = new ScilabDouble();
this.x.graphics.exprs = new ScilabString([sci2exp(this.c)]);
return new BasicBlock(this.x);
diff --git a/dependencies.js b/dependencies.js
index c662af0..4176712 100644
--- a/dependencies.js
+++ b/dependencies.js
@@ -1,6 +1,9 @@
var dir = ["data_structures_correct"];
var fileextension = ".";
+var script = document.createElement("script");
+ script.src = "math.js";
+ document.head.appendChild(script);
$.each(dir, function(index, value) {
$.ajax({ // http://stackoverflow.com/a/18480589
url: value,
@@ -237,4 +240,13 @@ function size() {
return res[arguments[1]];
}
}
+}
+
+function inverse() {
+ var str = "[["
+ var arg = arguments[0];
+ arg = arg.replace(/ /g, "],[");
+ str += arg + "]]";
+ var array = JSON.parse(str);
+ return array;
} \ No newline at end of file
diff --git a/finalmodsheet.xsl b/finalmodsheet.xsl
index 7c94af2..0546481 100644
--- a/finalmodsheet.xsl
+++ b/finalmodsheet.xsl
@@ -134,6 +134,9 @@ Look for TAG:Break1!!!
<xsl:when test="@style='CommandPort'">
<xsl:call-template name="CommandPort" />
</xsl:when>
+ <xsl:when test="@style='Split'">
+ <xsl:call-template name="SplitBlock" />
+ </xsl:when>
<xsl:otherwise>
<!-- Maverick -->
<!-- TAG:Break1
@@ -1160,14 +1163,10 @@ Look for TAG:Break1!!!
<xsl:value-of select="@simulationFunctionName" />
</xsl:attribute>
</xsl:if>
- <xsl:if test="@simulationFunctionType">
- <xsl:attribute name="simulationFunctionType">
- <xsl:value-of select="@simulationFunctionType" />
- </xsl:attribute>
- </xsl:if>
+ <xsl:attribute name="simulationFunctionType">DEFAULT</xsl:attribute>
<xsl:if test="@style">
<xsl:attribute name="style">
- <xsl:value-of select="@style" />
+ <xsl:value-of select="@name" />
</xsl:attribute>
</xsl:if>
<xsl:if test="@value">
diff --git a/images/ScilabExecute.png b/images/ScilabExecute.png
new file mode 100644
index 0000000..a7de0fe
--- /dev/null
+++ b/images/ScilabExecute.png
Binary files differ
diff --git a/index.html b/index.html
index 7cc3436..43efc53 100644
--- a/index.html
+++ b/index.html
@@ -255,12 +255,25 @@
var config = mxUtils.load('config/keyhandler-commons.xml').getDocumentElement();
editor.configure(config);
+ graph.isCellSelectable = function(cell)
+ {
+ if(cell.getStyle() == 'Split') {
+ return false;
+ }
+ return true;
+ };
+ graph.resizeCell = function(cell, bounds, recurse) {
+ if(cell.getStyle() == 'Split') {
+ return null;
+ }
+ return mxGraph.prototype.resizeCell.apply(this, arguments);
+ }
/*
For a new edge on the graph, check if that edge satisfies one of the port constraints.
*/
graph.addEdge = function(edge, parent, source, target, index) {
-
+ console.log(source);
var edgeSource = source;
// If the source of the edge is also an edge, find the port.
@@ -268,6 +281,7 @@
edgeSource = edgeSource.source;
}
+ /*
// If the edge violates any port constraints, return null.
if (!((edgeSource.getEdgeCount() == 0 && edgeSource.isVertex() &&
target.getEdgeCount() == 0 && target.isVertex()) ||
@@ -291,6 +305,118 @@
}
return null;
+ */
+
+ if(source.isEdge() == true) {
+ graph.getModel().beginUpdate();
+ try
+ {
+ var edgeSource = source;
+ while (edgeSource.isEdge() == true) {
+ edgeSource = edgeSource.source;
+ }
+ var cell = graph.insertVertex(graph.getDefaultParent(), null, '', source.sourcePoint.x, source.sourcePoint.y, 10, 10,'Split', false);
+ if (edgeSource.value == 'ExplicitOutputPort') {
+ createPorts(graph, cell, ['E'], [], ['E'], ['E']);
+ cell.name = 'SPLIT_f';
+ var someEdge = graph.insertEdge(parent, null, '', cell.getChildAt(1), source.target);
+ graph.insertEdge(parent, null, '', cell.getChildAt(2), target);
+ }
+ else if (edgeSource.value == 'ImplicitOutputPort') {
+ createPorts(graph, cell, ['I'], [], ['I', 'I'], []);
+ cell.name = 'SPLIT_f';
+ var someEdge = graph.insertEdge(parent, null, '', cell.getChildAt(1), source.target);
+ graph.insertEdge(parent, null, '', cell.getChildAt(2), target);
+ }
+ else {
+ createPorts(graph, cell, ['CONTROL'], [], ['COMMAND', 'COMMAND'], []);
+ cell.name = 'SPLIT_f';
+ var someEdge = graph.insertEdge(parent, null, '', cell.getChildAt(1), source.target);
+ graph.insertEdge(parent, null, '', cell.getChildAt(2), target);
+ }
+ cell.getChildAt(0).setVisible(false);
+ cell.getChildAt(1).setVisible(false);
+ cell.getChildAt(2).setVisible(false);
+ var waypoints = source.waypoints;
+ var sdsd = graph.view.getState(source);
+ var seg = mxUtils.findNearestSegment(sdsd, source.sourcePoint.x, source.sourcePoint.y);
+ //console.log(graph.view.getNextPoint(graph.view.getState(source), graph.view.getState(cell), false));
+ graph.removeCells([source], true);
+ source = graph.insertEdge(parent, null, '', source.source, cell.getChildAt(0));
+ //var seg = mxUtils.findNearestSegment(source, source.sourcePoint.x, source.sourcePoint.x);
+ //console.log(seg);
+ console.log(waypoints);
+ console.log(sdsd.absolutePoints);
+ console.log(seg);
+ if(waypoints != null) {
+ var waypoints1 = [];
+ for(var i = 0; i < seg; i++) {
+ waypoints1.push(waypoints[i]);
+ }
+ var waypoints2 = [];
+ for(var i = seg; i < waypoints.length; i++) {
+ waypoints2.push(waypoints[i]);
+ }
+ source.geometry.points = waypoints1;
+ someEdge.geometry.points = waypoints2;
+ }
+ cell.getChildAt(0).setConnectable(false);
+ cell.getChildAt(1).setConnectable(false);
+ cell.getChildAt(2).setConnectable(false);
+ cell.setConnectable(false);
+ graph.refresh();
+ }
+ finally
+ {
+ graph.getModel().endUpdate();
+ }
+ return null;
+ }
+
+ if(target.isEdge() == true) {
+ graph.getModel().beginUpdate();
+ try
+ {
+ var edgeSource = target;
+ while (edgeSource.isEdge() == true) {
+ edgeSource = edgeSource.source;
+ }
+ var cell = graph.insertVertex(graph.getDefaultParent(), null, '', target.sourcePoint.x, target.sourcePoint.y, 5, 5,'Split', false);
+ if (edgeSource.value == 'ExplicitOutputPort') {
+ createPorts(graph, cell, ['E'], [], ['E'], ['E']);
+ cell.name = 'SPLIT_f';
+ graph.insertEdge(parent, null, '', cell.getChildAt(1), target.target);
+ graph.insertEdge(parent, null, '', cell.getChildAt(2), source);
+ }
+ else if (edgeSource.value == 'ImplicitOutputPort') {
+ createPorts(graph, cell, ['I'], [], ['I', 'I'], []);
+ cell.name = 'SPLIT_f';
+ graph.insertEdge(parent, null, '', cell.getChildAt(1), target.target);
+ graph.insertEdge(parent, null, '', cell.getChildAt(2), source);
+ }
+ else {
+ createPorts(graph, cell, ['CONTROL'], [], ['COMMAND', 'COMMAND'], []);
+ cell.name = 'SPLIT_f';
+ graph.insertEdge(parent, null, '', cell.getChildAt(1), target.target);
+ graph.insertEdge(parent, null, '', cell.getChildAt(2), source);
+ }
+ cell.getChildAt(0).setVisible(false);
+ cell.getChildAt(1).setVisible(false);
+ cell.getChildAt(2).setVisible(false);
+ graph.getModel().setTerminal(target, cell.getChildAt(0), false);
+ cell.getChildAt(0).setConnectable(false);
+ cell.getChildAt(1).setConnectable(false);
+ cell.getChildAt(2).setConnectable(false);
+ cell.setConnectable(false);
+ graph.refresh();
+ }
+ finally
+ {
+ graph.getModel().endUpdate();
+ }
+ return null;
+ }
+ return mxGraph.prototype.addEdge.apply(this, arguments);
}
// Shows a "modal" window when double clicking a vertex.
@@ -415,14 +541,13 @@
// @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
// https://jgraph.github.io/mxgraph/docs/js-api/files/model/mxCell-js.html
// Uncomment this block to see XML tags work
- /*graph.convertValueToString = function(cell)
+ graph.convertValueToString = function(cell)
{
if (mxUtils.isNode(cell.value))
{
return cell.getAttribute('label', '');
}
- };*/
-
+ };
var cellLabelChanged = graph.cellLabelChanged;
graph.cellLabelChanged = function(cell, newValue, autoSize) {
if (mxUtils.isNode(cell.value)) {
@@ -473,52 +598,74 @@
Used Preorder traversal for edges.
*/
editor.addAction('deleteBlock', function(editor, cell) {
- var cells = [];
- var selectionCells = graph.getSelectionCells();
- for (var k = 0; k < selectionCells.length; k++) {
- var portCount = selectionCells[k].getChildCount();
- cells.push(selectionCells[k]);
- // Finds all the port with edges of the selected cell, and calls getEdgeId() for
- // each edge object of that port.
- for (var i = 0; i < portCount; i++) {
- var edgeCount = selectionCells[k].getChildAt(i).getEdgeCount();
- if (edgeCount != 0) {
- getEdgeId(selectionCells[k].getChildAt(i));
-
- for (var j = 0; j < edgeCount; j++) {
- var edgeObject = selectionCells[k].getChildAt(i).getEdgeAt(j);
- getEdgeId(edgeObject);
- }
+ graph.getModel().beginUpdate();
+ try {
+ function getEdgeId(edgeObject) {
+ var cellStack = [];
+ if(edgeObject != null && edgeObject.isEdge() == true) {
+ cellStack.push(edgeObject);
+ while(cellStack.length != 0) {
+ var tempEdgeObject = cellStack.pop();
+ if (tempEdgeObject.edge == true && (cells.indexOf(tempEdgeObject) == -1)) {
+ cells.push(tempEdgeObject);
+ }
+ if(tempEdgeObject.source.parent.name == "SPLIT_f") {
+ //console.log(tempEdgeObject.source.parent.getChildAt(1).getEdgeAt(0));
+ //console.log(sdsd);
+ if(tempEdgeObject.source == tempEdgeObject.source.parent.getChildAt(1)) {
+ console.log('sdsd');
+ var sourceEdge = tempEdgeObject.source.parent.getChildAt(0).getEdgeAt(0);
+ var target = tempEdgeObject.source.parent.getChildAt(2).getEdgeAt(0).target;
+ graph.getModel().setTerminal(sourceEdge, target, false);
+ cells.push(tempEdgeObject.source.parent);
}
+ else {
+ console.log()
+ //var points = graph.view.getState(tempEdgeObject.source.parent.getChildAt(1).getEdgeAt(0)).absolutePoints;
+ var sourceEdge = tempEdgeObject.source.parent.getChildAt(0).getEdgeAt(0);
+ var target = tempEdgeObject.source.parent.getChildAt(1).getEdgeAt(0).target;
+ graph.getModel().setTerminal(sourceEdge, target, false);
+ cells.push(tempEdgeObject.source.parent);
+ }
+ }
+ if(tempEdgeObject.target.parent.name == "SPLIT_f") {
+ if(cells.indexOf(tempEdgeObject.target.parent) == -1) {
+ cells.push(tempEdgeObject.target.parent);
+ }
+ cellStack.push(tempEdgeObject.target.parent.getChildAt(1).getEdgeAt(0));
+ cellStack.push(tempEdgeObject.target.parent.getChildAt(2).getEdgeAt(0));
}
+ }
}
-
-
- /* getEdgeId() find all the associated edges from an edge.
- Pushes the object of that edge into an array of mxCell objects.
- */
- function getEdgeId(edgeObject) {
- var cellStack = [];
- if (edgeObject != null && edgeObject.isEdge() == true) {
- cellStack.push(edgeObject);
- while (cellStack.length != 0) {
- var tempEdgeObject = cellStack.pop();
- if (tempEdgeObject.edge == true && (cells.indexOf(tempEdgeObject) == -1)) {
- cells.push(tempEdgeObject);
- }
- for (var j = 0; j < tempEdgeObject.getEdgeCount(); j++) {
- cellStack.push(tempEdgeObject.getEdgeAt(j));
- }
- }
+ }
+ var cells = [];
+ var selectionCells = graph.getSelectionCells();
+ for (var k = 0; k < selectionCells.length; k++) {
+ if(selectionCells[k].isEdge() == true) {
+ getEdgeId(selectionCells[k]);
}
+ else {
+ var portCount = selectionCells[k].getChildCount();
+ cells.push(selectionCells[k]);
+ for (var i = 0; i < portCount; i++) {
+ var edgeCount = selectionCells[k].getChildAt(i).getEdgeCount();
+ if (edgeCount != 0) {
+ for (var j = 0; j < edgeCount; j++) {
+ var edgeObject = selectionCells[k].getChildAt(i).getEdgeAt(j);
+ getEdgeId(edgeObject);
+ }
+ }
+ }
+ }
}
-
- // The mxCells to be deleted are first highlighted,
- // and then the selection is deleted in a single go.
- graph.getSelectionModel().setCells(cells);
- editor.execute('delete');
+ //graph.getSelectionModel().setCells(cells);
+ //editor.execute('delete');
+ graph.removeCells(cells, true);
+ }
+ finally {
+ graph.getModel().endUpdate();
+ }
});
-
addToolbarButton(editor, toolbar, 'toggle', 'Expand All', 'images/navigate_plus.png');
toolbar.appendChild(spacer.cloneNode(true));
@@ -528,7 +675,7 @@
toolbar.appendChild(spacer.cloneNode(true));
- addToolbarButton(editor, toolbar, 'delete', '', 'images/delete2.png');
+ addToolbarButton(editor, toolbar, 'deleteBlock', '', 'images/delete2.png');
addToolbarButton(editor, toolbar, 'undo', '', 'images/undo.png');
addToolbarButton(editor, toolbar, 'redo', '', 'images/redo.png');
toolbar.appendChild(spacer.cloneNode(true));
@@ -545,111 +692,115 @@
Reference: http://www.w3schools.com/xsl/xsl_client.asp
*/
- function loadXMLDoc(filename) {
- if (window.ActiveXObject) {
- xhttp = new ActiveXObject("Msxml2.XMLHTTP");
- } else {
+ function loadXMLDoc(filename) {
xhttp = new XMLHttpRequest();
+ xhttp.open("GET", filename, false);
+ try {
+ xhttp.responseType = "text/xml";
+ } catch (err) {
+ }
+ xhttp.send("");
+ return xhttp.responseXML;
}
- xhttp.open("GET", filename, false);
- try {
- xhttp.responseType = "msxml-document"
- } catch (err) {}
- xhttp.send("");
- return xhttp.responseXML;
- }
- /*
- Maverick
- The Export buttons in toolbar call this function with varying
- arguments.
- The third argument is used to decide which button is being
- pressed.
- exportXML : 2 arguments
- exportXcos: 3 arguments
- */
- function displayXMLorXcos() {
- var textarea = document.createElement('textarea');
- textarea.style.width = '400px';
- textarea.style.height = '400px';
- var enc = new mxCodec(mxUtils.createXmlDocument());
- /*var array=[],key;
- for (key in diagRoot.model.cells) {
-
- if(diagRoot.model.cells[key].connectable == false)
- {
- array.push(diagRoot.model.cells[key].inst);
- diagRoot.model.cells[key].inst=null;
- }
- }*/
- var node = enc.encode(diagRoot);
+ /*
+ Maverick
+ The Export buttons in toolbar call this function with varying
+ arguments.
+ The third argument is used to deciFde which button is being
+ pressed.
+ exportXML : 2 arguments
+ exportXcos: 3 arguments
+ */
+ function displayXMLorXcos() {
+ var textarea = document.createElement('textarea');
+ textarea.style.width = '400px';
+ textarea.style.height = '400px';
- var str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + mxUtils.getPrettyXml(node);
+ var enc = new mxCodec(mxUtils.createXmlDocument());
+ var node = enc.encode(diagRoot);
- textarea.value = str;
- /*var j = 0;
- for (key in diagRoot.model.cells) {
-
- if(diagRoot.model.cells[key].connectable == false)
- {
- diagRoot.model.cells[key].inst=array[j++];
- }
- }*/
- if (arguments[2] == null) {
- showModalWindow(graph, 'XML', textarea, 410, 440);
- } else {
+ var str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + mxUtils.getPrettyXml(node);
+
+ textarea.value = str;
- return mxUtils.getPrettyXml(node);
+ if (arguments[2] == null) {
+ showModalWindow(graph, 'XML', textarea, 410, 440);
+ } else {
+
+ return mxUtils.getPrettyXml(node);
+ }
}
- }
- // Defines a new export action
- editor.addAction('exportXML', function(editor, cell) {
- //Only two parameters passed here.
- displayXMLorXcos(editor, cell);
- });
+ function getXcosDiagram(editor, cell) {
+ //Mind the 3 parameters.
+ var xmlFromExportXML = displayXMLorXcos(editor, cell, true);
+ if (xmlFromExportXML === null)
+ alert('First create the XML file.');
+ else {
- /* Maverick
- Reference: http://www.w3schools.com/xsl/xsl_client.asp
- */
+ var xml = mxUtils.parseXml(xmlFromExportXML);
- editor.addAction('exportXcos', function(editor, cell) {
- //Mind the 3 parameters.
- var xmlFromExportXML = displayXMLorXcos(editor, cell, true);
- if (xmlFromExportXML == null) alert('First create the XML file.');
- else {
+ var xsl = loadXMLDoc("finalmodsheet.xsl");
- var xml = mxUtils.parseXml(xmlFromExportXML);
+ xsltProcessor = new XSLTProcessor();
+ xsltProcessor.importStylesheet(xsl);
+ resultDocument = xsltProcessor.transformToDocument(xml);
+ /*
+ Maverick
+ Using resultDocument.documentElement to remove an additional tag "<#document>" created by the XSLTProcessor.
+ */
+ var str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n" + mxUtils.getPrettyXml(resultDocument.documentElement);
- var xsl = loadXMLDoc("finalmodsheet.xsl");
+ str = str.replace(/\n\n/g, "\n");
+ return str;
+ }
+ }
- xsltProcessor = new XSLTProcessor();
- xsltProcessor.importStylesheet(xsl);
- resultDocument = xsltProcessor.transformToDocument(xml);
+ // Defines a new export action
+ editor.addAction('exportXML', function (editor, cell) {
+ //Only two parameters passed here.
+ displayXMLorXcos(editor, cell);
+ });
+ /* Maverick
+ Reference: http://www.w3schools.com/xsl/xsl_client.asp
+ */
+ editor.addAction('exportXcos', function (editor, cell) {
var textarea = document.createElement('textarea');
textarea.style.width = '400px';
textarea.style.height = '400px';
- /*
- Maverick
- Using resultDocument.documentElement to remove an additional tag "<#document>" created by the XSLTProcessor.
- */
- var str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n" + mxUtils.getPrettyXml(resultDocument.documentElement);
-
- textarea.value = str.replace(/\n\n/g, "\n");
+ textarea.value = getXcosDiagram(editor, cell);
showModalWindow(graph, 'Xcos', textarea, 410, 440);
- }
- });
+ });
- addToolbarButton(editor, toolbar, 'exportXML', 'Export XML', 'images/export1.png');
+ addToolbarButton(editor, toolbar, 'exportXML', 'Export XML', 'images/export1.png');
+ addToolbarButton(editor, toolbar, 'exportXcos', 'Export Xcos', 'images/export1.png');
- addToolbarButton(editor, toolbar, 'exportXcos', 'Export Xcos', 'images/export1.png');
+ toolbar.appendChild(spacer.cloneNode(true));
- // Adds toolbar buttons into the status bar at the bottom
- // of the window.
+ addToolbarButton(editor, toolbar, 'simulate', 'Simulate', 'images/ScilabExecute.png');
+ editor.addAction('simulate', function (editor, cell) {
+ var diagram = getXcosDiagram(editor, cell);
+
+ //var parameters = {'diagram' : diagram};
+ $.ajax({
+ type: "POST",
+ url: 'servlet/SciExec',
+ dataType:"text/xml",
+ processData: false,
+ data: "name=" + encodeURIComponent(diagram),
+ success: function (response) {
+ console.log(response.responseText);
+ },
+ error: function (response) {
+ console.log(response.responseText);
+ }
+ });
+ });
addToolbarButton(editor, status, 'zoomIn', '', 'images/zoom_in.png', true);
addToolbarButton(editor, status, 'zoomOut', '', 'images/zoom_out.png', true);
addToolbarButton(editor, status, 'actualSize', '', 'images/view_1_1.png', true);
@@ -1017,10 +1168,14 @@
propertiesObject[key] = document.getElementById(key.toString()).value;
}
}
+ var label = getImgHTML(name);
var details = cell.blockInstance.instance.set(propertiesObject); //window[name]("set",cell.value,propertiesObject);
var enc = new mxCodec();
var node = enc.encode(details);
+ if(name=='CONST_m')
node.setAttribute('label', getData(details.exprs)[0]);
+ else
+ node.setAttribute('label', label);
cell.value = node;
/*
Maverick
@@ -1633,6 +1788,11 @@
var details = details_instance.define();
var enc = new mxCodec(mxUtils.createXmlDocument());
var node = enc.encode(details);
+ if(name=='CONST_m'){
+ node.setAttribute('label', '1');
+ } else if(name == 'ABS_VALUE') {
+ node.setAttribute('label', 'ABS');
+ } else
node.setAttribute('label', label);
var temp = enc.encode(parent);
node.setAttribute('parent', temp.getAttribute('id'));
@@ -2009,92 +2169,105 @@
Implements a perpendicular wires connection edge style
-->
<script type="text/javascript">
- mxEdgeStyle.WireConnector = function(state, source, target, hints, result) {
- // Creates array of all way- and terminalpoints
- var pts = state.absolutePoints;
- var horizontal = true;
- var hint = null;
-
- // Gets the initial connection from the source terminal or edge
- if (source != null && state.view.graph.model.isEdge(source.cell)) {
- horizontal = state.style['sourceConstraint'] == 'horizontal';
- } else if (source != null) {
- horizontal = source.style['portConstraint'] != 'vertical';
-
- // Checks the direction of the shape and rotates
- var direction = source.style[mxConstants.STYLE_DIRECTION];
-
- if (direction == 'north' || direction == 'south') {
- horizontal = !horizontal;
- }
+ mxEdgeStyle.WireConnector = function(state, source, target, hints, result) {
+ state.cell.waypoints = state.cell.geometry.points;
+ // Creates array of all way- and terminalpoints
+ var pts = state.absolutePoints;
+ var horizontal = true;
+ var hint = null;
+ // Gets the initial connection from the source terminal or edge
+ if (source != null && state.view.graph.model.isEdge(source.cell)) {
+ horizontal = state.style['sourceConstraint'] == 'horizontal';
+ }
+ // If the source terminal is a Split Block, set the horizontal false
+ else if(source != null && source.cell.name == 'SPLIT_f') {
+ if(state.cell.source != null) {
+ // If the port is the third child of splitBlock, only then set the horizontal as false
+ if(state.cell.source == state.cell.source.parent.getChildAt(2)) {
+ horizontal = state.style['sourceConstraint'] == 'horizontal';
}
-
- // Adds the first point
- var pt = pts[0];
-
- if (pt == null && source != null) {
- pt = new mxPoint(state.view.getRoutingCenterX(source), state.view.getRoutingCenterY(source));
- } else if (pt != null) {
- pt = pt.clone();
+ }
+ }
+ else if (source != null) {
+ horizontal = source.style['portConstraint'] != 'vertical';
+ // Checks the direction of the shape and rotates
+ var direction = source.style[mxConstants.STYLE_DIRECTION];
+ if (direction == 'north' || direction == 'south') {
+ horizontal = !horizontal;
}
-
- var first = pt;
-
- // Adds the waypoints
- if (hints != null && hints.length > 0) {
- for (var i = 0; i < hints.length; i++) {
- horizontal = !horizontal;
- hint = state.view.transformControlPoint(state, hints[i]);
-
- if (horizontal) {
- if (pt.y != hint.y) {
- pt.y = hint.y;
- result.push(pt.clone());
- }
- } else if (pt.x != hint.x) {
- pt.x = hint.x;
+ }
+ // Adds the first point
+ var pt = pts[0];
+ /* @jiteshjha splitBlock
+ */
+ if(state.cell.getGeometry().getTerminalPoint(true) != null) {
+ source.cell['sourcePoint'] = state.cell.getGeometry().getTerminalPoint(true);
+ }
+ /*if(target.cell != null) {
+ target.cell['targetPoint'] = pt;
+ }*/
+ if (pt == null && source != null) {
+ pt = new mxPoint(state.view.getRoutingCenterX(source), state.view.getRoutingCenterY(source));
+ } else if (pt != null) {
+ pt = pt.clone();
+ }
+ var first = pt;
+ if(state.cell.getGeometry().getTerminalPoint(false) != null) {
+ target.cell['sourcePoint'] = state.cell.getGeometry().getTerminalPoint(false);
+ }
+ // Adds the waypoints
+ if (hints != null && hints.length > 0) {
+ for (var i = 0; i < hints.length; i++) {
+ horizontal = !horizontal;
+ hint = state.view.transformControlPoint(state, hints[i]);
+ if (horizontal) {
+ if (pt.y != hint.y) {
+ pt.y = hint.y;
result.push(pt.clone());
}
+ } else if (pt.x != hint.x) {
+ pt.x = hint.x;
+ result.push(pt.clone());
}
- } else {
- hint = pt;
}
-
- // Adds the last point
- pt = pts[pts.length - 1];
-
- if (pt == null && target != null) {
- pt = new mxPoint(state.view.getRoutingCenterX(target), state.view.getRoutingCenterY(target));
- }
-
- if (horizontal) {
- if (pt.y != hint.y && first.x != pt.x) {
- result.push(new mxPoint(pt.x, hint.y));
- }
- } else if (pt.x != hint.x && first.y != pt.y) {
- result.push(new mxPoint(hint.x, pt.y));
+ } else {
+ hint = pt;
+ }
+ // Adds the last point
+ pt = pts[pts.length - 1];
+ if (pt == null && target != null) {
+ pt = new mxPoint(state.view.getRoutingCenterX(target), state.view.getRoutingCenterY(target));
+ }
+ if (horizontal) {
+ if (pt.y != hint.y && first.x != pt.x) {
+ result.push(new mxPoint(pt.x, hint.y));
}
+ } else if (pt.x != hint.x && first.y != pt.y) {
+ result.push(new mxPoint(hint.x, pt.y));
+ }
+ // If the target of the edge is a splitBlock, push final coordinate as vertical.
+ if(state.cell.target != null) {
+ if(state.cell.target.parent.name == "SPLIT_f") {
+ result.pop();
+ result.push(new mxPoint(hint.x, pt.y));
+ }
+ }
};
-
mxStyleRegistry.putValue('wireEdgeStyle', mxEdgeStyle.WireConnector);
-
// This connector needs an mxEdgeSegmentHandler
mxGraphCreateHandler = mxGraph.prototype.createHandler;
mxGraph.prototype.createHandler = function(state) {
- var result = null;
-
- if (state != null) {
- if (this.model.isEdge(state.cell)) {
- var style = this.view.getEdgeStyle(state);
-
- if (style == mxEdgeStyle.WireConnector) {
- return new mxEdgeSegmentHandler(state);
- }
+ var result = null;
+ if (state != null) {
+ if (this.model.isEdge(state.cell)) {
+ var style = this.view.getEdgeStyle(state);
+ if (style == mxEdgeStyle.WireConnector) {
+ return new mxEdgeSegmentHandler(state);
}
}
-
- return mxGraphCreateHandler.apply(this, arguments);
- };
+ }
+ return mxGraphCreateHandler.apply(this, arguments);
+ };
</script>
</head>
generated by cgit (git 2.34.1) at 2025-03-13 13:50:18 +0000