Author: sleon
Date: 2006-01-15 20:01:58 +0000 (Sun, 15 Jan 2006)
New Revision: 7861
Modified:
trunk/apps/freeviz/ciclegraph.py
trunk/apps/freeviz/gen.py
trunk/apps/freeviz/handler.py
trunk/apps/freeviz/server.py
Log:
circle graph and over things
Modified: trunk/apps/freeviz/ciclegraph.py
===================================================================
--- trunk/apps/freeviz/ciclegraph.py 2006-01-14 22:07:51 UTC (rev 7860)
+++ trunk/apps/freeviz/ciclegraph.py 2006-01-15 20:01:58 UTC (rev 7861)
@@ -23,7 +23,7 @@
return []
def gen(con):
- nodes = handler.get_activenodes(con)
+ nodes = handler.get_lastgoodnodes(con)
node_pairs = list(db.NodePair.select())
im = Image.new('P',(600,600))
da = ImageDraw.Draw(im)
@@ -40,7 +40,7 @@
r = im.size[0]/2 - 20
u = 10
- da.chord((20, 20, im.size[0] -20, im.size[1] - 20), 0, 360,
outline='black')
+ da.chord((20, 20, im.size[0] -20, im.size[1] - 20), 0, 360,
outline='#C1D72B')
#for i in nodes:
Modified: trunk/apps/freeviz/gen.py
===================================================================
--- trunk/apps/freeviz/gen.py 2006-01-14 22:07:51 UTC (rev 7860)
+++ trunk/apps/freeviz/gen.py 2006-01-15 20:01:58 UTC (rev 7861)
@@ -105,7 +105,7 @@
if not nstate:
print "got empty nstate list"
- g=pydot.Dot(type='digraph', labelloc='tl', label='Nodes: %s,
Edges: %s, Time: %s' % (nnum, enum, datetime.now()) )
+ g=pydot.Dot(type='digraph', labelloc='tl', label='Nodes: %s,
Edges: %s, Time: %s' % (nnum, enum, datetime.now()) , overlap='scale' ,
splines='true', mindist='1.0')
lastgoodver = db.getLastGoodVer(trans)
#counts edges for a node
@@ -167,8 +167,9 @@
elif node_pair.backoffmax_node1 != '5000' or
node_pair.backoffmax_node2 != '5000':
edgecolor= self.edgeCRITICAL
#print "adding %s-%s" %
(node_pair.node1.name,node_pair.node2.name)
- gedge = pydot.Edge(node_pair.node1.name ,
node_pair.node2.name, color=edgecolor , fontcolor=edgecolor,
- label='d: %0.3f' %
distance, fontsize='9.5',arrowhead='none')
+ gedge = pydot.Edge(node_pair.node1.name ,
node_pair.node2.name, color=edgecolor,
+ fontcolor=edgecolor, label='d: %0.3f' %
distance, fontsize='9.5',arrowhead='none')
+
#node1 is tail, node2 is head
if edgecolor == self.edgeBLOCKED:
if node_pair.backoffcur_node1 != '0':
@@ -202,8 +203,9 @@
else:
print "oldnstate empty!"
- g.write_png('/tmp/output.png',prog='dot')
-
+ g.write_png('/tmp/output.png',prog='circo')
+ g.size="10,10"
+ g.write_png('/tmp/output_small.png',prog='circo')
self.oldnstate = nstate
# g.write_dot('bla.dot')
Modified: trunk/apps/freeviz/handler.py
===================================================================
--- trunk/apps/freeviz/handler.py 2006-01-14 22:07:51 UTC (rev 7860)
+++ trunk/apps/freeviz/handler.py 2006-01-15 20:01:58 UTC (rev 7861)
@@ -53,6 +53,17 @@
return active_nodes
+def get_lastgoodnodes(trans):
+ anodes = get_activenodes(trans)
+ lastGoodVer = db.getLastGoodVer(trans)
+ lgnodes = []
+
+ for anode in anodes:
+ if anode.version >= lastGoodVer:
+ lgnodes.append(anode)
+
+ return lgnodes
+
#time in seconds since epoch
def curtime():
return time.time()
Modified: trunk/apps/freeviz/server.py
===================================================================
--- trunk/apps/freeviz/server.py 2006-01-14 22:07:51 UTC (rev 7860)
+++ trunk/apps/freeviz/server.py 2006-01-15 20:01:58 UTC (rev 7861)
@@ -25,9 +25,13 @@
while 1:
Base.vlock.acquire()
print "Hanlding harvested data"
- for chunk in Base.chunks:
- handler.handle(chunk,trans)
- if Base.chunks: print "COMMITED"
+ try:
+ for chunk in Base.chunks:
+
+ handler.handle(chunk,trans)
+ if Base.chunks: print "COMMITED"
+ except Exception:
+ Base.vlock.release()
Base.chunks=[]
print "Done"
Base.vlock.release()
