Skip to content

Commit 90b11d3

Browse files
author
SeungpilPark
committed
#9 addBackDoor
1 parent 536846d commit 90b11d3

10 files changed

Lines changed: 473 additions & 97 deletions

File tree

src/main/webapp/examples/develope.html

Lines changed: 33 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,8 @@
219219
});
220220

221221
// Canvas
222-
canvas = new OG.Canvas('canvas', [1000, 800], 'white', 'url(resources/images/symbol/grid.gif)');
222+
canvas = new OG.Canvas('canvas', [1000, 800], 'transparent');
223+
//canvas = new OG.Canvas('canvas', [1000, 800], 'white', 'url(resources/images/symbol/grid.gif)');
223224
canvas._CONFIG.DEFAULT_STYLE.EDGE["edge-type"] = "plain";
224225
canvas._CONFIG.GUIDE_CONTROL_LINE_NUM = 1;
225226
canvas._CONFIG.FOCUS_CANVAS_ONSELECT = true;
@@ -242,7 +243,8 @@
242243
enableContextMenu: true,
243244
useSlider: true,
244245
stickGuide: true,
245-
checkBridgeEdge: true
246+
checkBridgeEdge: true,
247+
autoHistory: false
246248
});
247249

248250

@@ -275,7 +277,7 @@
275277
dropX = dropX / canvas._CONFIG.SCALE;
276278
dropY = dropY / canvas._CONFIG.SCALE;
277279
element = canvas.drawShape([dropX, dropY],
278-
shape, [parseInt(shapeInfo._width, 10), parseInt(shapeInfo._height, 10)]);
280+
shape, [parseInt(shapeInfo._width, 10), parseInt(shapeInfo._height, 10)]);
279281
$('#canvas').removeData('DRAG_SHAPE');
280282

281283
}
@@ -322,58 +324,32 @@
322324
canvas.onDisconnectShape(function (event, edgeElement, fromElement, toElement) {
323325
});
324326

325-
canvas.onLoading(function(event, progress){
327+
canvas.onLoading(function (event, progress) {
326328
console.log(progress);
327329
});
328-
// window.canvas = canvas;
329-
//
330-
// var worker = new Worker('../src/worker/og-worker.js');
330+
331+
// canvas.fastLoadingON();
331332
//
332-
// worker.addEventListener('message', function(e) {
333-
// console.log('Worker said: ', e.data);
334-
// }, false);
335333
//
336-
// worker.postMessage('Hello');
337-
338-
// for(var i = 0; i < 3000; i++){
339-
// canvas.getRenderer()._PAPER.path("M40,65L40,35L60,35L60,40L45,40L45,45L60,45L60,50L45,50L45,65L40,65")
340-
// }
341-
342-
canvas.fastLoadingON();
343-
344-
var date1 = new Date();
345-
for (var i = 0; i < 10; i++) {
346-
var p1 = [i * 10, i * 10];
347-
var p2 = [i * 10 + 50, i * 10 + 50];
348-
var location = canvas.drawShape(p1, new OG.MILoad(), [50, 50]);
349-
var location2 = canvas.drawShape(p2, new OG.MILoad(), [50, 50]);
350-
var raceway = new OG.CableShape();
351-
canvas.connect(location, location2, null, null, null, null, null, null, raceway);
352-
}
353-
var date2 = new Date();
354-
console.log(date2 - date1);
355-
356-
canvas.fastLoadingOFF();
357-
// setTimeout(function(){
358-
// for (var i = 20; i < 40; i++) {
359-
// var p1 = [i * 10, i * 10];
360-
// var p2 = [i * 10 + 50, i * 10 + 50];
361-
// var location = canvas.drawShape(p1, new OG.HierarchyFeeder(), [50, 50]);
362-
// var location2 = canvas.drawShape(p2, new OG.HierarchyFeeder(), [50, 50]);
363-
// var raceway = new OG.CableShape();
364-
// canvas.connect(location, location2, null, null, null, null, null, null, raceway);
365-
// }
366-
// },100);
367-
// setTimeout(function(){
368-
// for (var i = 40; i < 60; i++) {
369-
// var p1 = [i * 10, i * 10];
370-
// var p2 = [i * 10 + 50, i * 10 + 50];
371-
// var location = canvas.drawShape(p1, new OG.HierarchyFeeder(), [50, 50]);
372-
// var location2 = canvas.drawShape(p2, new OG.HierarchyFeeder(), [50, 50]);
373-
// var raceway = new OG.CableShape();
374-
// canvas.connect(location, location2, null, null, null, null, null, null, raceway);
375-
// }
376-
// },100);
334+
// canvas.fastLoadingOFF();
335+
336+
337+
var fileInput = $('#backdoor-upload');
338+
fileInput.bind('change', function (event) {
339+
var target = event.delegateTarget;
340+
if (target.files && target.files[0]) {
341+
var reader = new FileReader();
342+
reader.onload = function (e) {
343+
canvas.addBackDoor(e.target.result, 100, 1);
344+
};
345+
reader.readAsDataURL(target.files[0]);
346+
}
347+
});
348+
349+
var update = $('#backdoor-update');
350+
update.click(function () {
351+
canvas.updateBackDoor(150, 0.7);
352+
});
377353
});
378354

379355
function save() {
@@ -390,6 +366,8 @@
390366
<input type="button" value="loadJSON" onclick="canvas.loadJSON(opengraphJSON);"/>
391367
<input type="button" value="undo" onclick="canvas.undo();"/>
392368
<input type="button" value="redo" onclick="canvas.redo();"/>
369+
<input type="file" value="upload" id="backdoor-upload"/>
370+
<input type="button" value="update" id="backdoor-update"/>
393371
</div>
394372
<div class="ui-layout-west">
395373
<div id="accordion">
@@ -554,11 +532,13 @@ <h3><a href="#">BPMN</a></h3>
554532
</div>
555533
</div>
556534

557-
<div class="ui-layout-center" id="canvas" style="cursor: default;">
535+
<div class="ui-layout-center" style="cursor: default;">
536+
<div style="width: 70%;height: 70%;border: solid 1px #eee; overflow: scroll;" id="canvas">
537+
538+
</div>
558539
</div>
559540
<div id="canvas_slider">
560541
</div>
561-
<img src="" id="testImg">
562542

563543
<script type="text/javascript">
564544
$(function () {
12.6 MB
Loading
381 KB
Loading

src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT-All.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT-min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)