Merge from OCC_development_generic_2006

Preparation of 3.2.0a1

diff --git a/Superv/Graphs/GraphGeomEssaiGates.xml b/Superv/Graphs/GraphGeomEssaiGates.xml
index 7b3ba4c6c2baea8aa9afff41c03c2c92ae5e3ce7..dfe977f8ac7bfc640560e6bab2049480ae18f121 100644 (file)
--- a/Superv/Graphs/GraphGeomEssaiGates.xml
+++ b/Superv/Graphs/GraphGeomEssaiGates.xml
@@ -5,11 +5,11 @@
    <node>
     <component-name>?</component-name>
     <interface-name>?</interface-name>
-    <node-name>aNewDataFlow_1</node-name>
+    <node-name>aNewDataFlow</node-name>
     <kind>1</kind>
     <coupled-node>?</coupled-node>
     <service>
-     <service-name>aNewDataFlow_1</service-name>
+     <service-name>aNewDataFlow</service-name>
      <inParameter-list>
       <inParameter>
        <inParameter-type>long</inParameter-type>
@@ -361,18 +361,18 @@
   </link-list>
   <data-list>
    <data>
-    <fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow</fromnode-name>
     <fromserviceparameter-name>SetStudyID__theStudyID</fromserviceparameter-name>
     <tonode-name>SetStudyID</tonode-name>
     <toserviceparameter-name>theStudyID</toserviceparameter-name>
     <data-value>
      <value-type>3</value-type>
-     <value>2</value>
+     <value>1</value>
     </data-value>
     <coord-list/>
    </data>
    <data>
-    <fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow</fromnode-name>
     <fromserviceparameter-name>MakeSphere__theX</fromserviceparameter-name>
     <tonode-name>MakeSphere</tonode-name>
     <toserviceparameter-name>theX</toserviceparameter-name>
@@ -383,7 +383,7 @@
     <coord-list/>
    </data>
    <data>
-    <fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow</fromnode-name>
     <fromserviceparameter-name>MakeSphere__theY</fromserviceparameter-name>
     <tonode-name>MakeSphere</tonode-name>
     <toserviceparameter-name>theY</toserviceparameter-name>
@@ -394,7 +394,7 @@
     <coord-list/>
    </data>
    <data>
-    <fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow</fromnode-name>
     <fromserviceparameter-name>MakeSphere__theZ</fromserviceparameter-name>
     <tonode-name>MakeSphere</tonode-name>
     <toserviceparameter-name>theZ</toserviceparameter-name>
@@ -405,7 +405,7 @@
     <coord-list/>
    </data>
    <data>
-    <fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow</fromnode-name>
     <fromserviceparameter-name>MakeSphere__theRadius</fromserviceparameter-name>
     <tonode-name>MakeSphere</tonode-name>
     <toserviceparameter-name>theRadius</toserviceparameter-name>
@@ -416,7 +416,7 @@
     <coord-list/>
    </data>
    <data>
-    <fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow</fromnode-name>
     <fromserviceparameter-name>TranslateDXDYDZ__theDX</fromserviceparameter-name>
     <tonode-name>TranslateDXDYDZ</tonode-name>
     <toserviceparameter-name>theDX</toserviceparameter-name>
@@ -427,7 +427,7 @@
     <coord-list/>
    </data>
    <data>
-    <fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow</fromnode-name>
     <fromserviceparameter-name>TranslateDXDYDZ__theDY</fromserviceparameter-name>
     <tonode-name>TranslateDXDYDZ</tonode-name>
     <toserviceparameter-name>theDY</toserviceparameter-name>
@@ -438,7 +438,7 @@
     <coord-list/>
    </data>
    <data>
-    <fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow</fromnode-name>
     <fromserviceparameter-name>TranslateDXDYDZ__theDZ</fromserviceparameter-name>
     <tonode-name>TranslateDXDYDZ</tonode-name>
     <toserviceparameter-name>theDZ</toserviceparameter-name>

