public/js/fluo-can.js @@ -404,21 +404,12 @@ var FluoCan = function() { var HANDLERS = { 'process-definition': ProcessDefinitionHandler, 'sequence': VerticalHandler, - //'concurrence': ConcurrenceHandler, + 'concurrence': ConcurrenceHandler, 'if': HorizontalHandler //'participant': ParticipantHandler }; - function newCan (id, width, height) { - var can = document.createElement('canvas'); - can.id = id; - can.setAttribute('width', width); - can.setAttribute('height', height); - return can; - } - function renderExpression (context, exp, expid) { - if ( ! expid) expid = "0"; return getHandler(exp).render(context, exp, expid); } @@ -496,7 +487,7 @@ c.scale(0.75, 0.75); //c.stroke(); c.translate(300, 1); -FluoCan.renderExpression(c, flow1); +FluoCan.renderExpression(c, flow1, '0'); var cfluo = FluoCan.newCan('fluo', 600, 400); document.body.appendChild(cfluo); @@ -513,7 +504,7 @@ c.scale(0.75, 0.75); c.translate(4, 200); c.rotate(-Math.PI/2); c.fluoVertical = false; -FluoCan.renderExpression(c, flow1); +FluoCan.renderExpression(c, flow1, '0'); </script> experimental/can.html @@ -16,13 +16,10 @@ get "/" do <meta http-equiv="content-type" content="text/html; charset=UTF-8"> - <script src="/js/prototype.js?nocache=#{Time.now.to_f}"></script> - <script src="/js/fluo-canvas.js?nocache=#{Time.now.to_f}"></script> - <script src="/js/fluo.js?nocache=#{Time.now.to_f}"></script> + <script src="/js/fluo-can.js?nocache=#{Time.now.to_f}"></script> <script src="/js/fluo-dial.js?nocache=#{Time.now.to_f}"></script> <script src="/js/fluo-tred.js?nocache=#{Time.now.to_f}"></script> - <link href="/css/fluo.css?nocache=#{Time.now.to_f}" rel="Stylesheet" type="text/css" /> <link href="/css/fluo-dial.css?nocache=#{Time.now.to_f}" rel="Stylesheet" type="text/css" /> <link href="/css/fluo-tred.css?nocache=#{Time.now.to_f}" rel="Stylesheet" type="text/css" /> @@ -35,7 +32,7 @@ get "/" do </style> </head> -<body onresize="Fluo.tagExpressionsWithWorkitems('fluo', [ '#{@wi}' ]);"> +<body> <div> <div style="float:left; width: 49%"> @@ -49,31 +46,23 @@ get "/" do var tout = document.getElementById("tred__out"); Tred.onChange = function (jsonTree) { - Fluo.renderExpression('fluo', null, jsonTree); + FluoCan.renderExpression('fluo', jsonTree); } </script> </div> -<div style="float:left; width: 49%"> +<div id="leftpane" style="float:left; width: 49%"> - <div id="fluo" style="width: 100%"> - </div> - <script> - Fluo.renderExpression('fluo', null, #{@prep}); - Fluo.tagExpressionsWithWorkitems('fluo', [ '#{@wi}' ]); - </script> - - <br/> - <br/> -  + <canvas id="fluo" width="500" height="800"></canvas> </div> </div> +<script> + var c = document.getElementById('fluo').getContext("2d"); + FluoCan.renderExpression(c, #{@prep}); + //Fluo.tagExpressionsWithWorkitems('fluo', [ '#{@wi}' ]); +</script> + </body> </html> @@ -105,42 +94,6 @@ get "/defs" do } end -get "/fluo" do - - prepare - - %{ -<html> -<head> - <title>fluo bench</title> - - <meta http-equiv="content-type" content="text/html; charset=UTF-8"> - - <script src="/js/prototype.js?nocache=#{Time.now.to_f}"></script> - <script src="/js/fluo-canvas.js?nocache=#{Time.now.to_f}"></script> - <script src="/js/fluo.js?nocache=#{Time.now.to_f}"></script> - - <link href="/css/fluo.css?nocache=#{Time.now.to_f}" rel="Stylesheet" type="text/css" /> -</head> -<body onresize="Fluo.tagExpressionsWithWorkitems('fluo', [ '#{@wi}' ]);"> -<div id="fluo" style="width: 50%"> -</div> -<script> - Fluo.renderExpression('fluo', null, #{@prep}); - Fluo.tagExpressionsWithWorkitems('fluo', [ '#{@wi}' ]); -</script> - -<br/> -<br/> -<div class="fluo_text"> - <a href="#" onclick="Fluo.toggleMinorExpressions('fluo'); return false;">show / hide minor expressions</a> -</div> -</body> -</html> - } -end - - def prepare @pdef = request['pdef'] || 'pdef.rb' lib/ruote-fluo.rb public/pdef_ttt.rb 6e0a1684f61a0eed8baa77b8ec7ffbd789c18667 John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote-fluo/commit/4d3959d2cd5e8f9c801bf7d67a2b1a3c4abb9507 4d3959d2cd5e8f9c801bf7d67a2b1a3c4abb9507

2008-07-07T01:38:23-07:00

switching to the new, simpler, 1 canvas for all fluo ecb3502787fdd20d0ba57fc0430227ea63b85df2 John Mettraux jmettraux@gmail.com