[spade2] r2234 committed - -Changed sequencediagrams to Javascript API. Old API was not working. ...

[spa...@googlecode.com]

Revision: 2234
Author: jpalanca
Date: Fri Nov 11 08:02:51 2011
Log: -Changed sequencediagrams to Javascript API. Old API was not
working. Still need to improve it. Websequencediagrams.com does not support
large diagrams.
http://code.google.com/p/spade2/source/detail?r=2234

Deleted:
/trunk/spade/diagram.py
Modified:
/trunk/spade/Agent.py
/trunk/templates/messages.pyra

=======================================
--- /trunk/spade/diagram.py Mon Jun 28 09:33:42 2010
+++ /dev/null
@@ -1,24 +0,0 @@
-def getSequenceDiagram( text="Alice-->Bob", style = 'napkin' ):
- import urllib
- import re
- request = {}
- request["message"] = text
- request["style"] = style
-
- url = urllib.urlencode(request)
-
- f = urllib.urlopen("http://www.websequencediagrams.com/", url)
- line = f.readline()
- f.close()
-
-
- expr = re.compile("(\?img=[a-zA-Z0-9]+)")
- m = expr.search(line)
-
- if m == None:
- #print "Invalid response from server."
- return False
-
- #urllib.urlretrieve("http://www.websequencediagrams.com/" +
m.group(0),outputFile )
-
- return "http://www.websequencediagrams.com/"+str(m.group(0))
=======================================
--- /trunk/spade/Agent.py Fri Jul 30 06:42:53 2010
+++ /trunk/spade/Agent.py Fri Nov 11 08:02:51 2011
@@ -247,14 +247,7 @@
mess[index]=(ts,strm)
index+=1

- try:
- import diagram
- self.DEBUG("Generating diagram with: " + str(agents) + " and "
+ msc)
- url = diagram.getSequenceDiagram(msc,style="napkin")
- except:
- url=False
-
- return "messages.pyra",
{"name":self.getName(), "messages":mess, "diagram":
url, "agentslist":agentslist}
+ return "messages.pyra",
{"name":self.getName(), "messages":mess, "diagram":
msc, "agentslist":agentslist}

def WUIController_search(self, query):

=======================================
--- /trunk/templates/messages.pyra Thu Jul 8 05:33:24 2010
+++ /trunk/templates/messages.pyra Fri Nov 11 08:02:51 2011
@@ -86,7 +86,9 @@
<h1>@!name!@</h1>

<!--(if diagram!=False)-->
- <img src="@!diagram!@" border=0 alt="Sequence Diagram"></img>
+ <div class=wsd wsd_style="napkin"><pre>
+ @!diagram!@
+ </pre></div><script type="text/javascript"
src="http://www.websequencediagrams.com/service.js"></script>
<!--(end)-->

<div style="display:none">