X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSupervision%2Fbatchmode_SuperV.py;h=17d3f2487b33b99d29cdf18127a472c67718b2b3;hb=3244673fca06c4d739248a07e78bbfa3a35e5e79;hp=bdc6441acc5d954ef8bf0bdc3c34ef7bdc60eb6e;hpb=e4b2f8f88a294e451364a8b84d170a59dcbb5d3f;p=modules%2Fsuperv.git diff --git a/src/Supervision/batchmode_SuperV.py b/src/Supervision/batchmode_SuperV.py index bdc6441..17d3f24 100644 --- a/src/Supervision/batchmode_SuperV.py +++ b/src/Supervision/batchmode_SuperV.py @@ -557,14 +557,14 @@ class CNode: return self.N.DoneW() def SuspendedW( self ): return self.N.SuspendedW() - def ReRun( self ): - return self.N.ReRun() - def ReStart( self ): - return self.N.ReStart() - def ReRunAt( self , aNodeName ): - return self.N.ReRunAt( aNodeName ) - def ReStartAt( self , aNodeName ): - return self.N.ReStartAt( aNodeName ) + #def ReRun( self ): + # return self.N.ReRun() + #def ReStart( self ): + # return self.N.ReStart() + #def ReRunAt( self , aNodeName ): + # return self.N.ReRunAt( aNodeName ) + #def ReStartAt( self , aNodeName ): + # return self.N.ReStartAt( aNodeName ) def Ping( self ): return self.N.ping() def Kill( self ): @@ -1257,11 +1257,26 @@ class Graph(GNode): class GraphE(Graph): ########################################################## def __init__( self , aName ): - graph = SuperVision.GraphE( aName ) - self.G = graph - self.G.Verbose = 1 - self.N = graph - self.N.Verbose = 1 + try: + graph = SuperVision.GraphE( aName ) + except: + try: + graph = aName.G.Copy() + except: + graph = aName + if graph != None : + if graph.IsStreamGraph() : + aGraph = graph.ToStreamGraph() + if aGraph != None : + graph = StreamGraphE( aGraph ) + else : + print "Graph creation failed" + self.G = graph + self.G.Verbose = 1 + self.N = graph + self.N.Verbose = 1 + else : + print "Graph creation failed" def ToStreamGraph( self ): aGraph = self.G.ToStreamGraph() if aGraph != None : @@ -1523,8 +1538,8 @@ class Link: return self.L.Coords( index ) def destroy( self ): self.L.destroy() - - + def IsEqual( self, OtherLink ): + return self.L.IsEqual( OtherLink.L ) ########################################################## class StreamLink(Link):