From: mkr Date: Mon, 23 Jan 2006 12:50:00 +0000 (+0000) Subject: Fix for bug IPAL11320 : Reimplemented "FNode()" method in development version doesn... X-Git-Tag: mergeto_trunk_07Feb06~20 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f987f5cac20c41ce810bf9e560ff159c841092f3;p=modules%2Fsuperv.git Fix for bug IPAL11320 : Reimplemented "FNode()" method in development version doesn't support "old" scripts. --- diff --git a/src/Supervision/SuperV.py b/src/Supervision/SuperV.py index 384509f..69a38e3 100644 --- a/src/Supervision/SuperV.py +++ b/src/Supervision/SuperV.py @@ -590,6 +590,8 @@ class FNode(CNode): return self.N.SetInterfaceName( anInterfaceName ) def SetContainer( self , aComputer ): return self.N.SetContainer( aComputer ) + def IsCimpl( self ): + return self.N.isCimpl ########################################################## class INode(CNode): @@ -797,13 +799,27 @@ class Graph(GNode): #if SuperVision.Swig : #aService = Service_Swig( aService ) return self.FNode( aComponent , anInterface , aService ) + def FNodeImpl( self , aComponent , anInterface , aService, isCimpl ): + NodeComponent = modulecatalog.GetComponent( aComponent ) + aService = NodeComponent.GetService( anInterface , aService ) + aNode = self.G.FNode( aComponent , anInterface , aService, isCimpl ) + if aNode != None : + aNode.isCimpl = isCimpl + myNode = FNode( aNode , self.G.Verbose ) + return myNode + ErrMsg = "Failed to create a Node with Service " + aService.ServiceName + if self.G.Verbose : + print ErrMsg + return aNode def FNode( self , aComponent , anInterface , aService ): + # create node with C++ implementation type by default NodeComponent = modulecatalog.GetComponent( aComponent ) aService = NodeComponent.GetService( anInterface , aService ) #if SuperVision.Swig : #aService = Service_Swig( aService ) - aNode = self.G.FNode( aComponent , anInterface , aService ) + aNode = self.G.FNode( aComponent , anInterface , aService, 1 ) if aNode != None : + aNode.isCimpl = 1 myNode = FNode( aNode , self.G.Verbose ) return myNode ErrMsg = "Failed to create a Node with Service " + aService.ServiceName diff --git a/src/Supervision/batchmode_SuperV.py b/src/Supervision/batchmode_SuperV.py index ef2749d..9dfb5e0 100644 --- a/src/Supervision/batchmode_SuperV.py +++ b/src/Supervision/batchmode_SuperV.py @@ -607,6 +607,8 @@ class FNode(CNode): return self.N.SetInterfaceName( anInterfaceName ) def SetContainer( self , aComputer ): return self.N.SetContainer( aComputer ) + def IsCimpl( self ): + return self.N.isCimpl ########################################################## class INode(CNode): @@ -814,13 +816,27 @@ class Graph(GNode): #if SuperVision.Swig : #aService = Service_Swig( aService ) return self.FNode( aComponent , anInterface , aService ) + def FNodeImpl( self , aComponent , anInterface , aService, isCimpl ): + NodeComponent = modulecatalog.GetComponent( aComponent ) + aService = NodeComponent.GetService( anInterface , aService ) + aNode = self.G.FNode( aComponent , anInterface , aService, isCimpl ) + if aNode != None : + aNode.isCimpl = isCimpl + myNode = FNode( aNode , self.G.Verbose ) + return myNode + ErrMsg = "Failed to create a Node with Service " + aService.ServiceName + if self.G.Verbose : + print ErrMsg + return aNode def FNode( self , aComponent , anInterface , aService ): + # create node with C++ implementation type by default NodeComponent = modulecatalog.GetComponent( aComponent ) aService = NodeComponent.GetService( anInterface , aService ) #if SuperVision.Swig : #aService = Service_Swig( aService ) - aNode = self.G.FNode( aComponent , anInterface , aService ) + aNode = self.G.FNode( aComponent , anInterface , aService, 1 ) if aNode != None : + aNode.isCimpl = 1 myNode = FNode( aNode , self.G.Verbose ) return myNode ErrMsg = "Failed to create a Node with Service " + aService.ServiceName