diff --git a/Superv/Python/GraphGeomEssaiGates.py b/Superv/Python/GraphGeomEssaiGates.py
new file mode 100644 (file)
index 0000000..45b3cc5
--- /dev/null
+++ b/Superv/Python/GraphGeomEssaiGates.py
@@ -0,0 +1,125 @@
+
+# Generated python file of Graph aNewDataFlow
+
+from SuperV import *
+
+# Graph creation of aNewDataFlow
+def DefaNewDataFlow() :
+    aNewDataFlow = Graph( 'aNewDataFlow' )
+    aNewDataFlow.SetName( 'aNewDataFlow' )
+    aNewDataFlow.SetAuthor( '' )
+    aNewDataFlow.SetComment( '' )
+    aNewDataFlow.Coords( 0 , 0 )
+    
+    # Creation of Factory Nodes
+    
+    SetStudyID = aNewDataFlow.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'SetStudyID' )
+    SetStudyID.SetName( 'SetStudyID' )
+    SetStudyID.SetAuthor( '' )
+    SetStudyID.SetContainer( 'localhost/FactoryServer' )
+    SetStudyID.SetComment( 'SetStudyID from GEOM_Superv' )
+    SetStudyID.Coords( 14 , 104 )
+    ISetStudyIDtheStudyID = SetStudyID.GetInPort( 'theStudyID' )
+    ISetStudyIDGate = SetStudyID.GetInPort( 'Gate' )
+    OSetStudyIDGate = SetStudyID.GetOutPort( 'Gate' )
+    
+    MakeSphere = aNewDataFlow.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeSphere' )
+    MakeSphere.SetName( 'MakeSphere' )
+    MakeSphere.SetAuthor( '' )
+    MakeSphere.SetContainer( 'localhost/FactoryServer' )
+    MakeSphere.SetComment( 'MakeSphere from GEOM_Superv' )
+    MakeSphere.Coords( 198 , 32 )
+    IMakeSpheretheX = MakeSphere.GetInPort( 'theX' )
+    IMakeSpheretheY = MakeSphere.GetInPort( 'theY' )
+    IMakeSpheretheZ = MakeSphere.GetInPort( 'theZ' )
+    IMakeSpheretheRadius = MakeSphere.GetInPort( 'theRadius' )
+    IMakeSphereGate = MakeSphere.GetInPort( 'Gate' )
+    OMakeSpherereturn = MakeSphere.GetOutPort( 'return' )
+    OMakeSphereGate = MakeSphere.GetOutPort( 'Gate' )
+    
+    MakeCopy = aNewDataFlow.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeCopy' )
+    MakeCopy.SetName( 'MakeCopy' )
+    MakeCopy.SetAuthor( '' )
+    MakeCopy.SetContainer( 'localhost/FactoryServer' )
+    MakeCopy.SetComment( 'MakeCopy from GEOM_Superv' )
+    MakeCopy.Coords( 390 , 11 )
+    IMakeCopytheOriginal = MakeCopy.GetInPort( 'theOriginal' )
+    IMakeCopyGate = MakeCopy.GetInPort( 'Gate' )
+    OMakeCopyreturn = MakeCopy.GetOutPort( 'return' )
+    OMakeCopyGate = MakeCopy.GetOutPort( 'Gate' )
+    
+    MakeCopy_1 = aNewDataFlow.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeCopy' )
+    MakeCopy_1.SetName( 'MakeCopy_1' )
+    MakeCopy_1.SetAuthor( '' )
+    MakeCopy_1.SetContainer( 'localhost/FactoryServer' )
+    MakeCopy_1.SetComment( 'MakeCopy from GEOM_Superv' )
+    MakeCopy_1.Coords( 429 , 177 )
+    IMakeCopy_1theOriginal = MakeCopy_1.GetInPort( 'theOriginal' )
+    IMakeCopy_1Gate = MakeCopy_1.GetInPort( 'Gate' )
+    OMakeCopy_1return = MakeCopy_1.GetOutPort( 'return' )
+    OMakeCopy_1Gate = MakeCopy_1.GetOutPort( 'Gate' )
+    
+    TranslateDXDYDZ = aNewDataFlow.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'TranslateDXDYDZ' )
+    TranslateDXDYDZ.SetName( 'TranslateDXDYDZ' )
+    TranslateDXDYDZ.SetAuthor( '' )
+    TranslateDXDYDZ.SetContainer( 'localhost/FactoryServer' )
+    TranslateDXDYDZ.SetComment( 'TranslateDXDYDZ from GEOM_Superv' )
+    TranslateDXDYDZ.Coords( 615 , 11 )
+    ITranslateDXDYDZtheObject = TranslateDXDYDZ.GetInPort( 'theObject' )
+    ITranslateDXDYDZtheDX = TranslateDXDYDZ.GetInPort( 'theDX' )
+    ITranslateDXDYDZtheDY = TranslateDXDYDZ.GetInPort( 'theDY' )
+    ITranslateDXDYDZtheDZ = TranslateDXDYDZ.GetInPort( 'theDZ' )
+    ITranslateDXDYDZGate = TranslateDXDYDZ.GetInPort( 'Gate' )
+    OTranslateDXDYDZreturn = TranslateDXDYDZ.GetOutPort( 'return' )
+    OTranslateDXDYDZGate = TranslateDXDYDZ.GetOutPort( 'Gate' )
+    
+    MakeFuse = aNewDataFlow.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeFuse' )
+    MakeFuse.SetName( 'MakeFuse' )
+    MakeFuse.SetAuthor( '' )
+    MakeFuse.SetContainer( 'localhost/FactoryServer' )
+    MakeFuse.SetComment( 'MakeFuse from GEOM_Superv' )
+    MakeFuse.Coords( 806 , 33 )
+    IMakeFusetheShape1 = MakeFuse.GetInPort( 'theShape1' )
+    IMakeFusetheShape2 = MakeFuse.GetInPort( 'theShape2' )
+    IMakeFuseGate = MakeFuse.GetInPort( 'Gate' )
+    OMakeFusereturn = MakeFuse.GetOutPort( 'return' )
+    OMakeFuseGate = MakeFuse.GetOutPort( 'Gate' )
+    
+    # Creation of Links
+    LSetStudyIDGateMakeSphereGate = aNewDataFlow.Link( OSetStudyIDGate , IMakeSphereGate )
+    
+    LMakeSpherereturnMakeCopytheOriginal = aNewDataFlow.Link( OMakeSpherereturn , IMakeCopytheOriginal )
+    
+    LMakeSpherereturnMakeCopy_1theOriginal = aNewDataFlow.Link( OMakeSpherereturn , IMakeCopy_1theOriginal )
+    
+    LMakeCopyreturnTranslateDXDYDZtheObject = aNewDataFlow.Link( OMakeCopyreturn , ITranslateDXDYDZtheObject )
+    
+    LMakeCopyGateMakeCopy_1Gate = aNewDataFlow.Link( OMakeCopyGate , IMakeCopy_1Gate )
+    LMakeCopyGateMakeCopy_1Gate.AddCoord( 1 , 382 , 174 )
+    LMakeCopyGateMakeCopy_1Gate.AddCoord( 2 , 552 , 147 )
+    
+    LMakeCopy_1returnMakeFusetheShape2 = aNewDataFlow.Link( OMakeCopy_1return , IMakeFusetheShape2 )
+    LMakeCopy_1returnMakeFusetheShape2.AddCoord( 1 , 784 , 199 )
+    
+    LMakeCopy_1GateTranslateDXDYDZGate = aNewDataFlow.Link( OMakeCopy_1Gate , ITranslateDXDYDZGate )
+    
+    LTranslateDXDYDZreturnMakeFusetheShape1 = aNewDataFlow.Link( OTranslateDXDYDZreturn , IMakeFusetheShape1 )
+    
+    LTranslateDXDYDZGateMakeFuseGate = aNewDataFlow.Link( OTranslateDXDYDZGate , IMakeFuseGate )
+    
+    # Input datas
+    ISetStudyIDtheStudyID.Input( 1 )
+    IMakeSpheretheX.Input( 0 )
+    IMakeSpheretheY.Input( 0 )
+    IMakeSpheretheZ.Input( 0 )
+    IMakeSpheretheRadius.Input( 20 )
+    ITranslateDXDYDZtheDX.Input( 10 )
+    ITranslateDXDYDZtheDY.Input( 10 )
+    ITranslateDXDYDZtheDZ.Input( 10 )
+    
+    # Output Ports of the graph
+    #OMakeFusereturn = MakeFuse.GetOutPort( 'return' )
+    return aNewDataFlow
+
+
+aNewDataFlow = DefaNewDataFlow()

diff --git a/Superv/Python/GraphInLinesUnValid.py b/Superv/Python/GraphInLinesUnValid.py
index c888f5e63c65a6ed2959093e9ace179416dec10e..276b59580a0270e6dc7decb5d5707fb53ca0aaf6 100755 (executable)
--- a/Superv/Python/GraphInLinesUnValid.py
+++ b/Superv/Python/GraphInLinesUnValid.py
@@ -70,11 +70,11 @@ Adda.AddCoord( 2 , 7 , 332 )
 Adda.AddCoord( 3 , 645 , 334 )
 Adda.AddCoord( 4 , 645 , 204 )
 
-statvalid = GraphInLinesUnValid.IsValid()
-if statvalid != 0 :
-    print "ERROR : GraphInLinesUnValid should not be valid"
+statexec = GraphInLinesUnValid.IsExecutable()
+if statexec != 0 :
+    print "ERROR : GraphInLinesUnValid should not be executable"
 else :
-    print "Ok : GraphInLinesUnValid is not valid"
+    print "Ok : GraphInLinesUnValid is not executable"
 
 # Creation of Output variables
 statrun = GraphInLinesUnValid.Run()