|
219 | 219 | }); |
220 | 220 |
|
221 | 221 | // 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)'); |
223 | 224 | canvas._CONFIG.DEFAULT_STYLE.EDGE["edge-type"] = "plain"; |
224 | 225 | canvas._CONFIG.GUIDE_CONTROL_LINE_NUM = 1; |
225 | 226 | canvas._CONFIG.FOCUS_CANVAS_ONSELECT = true; |
|
242 | 243 | enableContextMenu: true, |
243 | 244 | useSlider: true, |
244 | 245 | stickGuide: true, |
245 | | - checkBridgeEdge: true |
| 246 | + checkBridgeEdge: true, |
| 247 | + autoHistory: false |
246 | 248 | }); |
247 | 249 |
|
248 | 250 |
|
|
275 | 277 | dropX = dropX / canvas._CONFIG.SCALE; |
276 | 278 | dropY = dropY / canvas._CONFIG.SCALE; |
277 | 279 | 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)]); |
279 | 281 | $('#canvas').removeData('DRAG_SHAPE'); |
280 | 282 |
|
281 | 283 | } |
|
322 | 324 | canvas.onDisconnectShape(function (event, edgeElement, fromElement, toElement) { |
323 | 325 | }); |
324 | 326 |
|
325 | | - canvas.onLoading(function(event, progress){ |
| 327 | + canvas.onLoading(function (event, progress) { |
326 | 328 | console.log(progress); |
327 | 329 | }); |
328 | | -// window.canvas = canvas; |
329 | | -// |
330 | | -// var worker = new Worker('../src/worker/og-worker.js'); |
| 330 | + |
| 331 | +// canvas.fastLoadingON(); |
331 | 332 | // |
332 | | -// worker.addEventListener('message', function(e) { |
333 | | -// console.log('Worker said: ', e.data); |
334 | | -// }, false); |
335 | 333 | // |
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 | + }); |
377 | 353 | }); |
378 | 354 |
|
379 | 355 | function save() { |
|
390 | 366 | <input type="button" value="loadJSON" onclick="canvas.loadJSON(opengraphJSON);"/> |
391 | 367 | <input type="button" value="undo" onclick="canvas.undo();"/> |
392 | 368 | <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"/> |
393 | 371 | </div> |
394 | 372 | <div class="ui-layout-west"> |
395 | 373 | <div id="accordion"> |
@@ -554,11 +532,13 @@ <h3><a href="#">BPMN</a></h3> |
554 | 532 | </div> |
555 | 533 | </div> |
556 | 534 |
|
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> |
558 | 539 | </div> |
559 | 540 | <div id="canvas_slider"> |
560 | 541 | </div> |
561 | | -<img src="" id="testImg"> |
562 | 542 |
|
563 | 543 | <script type="text/javascript"> |
564 | 544 | $(function () { |
|
0 commit comments