Author: derek Date: Thu Sep 7 17:56:10 2006 New Revision: 79 Removed: sofaswitch/trunk/callflow/autom4te.cache/ Modified: sofaswitch/trunk/callflow/src/shapelist.cpp Log: Update things. Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Thu Sep 7 17:56:10 2006 @@ -193,11 +193,7 @@ graphFile.Clear(); - graphFile.AddLine("#!/usr/bin/python"); - graphFile.AddLine(" "); - graphFile.AddLine("data = {"); - - + graphFile.AddLine("{"); MyListShapes::iterator it = begin(); while (it != end()) { DndShape *thisShape = it->second; @@ -207,9 +203,6 @@ it++; } graphFile.AddLine("}"); - - graphFile.AddLine(" "); - graphFile.Write(); graphFile.Close(); @@ -313,13 +306,16 @@ file.AddLine(" "); file.AddLine(" def setGraphData(self, graphFile): "); - file.AddLine(" import graphFile "); - file.AddLine(" self.data = graphFile.data "); + file.AddLine(" self.gd=open(graphFile, \"r\"); "); + file.AddLine(" self.gdc=self.gd.read() "); + file.AddLine(" self.data = evel(self.gdc) "); + file.AddLine(" self.gd.close() "); file.AddLine(" "); file.AddLine(" self.firstNode = None "); file.AddLine(" for k,v in aa.data.iteritems(): "); file.AddLine(" if k[:16] == \"Start_Processing\": "); file.AddLine(" self.firstNode = k "); + file.AddLine(" print \"first node is \", k "); file.AddLine(" break "); file.AddLine(" self.timeout = reactor.callLater(0, self.startTimerExpired, \"graph\")"); file.AddLine(" ");