Join modifications from branch OCC_development_for_3_2_0a2

diff --git a/MedFiles/Darcy3_3D_H_10x10x10_2.med b/MedFiles/Darcy3_3D_H_10x10x10_2.med
new file mode 100644 (file)
index 0000000..2915317
Binary files /dev/null and b/MedFiles/Darcy3_3D_H_10x10x10_2.med differ

diff --git a/MedFiles/Mistrat_import22.med b/MedFiles/Mistrat_import22.med
new file mode 100644 (file)
index 0000000..6729b94
Binary files /dev/null and b/MedFiles/Mistrat_import22.med differ

diff --git a/MedFiles/TimeStamps_import22.med b/MedFiles/TimeStamps_import22.med
new file mode 100644 (file)
index 0000000..2f86799
Binary files /dev/null and b/MedFiles/TimeStamps_import22.med differ

diff --git a/MedFiles/carre_en_quad4_import22.med b/MedFiles/carre_en_quad4_import22.med
new file mode 100644 (file)
index 0000000..e72db68
Binary files /dev/null and b/MedFiles/carre_en_quad4_import22.med differ

diff --git a/MedFiles/carre_en_quad4_seg2_import22.med b/MedFiles/carre_en_quad4_seg2_import22.med
new file mode 100644 (file)
index 0000000..847cc70
Binary files /dev/null and b/MedFiles/carre_en_quad4_seg2_import22.med differ

diff --git a/MedFiles/cas_defaut_domaine_fluide.med b/MedFiles/cas_defaut_domaine_fluide.med
new file mode 100644 (file)
index 0000000..f200a4f
Binary files /dev/null and b/MedFiles/cas_defaut_domaine_fluide.med differ

diff --git a/MedFiles/cube_hexa8_import22.med b/MedFiles/cube_hexa8_import22.med
new file mode 100644 (file)
index 0000000..751abc5
Binary files /dev/null and b/MedFiles/cube_hexa8_import22.med differ

diff --git a/MedFiles/cube_hexa8_quad4_import22.med b/MedFiles/cube_hexa8_quad4_import22.med
new file mode 100644 (file)
index 0000000..1a8f393
Binary files /dev/null and b/MedFiles/cube_hexa8_quad4_import22.med differ

diff --git a/MedFiles/elle_3D_HPr_10x10x10_2.med b/MedFiles/elle_3D_HPr_10x10x10_2.med
new file mode 100644 (file)
index 0000000..fe4b21b
Binary files /dev/null and b/MedFiles/elle_3D_HPr_10x10x10_2.med differ

diff --git a/MedFiles/elle_3D_HPr_2x2x2_2.med b/MedFiles/elle_3D_HPr_2x2x2_2.med
new file mode 100644 (file)
index 0000000..7ddd022
Binary files /dev/null and b/MedFiles/elle_3D_HPr_2x2x2_2.med differ

diff --git a/MedFiles/elle_3D_HPr_4x4x4_2.med b/MedFiles/elle_3D_HPr_4x4x4_2.med
new file mode 100644 (file)
index 0000000..690d3ee
Binary files /dev/null and b/MedFiles/elle_3D_HPr_4x4x4_2.med differ

diff --git a/MedFiles/maillage_UniSegFam_import22.med b/MedFiles/maillage_UniSegFam_import22.med
new file mode 100644 (file)
index 0000000..57b9f75
Binary files /dev/null and b/MedFiles/maillage_UniSegFam_import22.med differ

diff --git a/MedFiles/mesh_import22.med b/MedFiles/mesh_import22.med
new file mode 100755 (executable)
index 0000000..8450043
Binary files /dev/null and b/MedFiles/mesh_import22.med differ

diff --git a/MedFiles/pointe_import22.med b/MedFiles/pointe_import22.med
new file mode 100644 (file)
index 0000000..5c4221a
Binary files /dev/null and b/MedFiles/pointe_import22.med differ

diff --git a/MedFiles/poly3D.med b/MedFiles/poly3D.med
new file mode 100644 (file)
index 0000000..5a42c3f
Binary files /dev/null and b/MedFiles/poly3D.med differ

diff --git a/MedFiles/polyedres.med b/MedFiles/polyedres.med
new file mode 100644 (file)
index 0000000..830e53f
Binary files /dev/null and b/MedFiles/polyedres.med differ

diff --git a/MedFiles/polygones.med b/MedFiles/polygones.med
new file mode 100644 (file)
index 0000000..a1c404d
Binary files /dev/null and b/MedFiles/polygones.med differ

diff --git a/MedFiles/recoll_bord.med b/MedFiles/recoll_bord.med
new file mode 100644 (file)
index 0000000..5b44057
Binary files /dev/null and b/MedFiles/recoll_bord.med differ

diff --git a/MedFiles/test_2D.med b/MedFiles/test_2D.med
new file mode 100644 (file)
index 0000000..7e55f64
Binary files /dev/null and b/MedFiles/test_2D.med differ

diff --git a/MedFiles/test_hydro_darcy1a_out.med b/MedFiles/test_hydro_darcy1a_out.med
new file mode 100644 (file)
index 0000000..df24a1e
Binary files /dev/null and b/MedFiles/test_hydro_darcy1a_out.med differ

diff --git a/Superv/Graphs/MacroWithGeomGates.xml b/Superv/Graphs/MacroWithGeomGates.xml
new file mode 100644 (file)
index 0000000..928880f
--- /dev/null
+++ b/Superv/Graphs/MacroWithGeomGates.xml
@@ -0,0 +1,849 @@
+<!DOCTYPE SuperGraph>
+<supergraph>
+ <dataflow>
+  <info-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>aNewDataFlow_1_4</node-name>
+    <kind>1</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>aNewDataFlow_1_4</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Macro_aNewDataFlow_1__sum__a</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Macro_aNewDataFlow_1__sum__b</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>TranslateDXDYDZ__theDX</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>TranslateDXDYDZ__theDZ</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeBox__theX1</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeBox__theY1</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeBox__theZ1</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeBox__theX2</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeBox__theY2</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeBox__theZ2</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeSphere__theX</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeSphere__theY</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeSphere__theZ</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>MakeSphere__theRadius</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>SetStudyID__theStudyID</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>GEOM_Object</outParameter-type>
+       <outParameter-name>MakeFuse_1__return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>29/10/2004 - 14:37:33</creation-date>
+    <lastmodification-date>3/3/2006 - 17:3:13</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>?</comment>
+    <x-position>0</x-position>
+    <y-position>0</y-position>
+   </node>
+  </info-list>
+  <node-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>Macro_aNewDataFlow_1</node-name>
+    <kind>10</kind>
+    <coupled-node>aNewDataFlow_1_1_2</coupled-node>
+    <service>
+     <service-name>aNewDataFlow_1</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>sum__a</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>sum__b</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Mult__b</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list>
+     <PyFunction>
+      <FuncName>?</FuncName>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>3.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>Macro Node</comment>
+    <x-position>718</x-position>
+    <y-position>263</y-position>
+   </node>
+   <node>
+    <component-name>GEOM_Superv</component-name>
+    <interface-name>GEOM_Superv</interface-name>
+    <node-name>TranslateDXDYDZ</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>TranslateDXDYDZ</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>GEOM_Object</inParameter-type>
+       <inParameter-name>theObject</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theDX</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theDY</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theDZ</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>GEOM_Object</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>TranslateDXDYDZ from GEOM_Superv</comment>
+    <x-position>1051</x-position>
+    <y-position>118</y-position>
+   </node>
+   <node>
+    <component-name>GEOM_Superv</component-name>
+    <interface-name>GEOM_Superv</interface-name>
+    <node-name>MakeCopy</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>MakeCopy</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>GEOM_Object</inParameter-type>
+       <inParameter-name>theOriginal</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>GEOM_Object</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>MakeCopy from GEOM_Superv</comment>
+    <x-position>656</x-position>
+    <y-position>101</y-position>
+   </node>
+   <node>
+    <component-name>GEOM_Superv</component-name>
+    <interface-name>GEOM_Superv</interface-name>
+    <node-name>MakeBox</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>MakeBox</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theX1</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theY1</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theZ1</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theX2</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theY2</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theZ2</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>GEOM_Object</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>MakeBox from GEOM_Superv</comment>
+    <x-position>219</x-position>
+    <y-position>14</y-position>
+   </node>
+   <node>
+    <component-name>GEOM_Superv</component-name>
+    <interface-name>GEOM_Superv</interface-name>
+    <node-name>MakeCopy_1</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>MakeCopy</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>GEOM_Object</inParameter-type>
+       <inParameter-name>theOriginal</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>GEOM_Object</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>MakeCopy from GEOM_Superv</comment>
+    <x-position>1286</x-position>
+    <y-position>14</y-position>
+   </node>
+   <node>
+    <component-name>GEOM_Superv</component-name>
+    <interface-name>GEOM_Superv</interface-name>
+    <node-name>MakeFuse</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>MakeFuse</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>GEOM_Object</inParameter-type>
+       <inParameter-name>theShape1</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>GEOM_Object</inParameter-type>
+       <inParameter-name>theShape2</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>GEOM_Object</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>MakeFuse from GEOM_Superv</comment>
+    <x-position>1549</x-position>
+    <y-position>146</y-position>
+   </node>
+   <node>
+    <component-name>GEOM_Superv</component-name>
+    <interface-name>GEOM_Superv</interface-name>
+    <node-name>MakeSphere</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>MakeSphere</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theX</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theY</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theZ</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>theRadius</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>GEOM_Object</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>MakeSphere from GEOM_Superv</comment>
+    <x-position>1749</x-position>
+    <y-position>41</y-position>
+   </node>
+   <node>
+    <component-name>GEOM_Superv</component-name>
+    <interface-name>GEOM_Superv</interface-name>
+    <node-name>MakeFuse_1</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>MakeFuse</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>GEOM_Object</inParameter-type>
+       <inParameter-name>theShape1</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>GEOM_Object</inParameter-type>
+       <inParameter-name>theShape2</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>GEOM_Object</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>MakeFuse from GEOM_Superv</comment>
+    <x-position>2007</x-position>
+    <y-position>210</y-position>
+   </node>
+   <node>
+    <component-name>GEOM_Superv</component-name>
+    <interface-name>GEOM_Superv</interface-name>
+    <node-name>SetStudyID</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>SetStudyID</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>theStudyID</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list/>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>SetStudyID from GEOM_Superv</comment>
+    <x-position>7</x-position>
+    <y-position>269</y-position>
+   </node>
+  </node-list>
+  <link-list>
+   <link>
+    <fromnode-name>Macro_aNewDataFlow_1</fromnode-name>
+    <fromserviceparameter-name>Mult__b</fromserviceparameter-name>
+    <tonode-name>TranslateDXDYDZ</tonode-name>
+    <toserviceparameter-name>theDY</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>TranslateDXDYDZ</fromnode-name>
+    <fromserviceparameter-name>return</fromserviceparameter-name>
+    <tonode-name>MakeFuse</tonode-name>
+    <toserviceparameter-name>theShape1</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>TranslateDXDYDZ</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>MakeCopy_1</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeCopy</fromnode-name>
+    <fromserviceparameter-name>return</fromserviceparameter-name>
+    <tonode-name>TranslateDXDYDZ</tonode-name>
+    <toserviceparameter-name>theObject</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeCopy</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>TranslateDXDYDZ</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeBox</fromnode-name>
+    <fromserviceparameter-name>return</fromserviceparameter-name>
+    <tonode-name>MakeCopy</tonode-name>
+    <toserviceparameter-name>theOriginal</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeBox</fromnode-name>
+    <fromserviceparameter-name>return</fromserviceparameter-name>
+    <tonode-name>MakeCopy_1</tonode-name>
+    <toserviceparameter-name>theOriginal</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeBox</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>MakeCopy</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeCopy_1</fromnode-name>
+    <fromserviceparameter-name>return</fromserviceparameter-name>
+    <tonode-name>MakeFuse</tonode-name>
+    <toserviceparameter-name>theShape2</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeCopy_1</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>MakeFuse</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeFuse</fromnode-name>
+    <fromserviceparameter-name>return</fromserviceparameter-name>
+    <tonode-name>MakeFuse_1</tonode-name>
+    <toserviceparameter-name>theShape1</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeFuse</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>MakeSphere</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeSphere</fromnode-name>
+    <fromserviceparameter-name>return</fromserviceparameter-name>
+    <tonode-name>MakeFuse_1</tonode-name>
+    <toserviceparameter-name>theShape2</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>MakeSphere</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>MakeFuse_1</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>SetStudyID</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>MakeBox</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+  </link-list>
+  <data-list>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>Macro_aNewDataFlow_1__sum__a</fromserviceparameter-name>
+    <tonode-name>Macro_aNewDataFlow_1</tonode-name>
+    <toserviceparameter-name>sum__a</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>1</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>Macro_aNewDataFlow_1__sum__b</fromserviceparameter-name>
+    <tonode-name>Macro_aNewDataFlow_1</tonode-name>
+    <toserviceparameter-name>sum__b</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>2</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>TranslateDXDYDZ__theDX</fromserviceparameter-name>
+    <tonode-name>TranslateDXDYDZ</tonode-name>
+    <toserviceparameter-name>theDX</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>25</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>TranslateDXDYDZ__theDZ</fromserviceparameter-name>
+    <tonode-name>TranslateDXDYDZ</tonode-name>
+    <toserviceparameter-name>theDZ</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>25</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeBox__theX1</fromserviceparameter-name>
+    <tonode-name>MakeBox</tonode-name>
+    <toserviceparameter-name>theX1</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>0</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeBox__theY1</fromserviceparameter-name>
+    <tonode-name>MakeBox</tonode-name>
+    <toserviceparameter-name>theY1</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>0</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeBox__theZ1</fromserviceparameter-name>
+    <tonode-name>MakeBox</tonode-name>
+    <toserviceparameter-name>theZ1</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>0</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeBox__theX2</fromserviceparameter-name>
+    <tonode-name>MakeBox</tonode-name>
+    <toserviceparameter-name>theX2</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>50</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeBox__theY2</fromserviceparameter-name>
+    <tonode-name>MakeBox</tonode-name>
+    <toserviceparameter-name>theY2</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>50</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeBox__theZ2</fromserviceparameter-name>
+    <tonode-name>MakeBox</tonode-name>
+    <toserviceparameter-name>theZ2</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>50</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeSphere__theX</fromserviceparameter-name>
+    <tonode-name>MakeSphere</tonode-name>
+    <toserviceparameter-name>theX</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>0</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeSphere__theY</fromserviceparameter-name>
+    <tonode-name>MakeSphere</tonode-name>
+    <toserviceparameter-name>theY</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>0</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeSphere__theZ</fromserviceparameter-name>
+    <tonode-name>MakeSphere</tonode-name>
+    <toserviceparameter-name>theZ</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>0</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</fromnode-name>
+    <fromserviceparameter-name>MakeSphere__theRadius</fromserviceparameter-name>
+    <tonode-name>MakeSphere</tonode-name>
+    <toserviceparameter-name>theRadius</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>12</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>aNewDataFlow_1_4</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>12</value>
+    </data-value>
+    <coord-list/>
+   </data>
+  </data-list>
+ </dataflow>
+ <dataflow>
+  <info-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>aNewDataFlow_1_1_2</node-name>
+    <kind>1</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>aNewDataFlow_1_1_2</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>sum__a</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>sum__b</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Mult__b</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>29/10/2004 - 14:40:44</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>?</comment>
+    <x-position>0</x-position>
+    <y-position>0</y-position>
+   </node>
+  </info-list>
+  <node-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>Mult</node-name>
+    <kind>3</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Mult</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>a</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>b</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list>
+     <PyFunction>
+      <FuncName>Mult</FuncName>
+      <PyFunc><![CDATA[def Mult(a): ]]></PyFunc>
+      <PyFunc><![CDATA[   b = a*3 ]]></PyFunc>
+      <PyFunc><![CDATA[   return b ]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>Compute Node</comment>
+    <x-position>382</x-position>
+    <y-position>78</y-position>
+   </node>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>sum</node-name>
+    <kind>3</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>sum</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>a</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>b</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>s</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list>
+     <PyFunction>
+      <FuncName>sum</FuncName>
+      <PyFunc><![CDATA[def sum(a, b): ]]></PyFunc>
+      <PyFunc><![CDATA[   return a+b]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>3/3/2006 - 17:2:48</creation-date>
+    <lastmodification-date>3/3/2006 - 17:2:48</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>Compute Node</comment>
+    <x-position>47</x-position>
+    <y-position>87</y-position>
+   </node>
+  </node-list>
+  <link-list>
+   <link>
+    <fromnode-name>sum</fromnode-name>
+    <fromserviceparameter-name>s</fromserviceparameter-name>
+    <tonode-name>Mult</tonode-name>
+    <toserviceparameter-name>a</toserviceparameter-name>
+    <coord-list/>
+   </link>
+  </link-list>
+  <data-list/>
+ </dataflow>
+</supergraph>
+

diff --git a/Superv/Python/MacroWithGeomGates.py b/Superv/Python/MacroWithGeomGates.py
new file mode 100644 (file)
index 0000000..306ec57
--- /dev/null
+++ b/Superv/Python/MacroWithGeomGates.py
@@ -0,0 +1,234 @@
+
+# Generated python file of Graph aNewDataFlow_1_4
+
+from SuperV import *
+
+# Graph creation of aNewDataFlow_1_4
+def DefaNewDataFlow_1_4() :
+    aNewDataFlow_1_4 = Graph( 'aNewDataFlow_1_4' )
+    aNewDataFlow_1_4.SetName( 'aNewDataFlow_1_4' )
+    aNewDataFlow_1_4.SetAuthor( '' )
+    aNewDataFlow_1_4.SetComment( '' )
+    aNewDataFlow_1_4.Coords( 0 , 0 )
+    
+    # Creation of Factory Nodes
+    
+    TranslateDXDYDZ = aNewDataFlow_1_4.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'TranslateDXDYDZ' )
+    TranslateDXDYDZ.SetName( 'TranslateDXDYDZ' )
+    TranslateDXDYDZ.SetAuthor( '' )
+    TranslateDXDYDZ.SetContainer( 'localhost/FactoryServer' )
+    TranslateDXDYDZ.SetComment( 'TranslateDXDYDZ from GEOM_Superv' )
+    TranslateDXDYDZ.Coords( 1051 , 118 )
+    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' )
+    
+    MakeCopy = aNewDataFlow_1_4.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeCopy' )
+    MakeCopy.SetName( 'MakeCopy' )
+    MakeCopy.SetAuthor( '' )
+    MakeCopy.SetContainer( 'localhost/FactoryServer' )
+    MakeCopy.SetComment( 'MakeCopy from GEOM_Superv' )
+    MakeCopy.Coords( 656 , 101 )
+    IMakeCopytheOriginal = MakeCopy.GetInPort( 'theOriginal' )
+    IMakeCopyGate = MakeCopy.GetInPort( 'Gate' )
+    OMakeCopyreturn = MakeCopy.GetOutPort( 'return' )
+    OMakeCopyGate = MakeCopy.GetOutPort( 'Gate' )
+    
+    MakeBox = aNewDataFlow_1_4.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeBox' )
+    MakeBox.SetName( 'MakeBox' )
+    MakeBox.SetAuthor( '' )
+    MakeBox.SetContainer( 'localhost/FactoryServer' )
+    MakeBox.SetComment( 'MakeBox from GEOM_Superv' )
+    MakeBox.Coords( 219 , 14 )
+    IMakeBoxtheX1 = MakeBox.GetInPort( 'theX1' )
+    IMakeBoxtheY1 = MakeBox.GetInPort( 'theY1' )
+    IMakeBoxtheZ1 = MakeBox.GetInPort( 'theZ1' )
+    IMakeBoxtheX2 = MakeBox.GetInPort( 'theX2' )
+    IMakeBoxtheY2 = MakeBox.GetInPort( 'theY2' )
+    IMakeBoxtheZ2 = MakeBox.GetInPort( 'theZ2' )
+    IMakeBoxGate = MakeBox.GetInPort( 'Gate' )
+    OMakeBoxreturn = MakeBox.GetOutPort( 'return' )
+    OMakeBoxGate = MakeBox.GetOutPort( 'Gate' )
+    
+    MakeCopy_1 = aNewDataFlow_1_4.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( 1286 , 14 )
+    IMakeCopy_1theOriginal = MakeCopy_1.GetInPort( 'theOriginal' )
+    IMakeCopy_1Gate = MakeCopy_1.GetInPort( 'Gate' )
+    OMakeCopy_1return = MakeCopy_1.GetOutPort( 'return' )
+    OMakeCopy_1Gate = MakeCopy_1.GetOutPort( 'Gate' )
+    
+    MakeFuse = aNewDataFlow_1_4.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeFuse' )
+    MakeFuse.SetName( 'MakeFuse' )
+    MakeFuse.SetAuthor( '' )
+    MakeFuse.SetContainer( 'localhost/FactoryServer' )
+    MakeFuse.SetComment( 'MakeFuse from GEOM_Superv' )
+    MakeFuse.Coords( 1549 , 146 )
+    IMakeFusetheShape1 = MakeFuse.GetInPort( 'theShape1' )
+    IMakeFusetheShape2 = MakeFuse.GetInPort( 'theShape2' )
+    IMakeFuseGate = MakeFuse.GetInPort( 'Gate' )
+    OMakeFusereturn = MakeFuse.GetOutPort( 'return' )
+    OMakeFuseGate = MakeFuse.GetOutPort( 'Gate' )
+    
+    MakeSphere = aNewDataFlow_1_4.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeSphere' )
+    MakeSphere.SetName( 'MakeSphere' )
+    MakeSphere.SetAuthor( '' )
+    MakeSphere.SetContainer( 'localhost/FactoryServer' )
+    MakeSphere.SetComment( 'MakeSphere from GEOM_Superv' )
+    MakeSphere.Coords( 1749 , 41 )
+    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' )
+    
+    MakeFuse_1 = aNewDataFlow_1_4.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'MakeFuse' )
+    MakeFuse_1.SetName( 'MakeFuse_1' )
+    MakeFuse_1.SetAuthor( '' )
+    MakeFuse_1.SetContainer( 'localhost/FactoryServer' )
+    MakeFuse_1.SetComment( 'MakeFuse from GEOM_Superv' )
+    MakeFuse_1.Coords( 2007 , 210 )
+    IMakeFuse_1theShape1 = MakeFuse_1.GetInPort( 'theShape1' )
+    IMakeFuse_1theShape2 = MakeFuse_1.GetInPort( 'theShape2' )
+    IMakeFuse_1Gate = MakeFuse_1.GetInPort( 'Gate' )
+    OMakeFuse_1return = MakeFuse_1.GetOutPort( 'return' )
+    OMakeFuse_1Gate = MakeFuse_1.GetOutPort( 'Gate' )
+    
+    SetStudyID = aNewDataFlow_1_4.FNode( 'GEOM_Superv' , 'GEOM_Superv' , 'SetStudyID' )
+    SetStudyID.SetName( 'SetStudyID' )
+    SetStudyID.SetAuthor( '' )
+    SetStudyID.SetContainer( 'localhost/FactoryServer' )
+    SetStudyID.SetComment( 'SetStudyID from GEOM_Superv' )
+    SetStudyID.Coords( 7 , 269 )
+    ISetStudyIDtheStudyID = SetStudyID.GetInPort( 'theStudyID' )
+    ISetStudyIDGate = SetStudyID.GetInPort( 'Gate' )
+    OSetStudyIDGate = SetStudyID.GetOutPort( 'Gate' )
+    
+    # Creation of Macro Nodes
+    aNewDataFlow_1_1_2 = DefaNewDataFlow_1_1_2()
+    Macro_aNewDataFlow_1 = aNewDataFlow_1_4.GraphMNode( aNewDataFlow_1_1_2 )
+    Macro_aNewDataFlow_1.SetCoupled( 'aNewDataFlow_1_1_2' )
+    Macro_aNewDataFlow_1.SetName( 'Macro_aNewDataFlow_1' )
+    Macro_aNewDataFlow_1.SetAuthor( '' )
+    Macro_aNewDataFlow_1.SetComment( 'Macro Node' )
+    Macro_aNewDataFlow_1.Coords( 718 , 263 )
+    IMacro_aNewDataFlow_1sum__a = Macro_aNewDataFlow_1.GetInPort( 'sum__a' )
+    IMacro_aNewDataFlow_1sum__b = Macro_aNewDataFlow_1.GetInPort( 'sum__b' )
+    IMacro_aNewDataFlow_1Gate = Macro_aNewDataFlow_1.GetInPort( 'Gate' )
+    OMacro_aNewDataFlow_1Mult__b = Macro_aNewDataFlow_1.GetOutPort( 'Mult__b' )
+    OMacro_aNewDataFlow_1Gate = Macro_aNewDataFlow_1.GetOutPort( 'Gate' )
+    
+    # Creation of Links
+    LMacro_aNewDataFlow_1Mult__bTranslateDXDYDZtheDY = aNewDataFlow_1_4.Link( OMacro_aNewDataFlow_1Mult__b , ITranslateDXDYDZtheDY )
+    
+    LTranslateDXDYDZreturnMakeFusetheShape1 = aNewDataFlow_1_4.Link( OTranslateDXDYDZreturn , IMakeFusetheShape1 )
+    
+    LTranslateDXDYDZGateMakeCopy_1Gate = aNewDataFlow_1_4.Link( OTranslateDXDYDZGate , IMakeCopy_1Gate )
+    
+    LMakeCopyreturnTranslateDXDYDZtheObject = aNewDataFlow_1_4.Link( OMakeCopyreturn , ITranslateDXDYDZtheObject )
+    
+    LMakeCopyGateTranslateDXDYDZGate = aNewDataFlow_1_4.Link( OMakeCopyGate , ITranslateDXDYDZGate )
+    
+    LMakeBoxreturnMakeCopytheOriginal = aNewDataFlow_1_4.Link( OMakeBoxreturn , IMakeCopytheOriginal )
+    
+    LMakeBoxreturnMakeCopy_1theOriginal = aNewDataFlow_1_4.Link( OMakeBoxreturn , IMakeCopy_1theOriginal )
+    
+    LMakeBoxGateMakeCopyGate = aNewDataFlow_1_4.Link( OMakeBoxGate , IMakeCopyGate )
+    
+    LMakeCopy_1returnMakeFusetheShape2 = aNewDataFlow_1_4.Link( OMakeCopy_1return , IMakeFusetheShape2 )
+    
+    LMakeCopy_1GateMakeFuseGate = aNewDataFlow_1_4.Link( OMakeCopy_1Gate , IMakeFuseGate )
+    
+    LMakeFusereturnMakeFuse_1theShape1 = aNewDataFlow_1_4.Link( OMakeFusereturn , IMakeFuse_1theShape1 )
+    
+    LMakeFuseGateMakeSphereGate = aNewDataFlow_1_4.Link( OMakeFuseGate , IMakeSphereGate )
+    
+    LMakeSpherereturnMakeFuse_1theShape2 = aNewDataFlow_1_4.Link( OMakeSpherereturn , IMakeFuse_1theShape2 )
+    
+    LMakeSphereGateMakeFuse_1Gate = aNewDataFlow_1_4.Link( OMakeSphereGate , IMakeFuse_1Gate )
+    
+    LSetStudyIDGateMakeBoxGate = aNewDataFlow_1_4.Link( OSetStudyIDGate , IMakeBoxGate )
+    
+    # Input datas
+    IMacro_aNewDataFlow_1sum__a.Input( 1 )
+    IMacro_aNewDataFlow_1sum__b.Input( 2 )
+    ITranslateDXDYDZtheDX.Input( 25 )
+    ITranslateDXDYDZtheDZ.Input( 25 )
+    IMakeBoxtheX1.Input( 0 )
+    IMakeBoxtheY1.Input( 0 )
+    IMakeBoxtheZ1.Input( 0 )
+    IMakeBoxtheX2.Input( 50 )
+    IMakeBoxtheY2.Input( 50 )
+    IMakeBoxtheZ2.Input( 50 )
+    IMakeSpheretheX.Input( 0 )
+    IMakeSpheretheY.Input( 0 )
+    IMakeSpheretheZ.Input( 0 )
+    IMakeSpheretheRadius.Input( 12 )
+    ISetStudyIDtheStudyID.Input( 12 )
+    
+    # Output Ports of the graph
+    #OMakeFuse_1return = MakeFuse_1.GetOutPort( 'return' )
+    return aNewDataFlow_1_4
+
+# Graph creation of aNewDataFlow_1_1_2
+def DefaNewDataFlow_1_1_2() :
+    aNewDataFlow_1_1_2 = Graph( 'aNewDataFlow_1_1_2' )
+    aNewDataFlow_1_1_2.SetCoupled( 'Macro_aNewDataFlow_1' )
+    aNewDataFlow_1_1_2.SetName( 'aNewDataFlow_1_1_2' )
+    aNewDataFlow_1_1_2.SetAuthor( '' )
+    aNewDataFlow_1_1_2.SetComment( '' )
+    aNewDataFlow_1_1_2.Coords( 0 , 0 )
+    
+    # Creation of Factory Nodes
+    
+    # Creation of InLine Nodes
+    PyMult = []
+    PyMult.append( 'def Mult(a): ' )
+    PyMult.append( '   b = a*3 ' )
+    PyMult.append( '   return b ' )
+    Mult = aNewDataFlow_1_1_2.INode( 'Mult' , PyMult )
+    Mult.SetName( 'Mult' )
+    Mult.SetAuthor( '' )
+    Mult.SetComment( 'Compute Node' )
+    Mult.Coords( 382 , 78 )
+    IMulta = Mult.InPort( 'a' , 'double' )
+    IMultGate = Mult.GetInPort( 'Gate' )
+    OMultb = Mult.OutPort( 'b' , 'double' )
+    OMultGate = Mult.GetOutPort( 'Gate' )
+    
+    Pysum = []
+    Pysum.append( 'def sum(a, b): ' )
+    Pysum.append( '   return a+b' )
+    sum = aNewDataFlow_1_1_2.INode( 'sum' , Pysum )
+    sum.SetName( 'sum' )
+    sum.SetAuthor( '' )
+    sum.SetComment( 'Compute Node' )
+    sum.Coords( 47 , 87 )
+    Isuma = sum.InPort( 'a' , 'double' )
+    Isumb = sum.InPort( 'b' , 'double' )
+    IsumGate = sum.GetInPort( 'Gate' )
+    Osums = sum.OutPort( 's' , 'double' )
+    OsumGate = sum.GetOutPort( 'Gate' )
+    
+    # Creation of Links
+    LsumsMulta = aNewDataFlow_1_1_2.Link( Osums , IMulta )
+    
+    # Input Ports of the graph
+    #Isuma = sum.GetInPort( 'a' )
+    #Isumb = sum.GetInPort( 'b' )
+    
+    # Output Ports of the graph
+    #OMultb = Mult.GetOutPort( 'b' )
+    return aNewDataFlow_1_1_2
+
+
+aNewDataFlow_1_4 = DefaNewDataFlow_1_4()