Porting to SALOME 3.0

diff --git a/INSTALL b/INSTALL
index 70ef8cc24ccbb388803dff8d69fac47562ee9da7..7cd600c205b23b0f95e9d4546546e6550979f228 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,7 @@
-This is the version 0.1 of SIERPINSKY module
+This is the version 0.2 of SIERPINSKY module
 Requires :
-       - SALOME KERNEL 2.2.4
-       - RANDOMIZER 0.1
+       - SALOME KERNEL 3.0.2
+       - SALOME GUI    3.0.2
+       - SALOME MED    3.0.2
+       - SALOME VISU   3.0.2
+       - RANDOMIZER    0.2

diff --git a/Makefile.in b/Makefile.in
index 4fe142fc6ec1df653dd3143f44f46f751a1a1c64..04e0ad640f4d0572fdc9a5cb4b6ab1e23902c0ea 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,6 @@ SUBDIRS = idl src
 
 RESOURCES_FILES = \
        SIERPINSKYCatalog.xml \
-       SIERPINSKY_en.xml \
        SIERPINSKY.png \
        go.png \
        graph1.xml \

diff --git a/README b/README
index 2359dd0e508e7e725eb176f45cba6dc73eb83d9d..8c3626934c3ad79e1574b7918943fdb514d14f2f 100755 (executable)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 ============================================================
 README for:
-* Randomizer module : version 0.1
-* Sierpinsky module : version 0.1
+* Randomizer module : version 0.2
+* Sierpinsky module : version 0.2
 ============================================================
 
 Contents of this file:
@@ -23,8 +23,8 @@ Randomizer and Sierpinsky SALOME-based modules implement simple interface to cal
 2. Prerequisites.
 =======================================================
 
-SALOME version 2.2.4 is used as a referense version of SALOME platform.
-All other products are those used by SALOME v2.2.4.
+SALOME version 3.0.2 is used as a referense version of SALOME platform.
+All other products are those used by SALOME v3.0.2.
 
 =======================================================
 3. Installation.
@@ -32,13 +32,13 @@ All other products are those used by SALOME v2.2.4.
 
 The compilation procedure is exactly the same as for other SALOME modules:
 
-3.1. install SALOME 2.2.4 with all prerequisite products;
+3.1. install SALOME 3.0.2 with all prerequisite products;
 3.2. unpack Randomizer and Sierpinsky modules sources;
 3.3  set environment:
 
    source <salome_install_dir>/env_products.csh
 
-   where <salome_install_dir> is a directory where SALOME 2.2.4 is installed to.
+   where <salome_install_dir> is a directory where SALOME 3.0.2 is installed to.
 
 3.4 create build directory for Randomizer module:
 
@@ -69,7 +69,7 @@ To launch SALOME application the following steps should be performed:
 
    source <salome_install_dir>/env_products.csh
 
-   where <salome_install_dir> is a directory where SALOME 2.2.4 is installed to.
+   where <salome_install_dir> is a directory where SALOME 3.0.2 is installed to.
 
 4.3. add Randomizer and Sierpinsky modules environment:
 

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 7130d52b23443bccf2fd7c437367216b59c0c622..d5b63162d2096c945c8753e5070250725ef81130 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -77,6 +77,9 @@ QT_MT_LIBS = @QT_MT_LIBS@
 MOC = @MOC@
 UIC = @UIC@
 
+# msg2qm
+
+MSG2QM = @MSG2QM@
 
 #QWT
 
@@ -270,8 +273,8 @@ ac_cxx_mutable.m4                 check_mico.m4      libtool.m4             \
 ac_cxx_namespaces.m4              check_omniorb.m4   pyembed.m4                \
 ac_cxx_partial_specialization.m4  check_opengl.m4    python.m4         \
 ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4      \
-ac_cc_warnings.m4                 check_qt.m4        check_med2.m4      \
-check_swig.m4                     check_boost.m4
+ac_cc_warnings.m4                 check_qt.m4        check_swig.m4      \
+check_boost.m4
 
 $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
        cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files

diff --git a/bin/VERSION b/bin/VERSION
index 32ae3cde682e8fb68993533b8dd16baf970bba63..1f21a15caa228fbd87c617567cb65cd2ad089de1 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SIERPINSKY COMPONENT - VERSION: 0.1
+THIS IS SIERPINSKY COMPONENT - VERSION: 0.2

diff --git a/configure.in.base b/configure.in.base
index 553ac6f819ba03e0f3a088a7cdc83a1012e267d3..23abbf1ce9159c67a4685fc0ffb5674d5b280cf7 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -217,6 +217,14 @@ echo
 
 CHECK_QT
 
+echo
+echo ---------------------------------------------
+echo testing msg2qm
+echo ---------------------------------------------
+echo
+
+CHECK_MSG2QM
+
 echo
 echo ---------------------------------------------
 echo testing VTK
@@ -296,7 +304,8 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Med_ok Visu_ok Randomizer_ok"
+variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok
+OpenGL_ok qt_ok msg2qm_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Med_ok Visu_ok Randomizer_ok"
 
 for var in $variables
 do

diff --git a/idl/Makefile.in b/idl/Makefile.in
index cb7e4028356b285b35fc9bd95ccc5f1bb6f4562e..31e2cb31de29f26dcae07ae77bbe07fadd2f6c60 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -9,7 +9,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
-VPATH=.:${KERNEL_ROOT_DIR}/idl/salome
+VPATH=.:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
 
 @COMMENCE@
 

diff --git a/resources/SIERPINSKYCatalog.xml b/resources/SIERPINSKYCatalog.xml
index a2df5a4465474cdb999cf93de4e2f0621ad68c39..21828a4d7002d182792be336137d562115e7f57f 100644 (file)
--- a/resources/SIERPINSKYCatalog.xml
+++ b/resources/SIERPINSKYCatalog.xml
@@ -8,7 +8,7 @@
             <component-username>Sierpinsky</component-username>
             <component-type>OTHER</component-type>
             <component-author>Vadim SANDLER (VSR)</component-author>
-            <component-version>0.1</component-version>
+            <component-version>0.2</component-version>
             <component-comment>unknown</component-comment>
             <component-multistudy>0</component-multistudy>
             <component-icone>SIERPINSKY.png</component-icone>

diff --git a/resources/graph2.xml b/resources/graph2.xml
index 47dc13bf30e711903cc4a748c9206b41a9aabea7..13dc9f98617018138db3f3dd6084c0712fff56ab 100644 (file)
--- a/resources/graph2.xml
+++ b/resources/graph2.xml
@@ -1,892 +1,1107 @@
 <!DOCTYPE SuperGraph>
 <supergraph>
-<dataflow>
-<info-list>
-<node>
-<component-name>?</component-name>
+ <dataflow>
+  <info-list>
+   <node>
+    <component-name>?</component-name>
     <interface-name>?</interface-name>
     <node-name>aNewDataFlow_1</node-name>
     <kind>1</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>aNewDataFlow_1</service-name>
+     <service-name>aNewDataFlow_1</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>Loop__nbIter</inParameter-name>      </inParameter>
       <inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>Loop__iter</inParameter-name>      </inParameter>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>Loop__nbIter</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>Loop__iter</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>ExportToMED__size</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>ExportToMED__size</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>string</inParameter-type>
-       <inParameter-name>getFileNames__medFile</inParameter-name>      </inParameter>
+       <inParameter-type>string</inParameter-type>
+       <inParameter-name>getFileNames__medFile</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>string</inParameter-type>
-       <inParameter-name>getFileNames__jpegFile</inParameter-name>      </inParameter>
+       <inParameter-type>string</inParameter-type>
+       <inParameter-name>getFileNames__jpegFile</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>ExportToJPEG__size</inParameter-name>      </inParameter>     </inParameter-list>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>ExportToJPEG__size</inParameter-name>
+      </inParameter>
+     </inParameter-list>
      <outParameter-list>
-<outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>EndLoop__x</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>EndLoop__y</outParameter-name>      </outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>EndLoop__x</outParameter-name>
+      </outParameter>
       <outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>EndLoop__nbIter</outParameter-name>      </outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>EndLoop__y</outParameter-name>
+      </outParameter>
       <outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>EndLoop__iter</outParameter-name>      </outParameter>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>EndLoop__nbIter</outParameter-name>
+      </outParameter>
       <outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>CheckMedFile__ko</outParameter-name>      </outParameter>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>EndLoop__iter</outParameter-name>
+      </outParameter>
       <outParameter>
-<outParameter-type>boolean</outParameter-type>
-       <outParameter-name>ExportToJPEG__return</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>CheckMedFile__ko</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>boolean</outParameter-type>
+       <outParameter-name>ExportToJPEG__return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
     <creation-date>13/7/2005 - 13:45:3</creation-date>
-    <lastmodification-date>14/7/2005 - 17:53:15</lastmodification-date>
+    <lastmodification-date>5/9/2005 - 17:48: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>
+    <y-position>0</y-position>
+   </node>
+  </info-list>
   <node-list>
-<node>
-<component-name>RANDOMIZER</component-name>
+   <node>
+    <component-name>RANDOMIZER</component-name>
     <interface-name>RANDOMIZER</interface-name>
     <node-name>InitPoint</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>InitPoint</service-name>
+     <service-name>InitPoint</service-name>
      <inParameter-list/>
      <outParameter-list>
-<outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>theX</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>theY</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>theX</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>theY</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>FactoryServerPy</container>
     <comment>InitPoint from RANDOMIZER</comment>
     <x-position>20</x-position>
-    <y-position>7</y-position>   </node>
+    <y-position>7</y-position>
+   </node>
    <node>
-<component-name>RANDOMIZER</component-name>
+    <component-name>RANDOMIZER</component-name>
     <interface-name>RANDOMIZER</interface-name>
     <node-name>NextIteration</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>NextIteration</service-name>
+     <service-name>NextIteration</service-name>
      <inParameter-list/>
      <outParameter-list>
-<outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>return</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+      <outParameter>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>FactoryServerPy</container>
     <comment>NextIteration from RANDOMIZER</comment>
     <x-position>633</x-position>
-    <y-position>207</y-position>   </node>
+    <y-position>207</y-position>
+   </node>
    <node>
-<component-name>SIERPINSKY</component-name>
+    <component-name>SIERPINSKY</component-name>
     <interface-name>SIERPINSKY</interface-name>
     <node-name>NextPoint</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>NextPoint</service-name>
+     <service-name>NextPoint</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>X</inParameter-name>      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>Y</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>X</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Y</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>iter</inParameter-name>      </inParameter>     </inParameter-list>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>iter</inParameter-name>
+      </inParameter>
+     </inParameter-list>
      <outParameter-list>
-<outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>nextX</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>nextY</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>nextX</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>nextY</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>NextPoint from SIERPINSKY</comment>
     <x-position>825</x-position>
-    <y-position>7</y-position>   </node>
+    <y-position>7</y-position>
+   </node>
    <node>
-<component-name>?</component-name>
+    <component-name>?</component-name>
     <interface-name>?</interface-name>
     <node-name>Loop</node-name>
     <kind>4</kind>
     <coupled-node>EndLoop</coupled-node>
     <service>
-<service-name>Loop</service-name>
+     <service-name>Loop</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>x</inParameter-name>      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>y</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>nbIter</inParameter-name>      </inParameter>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>nbIter</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>iter</inParameter-name>      </inParameter>     </inParameter-list>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>iter</inParameter-name>
+      </inParameter>
+     </inParameter-list>
      <outParameter-list>
-<outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>x</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>y</outParameter-name>      </outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>x</outParameter-name>
+      </outParameter>
       <outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>nbIter</outParameter-name>      </outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>y</outParameter-name>
+      </outParameter>
       <outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>iter</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>nbIter</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>iter</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list>
-<PyFunction>
-<FuncName>InitLoop</FuncName>
+     <PyFunction>
+      <FuncName>InitLoop</FuncName>
       <PyFunc><![CDATA[def InitLoop( x, y, nbIter, iter ): ]]></PyFunc>
       <PyFunc><![CDATA[    iter = 0 ]]></PyFunc>
       <PyFunc><![CDATA[    return x, y, nbIter, iter ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>     </PyFunction>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
      <PyFunction>
-<FuncName>MoreLoop</FuncName>
+      <FuncName>MoreLoop</FuncName>
       <PyFunc><![CDATA[def MoreLoop( x, y, nbIter, iter ): ]]></PyFunc>
       <PyFunc><![CDATA[    loop = 0 ]]></PyFunc>
       <PyFunc><![CDATA[    if iter < nbIter: loop = 1 ]]></PyFunc>
       <PyFunc><![CDATA[    return loop, x, y, nbIter, iter ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>     </PyFunction>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
      <PyFunction>
-<FuncName>NextLoop</FuncName>
+      <FuncName>NextLoop</FuncName>
       <PyFunc><![CDATA[def NextLoop( x, y, nbIter, iter ): ]]></PyFunc>
       <PyFunc><![CDATA[    iter = iter + 1 ]]></PyFunc>
       <PyFunc><![CDATA[    return x, y, nbIter, iter ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
     <x-position>432</x-position>
-    <y-position>47</y-position>   </node>
+    <y-position>47</y-position>
+   </node>
    <node>
-<component-name>?</component-name>
+    <component-name>?</component-name>
     <interface-name>?</interface-name>
     <node-name>EndLoop</node-name>
     <kind>5</kind>
     <coupled-node>Loop</coupled-node>
     <service>
-<service-name>EndLoop</service-name>
+     <service-name>EndLoop</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>x</inParameter-name>      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>y</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>nbIter</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>iter</inParameter-name>      </inParameter>     </inParameter-list>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>nbIter</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>iter</inParameter-name>
+      </inParameter>
+     </inParameter-list>
      <outParameter-list>
-<outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>x</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>y</outParameter-name>      </outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>x</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>y</outParameter-name>
+      </outParameter>
       <outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>nbIter</outParameter-name>      </outParameter>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>nbIter</outParameter-name>
+      </outParameter>
       <outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>iter</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>iter</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list>
-<PyFunction>
-<FuncName>EndLoop</FuncName>
-      <PyFunc><![CDATA[?]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+     <PyFunction>
+      <FuncName>EndLoop</FuncName>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
     <x-position>1015</x-position>
-    <y-position>47</y-position>   </node>
+    <y-position>47</y-position>
+   </node>
    <node>
-<component-name>SIERPINSKY</component-name>
+    <component-name>SIERPINSKY</component-name>
     <interface-name>SIERPINSKY</interface-name>
     <node-name>ExportToMED</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>ExportToMED</service-name>
+     <service-name>ExportToMED</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>string</inParameter-type>
-       <inParameter-name>fileName</inParameter-name>      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>size</inParameter-name>      </inParameter>     </inParameter-list>
+       <inParameter-type>string</inParameter-type>
+       <inParameter-name>fileName</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>size</inParameter-name>
+      </inParameter>
+     </inParameter-list>
      <outParameter-list>
-<outParameter>
-<outParameter-type>boolean</outParameter-type>
-       <outParameter-name>return</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+      <outParameter>
+       <outParameter-type>boolean</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>ExportToMED from SIERPINSKY</comment>
     <x-position>474</x-position>
-    <y-position>484</y-position>   </node>
+    <y-position>484</y-position>
+   </node>
    <node>
-<component-name>?</component-name>
+    <component-name>?</component-name>
     <interface-name>?</interface-name>
     <node-name>ImportToVISU</node-name>
     <kind>3</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>ImportToVISU</service-name>
+     <service-name>ImportToVISU</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>string</inParameter-type>
-       <inParameter-name>fileName</inParameter-name>      </inParameter>     </inParameter-list>
-     <outParameter-list/>    </service>
+      <inParameter>
+       <inParameter-type>string</inParameter-type>
+       <inParameter-name>fileName</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list/>
+    </service>
     <DataStream-list/>
     <PyFunction-list>
-<PyFunction>
-<FuncName>ImportToVISU</FuncName>
-      <PyFunc><![CDATA[def ImportToVISU( fileName ):          ]]></PyFunc>
-      <PyFunc><![CDATA[  import CORBA         ]]></PyFunc>
-      <PyFunc><![CDATA[  import SALOME_NamingServicePy         ]]></PyFunc>
-      <PyFunc><![CDATA[  import LifeCycleCORBA         ]]></PyFunc>
-      <PyFunc><![CDATA[  import SALOME         ]]></PyFunc>
-      <PyFunc><![CDATA[  import SALOMEDS         ]]></PyFunc>
-      <PyFunc><![CDATA[  import VISU       ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>
-      <PyFunc><![CDATA[  orb = CORBA.ORB_init( [], CORBA.ORB_ID )         ]]></PyFunc>
-      <PyFunc><![CDATA[  naming_service = SALOME_NamingServicePy.SALOME_NamingServicePy_i( orb )         ]]></PyFunc>
-      <PyFunc><![CDATA[  lcc = LifeCycleCORBA.LifeCycleCORBA( orb )         ]]></PyFunc>
-      <PyFunc><![CDATA[  studyManager = naming_service.Resolve( "myStudyManager" )._narrow( SALOMEDS.StudyManager )         ]]></PyFunc>
-      <PyFunc><![CDATA[  session = naming_service.Resolve( "/Kernel/Session" )._narrow( SALOME.Session )         ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>
-      <PyFunc><![CDATA[  studyId = session.GetActiveStudyId()         ]]></PyFunc>
-      <PyFunc><![CDATA[  study = studyManager.GetStudyByID( studyId )         ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>
-      <PyFunc><![CDATA[  aVisu = lcc.FindOrLoadComponent( "FactoryServer", "VISU" )         ]]></PyFunc>
-      <PyFunc><![CDATA[  aVisu.SetCurrentStudy( study )               ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>
-      <PyFunc><![CDATA[  aResult = aVisu.ImportFile( fileName );         ]]></PyFunc>
-      <PyFunc><![CDATA[  aMesh = aVisu.MeshOnEntity( aResult, "Sierpinsky", VISU.NODE )         ]]></PyFunc>
+     <PyFunction>
+      <FuncName>ImportToVISU</FuncName>
+      <PyFunc><![CDATA[def ImportToVISU( fileName ):           ]]></PyFunc>
+      <PyFunc><![CDATA[  import CORBA          ]]></PyFunc>
+      <PyFunc><![CDATA[  import SALOME_NamingServicePy          ]]></PyFunc>
+      <PyFunc><![CDATA[  import LifeCycleCORBA          ]]></PyFunc>
+      <PyFunc><![CDATA[  import SALOME ]]></PyFunc>
+      <PyFunc><![CDATA[  import SALOME_Session_idl          ]]></PyFunc>
+      <PyFunc><![CDATA[  import SALOMEDS          ]]></PyFunc>
+      <PyFunc><![CDATA[  import VISU        ]]></PyFunc>
+      <PyFunc><![CDATA[  orb = CORBA.ORB_init( [], CORBA.ORB_ID )          ]]></PyFunc>
+      <PyFunc><![CDATA[  naming_service = SALOME_NamingServicePy.SALOME_NamingServicePy_i( orb )          ]]></PyFunc>
+      <PyFunc><![CDATA[  lcc = LifeCycleCORBA.LifeCycleCORBA( orb )          ]]></PyFunc>
+      <PyFunc><![CDATA[  studyManager = naming_service.Resolve( "myStudyManager" )._narrow( SALOMEDS.StudyManager )          ]]></PyFunc>
+      <PyFunc><![CDATA[  session = naming_service.Resolve( "/Kernel/Session" )._narrow( SALOME.Session )          ]]></PyFunc>
+      <PyFunc><![CDATA[  studyId = session.GetActiveStudyId()          ]]></PyFunc>
+      <PyFunc><![CDATA[  study = studyManager.GetStudyByID( studyId )          ]]></PyFunc>
+      <PyFunc><![CDATA[  aVisu = lcc.FindOrLoadComponent( "FactoryServer", "VISU" )          ]]></PyFunc>
+      <PyFunc><![CDATA[  aVisu.SetCurrentStudy( study )                ]]></PyFunc>
+      <PyFunc><![CDATA[  aResult = aVisu.ImportFile( fileName );          ]]></PyFunc>
+      <PyFunc><![CDATA[  aMesh = aVisu.MeshOnEntity( aResult, "Sierpinsky", VISU.NODE )          ]]></PyFunc>
+      <PyFunc><![CDATA[  aViewManager = aVisu.GetViewManager()                                                            ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d = aViewManager.Create3DView()                                                           ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.Restore()                       ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.SetRelativePosition( 0.5, 0.5 )                       ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.SetRelativeSize( 0.5, 0.5 )                       ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.ShowPart( VISU.View.OBJECTBROWSER, 0 )                      ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.ShowPart( VISU.View.PYTHON, 0 )                      ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.ShowPart( VISU.View.MESSAGES, 0 )                      ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.DisplayOnly( aMesh )                                                                                    ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.SetView( VISU.View3D.TOP )   ]]></PyFunc>
+      <PyFunc><![CDATA[  View3d.FitAll()                                                                                    ]]></PyFunc>
+      <PyFunc><![CDATA[  return          ]]></PyFunc>
       <PyFunc><![CDATA[?]]></PyFunc>
-      <PyFunc><![CDATA[  aViewManager = aVisu.GetViewManager()                                                           ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d = aViewManager.Create3DView()                                                          ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.Restore()                      ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.SetRelativePosition( 0.5, 0.5 )                      ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.SetRelativeSize( 0.5, 0.5 )                      ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.ShowPart( VISU.View.OBJECTBROWSER, 0 )                     ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.ShowPart( VISU.View.PYTHON, 0 )                     ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.ShowPart( VISU.View.MESSAGES, 0 )                     ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.DisplayOnly( aMesh )                                                                                   ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.SetView( VISU.View3D.TOP )  ]]></PyFunc>
-      <PyFunc><![CDATA[  View3d.FitAll()                                                                                   ]]></PyFunc>
-      <PyFunc><![CDATA[  return         ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
     <x-position>861</x-position>
-    <y-position>460</y-position>   </node>
+    <y-position>460</y-position>
+   </node>
    <node>
-<component-name>?</component-name>
+    <component-name>?</component-name>
     <interface-name>?</interface-name>
     <node-name>CheckMedFile</node-name>
     <kind>6</kind>
     <coupled-node>EndOfCheckMedFile</coupled-node>
     <service>
-<service-name>ImportToVISU_1</service-name>
+     <service-name>CheckMedFile</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>ok</inParameter-name>      </inParameter>     </inParameter-list>
+      <inParameter>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>ok</inParameter-name>
+      </inParameter>
+     </inParameter-list>
      <outParameter-list>
-<outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>ok</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>long</outParameter-type>
-       <outParameter-name>ko</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>ok</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>long</outParameter-type>
+       <outParameter-name>ko</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list>
-<PyFunction>
-<FuncName>CheckMedFile</FuncName>
+     <PyFunction>
+      <FuncName>CheckMedFile</FuncName>
       <PyFunc><![CDATA[def CheckMedFile( ok ):   ]]></PyFunc>
       <PyFunc><![CDATA[    return ok, not ok   ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
     <x-position>662</x-position>
-    <y-position>524</y-position>   </node>
+    <y-position>524</y-position>
+   </node>
    <node>
-<component-name>?</component-name>
+    <component-name>?</component-name>
     <interface-name>?</interface-name>
     <node-name>EndOfCheckMedFile</node-name>
     <kind>7</kind>
     <coupled-node>CheckMedFile</coupled-node>
     <service>
-<service-name>EndImportToVISU</service-name>
+     <service-name>EndOfCheckMedFile</service-name>
      <inParameter-list/>
-     <outParameter-list/>    </service>
+     <outParameter-list/>
+    </service>
     <DataStream-list/>
     <PyFunction-list>
-<PyFunction>
-<FuncName>EndImportToVISU</FuncName>
-      <PyFunc><![CDATA[?]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+     <PyFunction>
+      <FuncName>EndImportToVISU</FuncName>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
     <x-position>1054</x-position>
-    <y-position>520</y-position>   </node>
+    <y-position>520</y-position>
+   </node>
    <node>
-<component-name>SIERPINSKY</component-name>
+    <component-name>SIERPINSKY</component-name>
     <interface-name>SIERPINSKY</interface-name>
     <node-name>Init</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>Init</service-name>
+     <service-name>Init</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>X1</inParameter-name>      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>Y1</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>X1</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>X2</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Y1</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>Y2</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>X2</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>X3</inParameter-name>      </inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Y2</inParameter-name>
+      </inParameter>
       <inParameter>
-<inParameter-type>double</inParameter-type>
-       <inParameter-name>Y3</inParameter-name>      </inParameter>     </inParameter-list>
-     <outParameter-list/>    </service>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>X3</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Y3</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list/>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>Init from SIERPINSKY</comment>
     <x-position>234</x-position>
-    <y-position>185</y-position>   </node>
+    <y-position>185</y-position>
+   </node>
    <node>
-<component-name>RANDOMIZER</component-name>
+    <component-name>RANDOMIZER</component-name>
     <interface-name>RANDOMIZER</interface-name>
     <node-name>InitPoint_1</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>InitPoint</service-name>
+     <service-name>InitPoint</service-name>
      <inParameter-list/>
      <outParameter-list>
-<outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>theX</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>theY</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>theX</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>theY</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>FactoryServerPy</container>
     <comment>InitPoint from RANDOMIZER</comment>
     <x-position>20</x-position>
-    <y-position>185</y-position>   </node>
+    <y-position>185</y-position>
+   </node>
    <node>
-<component-name>RANDOMIZER</component-name>
+    <component-name>RANDOMIZER</component-name>
     <interface-name>RANDOMIZER</interface-name>
     <node-name>InitPoint_2</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>InitPoint</service-name>
+     <service-name>InitPoint</service-name>
      <inParameter-list/>
      <outParameter-list>
-<outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>theX</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>theY</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>theX</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>theY</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>FactoryServerPy</container>
     <comment>InitPoint from RANDOMIZER</comment>
     <x-position>20</x-position>
-    <y-position>317</y-position>   </node>
+    <y-position>317</y-position>
+   </node>
    <node>
-<component-name>RANDOMIZER</component-name>
+    <component-name>RANDOMIZER</component-name>
     <interface-name>RANDOMIZER</interface-name>
     <node-name>InitPoint_3</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>InitPoint</service-name>
+     <service-name>InitPoint</service-name>
      <inParameter-list/>
      <outParameter-list>
-<outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>theX</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>double</outParameter-type>
-       <outParameter-name>theY</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>theX</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>theY</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>FactoryServerPy</container>
     <comment>InitPoint from RANDOMIZER</comment>
     <x-position>20</x-position>
-    <y-position>448</y-position>   </node>
+    <y-position>448</y-position>
+   </node>
    <node>
-<component-name>?</component-name>
+    <component-name>?</component-name>
     <interface-name>?</interface-name>
     <node-name>getFileNames</node-name>
     <kind>3</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>getFileNames</service-name>
+     <service-name>getFileNames</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>string</inParameter-type>
-       <inParameter-name>medFile</inParameter-name>      </inParameter>
       <inParameter>
-<inParameter-type>string</inParameter-type>
-       <inParameter-name>jpegFile</inParameter-name>      </inParameter>     </inParameter-list>
+       <inParameter-type>string</inParameter-type>
+       <inParameter-name>medFile</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>string</inParameter-type>
+       <inParameter-name>jpegFile</inParameter-name>
+      </inParameter>
+     </inParameter-list>
      <outParameter-list>
-<outParameter>
-<outParameter-type>string</outParameter-type>
-       <outParameter-name>medFile</outParameter-name>      </outParameter>
       <outParameter>
-<outParameter-type>string</outParameter-type>
-       <outParameter-name>jpegFile</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+       <outParameter-type>string</outParameter-type>
+       <outParameter-name>medFile</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>string</outParameter-type>
+       <outParameter-name>jpegFile</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list>
-<PyFunction>
-<FuncName>getMedFileName</FuncName>
+     <PyFunction>
+      <FuncName>getMedFileName</FuncName>
       <PyFunc><![CDATA[def getMedFileName( medFile, jpegFile ):   ]]></PyFunc>
       <PyFunc><![CDATA[    return medFile, jpegFile  ]]></PyFunc>
-      <PyFunc><![CDATA[?]]></PyFunc>     </PyFunction>    </PyFunction-list>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>?</container>
     <comment>Compute Node</comment>
     <x-position>21</x-position>
-    <y-position>594</y-position>   </node>
+    <y-position>594</y-position>
+   </node>
    <node>
-<component-name>SIERPINSKY</component-name>
+    <component-name>SIERPINSKY</component-name>
     <interface-name>SIERPINSKY</interface-name>
     <node-name>ExportToJPEG</node-name>
     <kind>0</kind>
     <coupled-node>?</coupled-node>
     <service>
-<service-name>ExportToJPEG</service-name>
+     <service-name>ExportToJPEG</service-name>
      <inParameter-list>
-<inParameter>
-<inParameter-type>string</inParameter-type>
-       <inParameter-name>fileName</inParameter-name>      </inParameter>
       <inParameter>
-<inParameter-type>long</inParameter-type>
-       <inParameter-name>size</inParameter-name>      </inParameter>     </inParameter-list>
+       <inParameter-type>string</inParameter-type>
+       <inParameter-name>fileName</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>long</inParameter-type>
+       <inParameter-name>size</inParameter-name>
+      </inParameter>
+     </inParameter-list>
      <outParameter-list>
-<outParameter>
-<outParameter-type>boolean</outParameter-type>
-       <outParameter-name>return</outParameter-name>      </outParameter>     </outParameter-list>    </service>
+      <outParameter>
+       <outParameter-type>boolean</outParameter-type>
+       <outParameter-name>return</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
     <DataStream-list/>
     <PyFunction-list/>
-    <creation-date>14/7/2005 - 17:28:25</creation-date>
-    <lastmodification-date>14/7/2005 - 17:28:25</lastmodification-date>
+    <creation-date>5/9/2005 - 17:48:48</creation-date>
+    <lastmodification-date>5/9/2005 - 17:48:48</lastmodification-date>
     <editor-release>2.0</editor-release>
     <author>?</author>
     <container>localhost/FactoryServer</container>
     <comment>ExportToJPEG from SIERPINSKY</comment>
     <x-position>474</x-position>
-    <y-position>658</y-position>   </node>  </node-list>
+    <y-position>658</y-position>
+   </node>
+  </node-list>
   <link-list>
-<link>
-<fromnode-name>InitPoint</fromnode-name>
+   <link>
+    <fromnode-name>InitPoint</fromnode-name>
     <fromserviceparameter-name>theX</fromserviceparameter-name>
     <tonode-name>Loop</tonode-name>
     <toserviceparameter-name>x</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>InitPoint</fromnode-name>
+    <fromnode-name>InitPoint</fromnode-name>
     <fromserviceparameter-name>theY</fromserviceparameter-name>
     <tonode-name>Loop</tonode-name>
     <toserviceparameter-name>y</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>NextIteration</fromnode-name>
+    <fromnode-name>NextIteration</fromnode-name>
     <fromserviceparameter-name>return</fromserviceparameter-name>
     <tonode-name>NextPoint</tonode-name>
     <toserviceparameter-name>iter</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>807</x>
-      <y>118</y>     </coord>
      <coord>
-<x>807</x>
-      <y>278</y>     </coord>    </coord-list>   </link>
+      <x>807</x>
+      <y>118</y>
+     </coord>
+     <coord>
+      <x>807</x>
+      <y>278</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>NextPoint</fromnode-name>
+    <fromnode-name>NextPoint</fromnode-name>
     <fromserviceparameter-name>nextX</fromserviceparameter-name>
     <tonode-name>EndLoop</tonode-name>
     <toserviceparameter-name>x</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>NextPoint</fromnode-name>
+    <fromnode-name>NextPoint</fromnode-name>
     <fromserviceparameter-name>nextY</fromserviceparameter-name>
     <tonode-name>EndLoop</tonode-name>
     <toserviceparameter-name>y</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>Loop</fromnode-name>
+    <fromnode-name>Loop</fromnode-name>
     <fromserviceparameter-name>DoLoop</fromserviceparameter-name>
     <tonode-name>EndLoop</tonode-name>
     <toserviceparameter-name>DoLoop</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>Loop</fromnode-name>
+    <fromnode-name>Loop</fromnode-name>
     <fromserviceparameter-name>x</fromserviceparameter-name>
     <tonode-name>NextPoint</tonode-name>
     <toserviceparameter-name>X</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>Loop</fromnode-name>
+    <fromnode-name>Loop</fromnode-name>
     <fromserviceparameter-name>y</fromserviceparameter-name>
     <tonode-name>NextPoint</tonode-name>
     <toserviceparameter-name>Y</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>Loop</fromnode-name>
+    <fromnode-name>Loop</fromnode-name>
     <fromserviceparameter-name>nbIter</fromserviceparameter-name>
     <tonode-name>EndLoop</tonode-name>
     <toserviceparameter-name>nbIter</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>Loop</fromnode-name>
+    <fromnode-name>Loop</fromnode-name>
     <fromserviceparameter-name>iter</fromserviceparameter-name>
     <tonode-name>EndLoop</tonode-name>
     <toserviceparameter-name>iter</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>Loop</fromnode-name>
+    <fromnode-name>Loop</fromnode-name>
     <fromserviceparameter-name>Gate</fromserviceparameter-name>
     <tonode-name>NextIteration</tonode-name>
     <toserviceparameter-name>Gate</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>615</x>
-      <y>302</y>     </coord>
      <coord>
-<x>615</x>
-      <y>162</y>     </coord>    </coord-list>   </link>
+      <x>615</x>
+      <y>302</y>
+     </coord>
+     <coord>
+      <x>615</x>
+      <y>162</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>EndLoop</fromnode-name>
+    <fromnode-name>EndLoop</fromnode-name>
     <fromserviceparameter-name>DoLoop</fromserviceparameter-name>
     <tonode-name>Loop</tonode-name>
     <toserviceparameter-name>DoLoop</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>EndLoop</fromnode-name>
+    <fromnode-name>EndLoop</fromnode-name>
     <fromserviceparameter-name>Gate</fromserviceparameter-name>
     <tonode-name>ExportToMED</tonode-name>
     <toserviceparameter-name>Gate</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>457</x>
-      <y>599</y>     </coord>
      <coord>
-<x>457</x>
-      <y>377</y>     </coord>
+      <x>457</x>
+      <y>599</y>
+     </coord>
+     <coord>
+      <x>457</x>
+      <y>377</y>
+     </coord>
      <coord>
-<x>1195</x>
-      <y>377</y>     </coord>
+      <x>1195</x>
+      <y>377</y>
+     </coord>
      <coord>
-<x>1195</x>
-      <y>162</y>     </coord>    </coord-list>   </link>
+      <x>1195</x>
+      <y>162</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>EndLoop</fromnode-name>
+    <fromnode-name>EndLoop</fromnode-name>
     <fromserviceparameter-name>Gate</fromserviceparameter-name>
     <tonode-name>ExportToJPEG</tonode-name>
     <toserviceparameter-name>Gate</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>457</x>
-      <y>773</y>     </coord>
      <coord>
-<x>457</x>
-      <y>377</y>     </coord>
+      <x>457</x>
+      <y>773</y>
+     </coord>
      <coord>
-<x>1195</x>
-      <y>377</y>     </coord>
+      <x>457</x>
+      <y>377</y>
+     </coord>
      <coord>
-<x>1195</x>
-      <y>162</y>     </coord>    </coord-list>   </link>
+      <x>1195</x>
+      <y>377</y>
+     </coord>
+     <coord>
+      <x>1195</x>
+      <y>162</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>ExportToMED</fromnode-name>
+    <fromnode-name>ExportToMED</fromnode-name>
     <fromserviceparameter-name>return</fromserviceparameter-name>
     <tonode-name>CheckMedFile</tonode-name>
     <toserviceparameter-name>ok</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>ImportToVISU</fromnode-name>
+    <fromnode-name>ImportToVISU</fromnode-name>
     <fromserviceparameter-name>Gate</fromserviceparameter-name>
     <tonode-name>EndOfCheckMedFile</tonode-name>
     <toserviceparameter-name>Default</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>CheckMedFile</fromnode-name>
+    <fromnode-name>CheckMedFile</fromnode-name>
     <fromserviceparameter-name>ok</fromserviceparameter-name>
     <tonode-name>ImportToVISU</tonode-name>
     <toserviceparameter-name>Gate</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>Init</fromnode-name>
+    <fromnode-name>Init</fromnode-name>
     <fromserviceparameter-name>Gate</fromserviceparameter-name>
     <tonode-name>Loop</tonode-name>
     <toserviceparameter-name>Gate</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>412</x>
-      <y>162</y>     </coord>
      <coord>
-<x>412</x>
-      <y>380</y>     </coord>    </coord-list>   </link>
+      <x>412</x>
+      <y>162</y>
+     </coord>
+     <coord>
+      <x>412</x>
+      <y>380</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>InitPoint_1</fromnode-name>
+    <fromnode-name>InitPoint_1</fromnode-name>
     <fromserviceparameter-name>theX</fromserviceparameter-name>
     <tonode-name>Init</tonode-name>
     <toserviceparameter-name>X1</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>InitPoint_1</fromnode-name>
+    <fromnode-name>InitPoint_1</fromnode-name>
     <fromserviceparameter-name>theY</fromserviceparameter-name>
     <tonode-name>Init</tonode-name>
     <toserviceparameter-name>Y1</toserviceparameter-name>
-    <coord-list/>   </link>
+    <coord-list/>
+   </link>
    <link>
-<fromnode-name>InitPoint_2</fromnode-name>
+    <fromnode-name>InitPoint_2</fromnode-name>
     <fromserviceparameter-name>theX</fromserviceparameter-name>
     <tonode-name>Init</tonode-name>
     <toserviceparameter-name>X2</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>198</x>
-      <y>296</y>     </coord>
      <coord>
-<x>198</x>
-      <y>388</y>     </coord>    </coord-list>   </link>
+      <x>198</x>
+      <y>296</y>
+     </coord>
+     <coord>
+      <x>198</x>
+      <y>388</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>InitPoint_2</fromnode-name>
+    <fromnode-name>InitPoint_2</fromnode-name>
     <fromserviceparameter-name>theY</fromserviceparameter-name>
     <tonode-name>Init</tonode-name>
     <toserviceparameter-name>Y2</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>204</x>
-      <y>316</y>     </coord>
      <coord>
-<x>204</x>
-      <y>408</y>     </coord>    </coord-list>   </link>
+      <x>204</x>
+      <y>316</y>
+     </coord>
+     <coord>
+      <x>204</x>
+      <y>408</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>InitPoint_3</fromnode-name>
+    <fromnode-name>InitPoint_3</fromnode-name>
     <fromserviceparameter-name>theX</fromserviceparameter-name>
     <tonode-name>Init</tonode-name>
     <toserviceparameter-name>X3</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>210</x>
-      <y>336</y>     </coord>
      <coord>
-<x>210</x>
-      <y>519</y>     </coord>    </coord-list>   </link>
+      <x>210</x>
+      <y>336</y>
+     </coord>
+     <coord>
+      <x>210</x>
+      <y>519</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>InitPoint_3</fromnode-name>
+    <fromnode-name>InitPoint_3</fromnode-name>
     <fromserviceparameter-name>theY</fromserviceparameter-name>
     <tonode-name>Init</tonode-name>
     <toserviceparameter-name>Y3</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>216</x>
-      <y>356</y>     </coord>
      <coord>
-<x>216</x>
-      <y>539</y>     </coord>    </coord-list>   </link>
+      <x>216</x>
+      <y>356</y>
+     </coord>
+     <coord>
+      <x>216</x>
+      <y>539</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>getFileNames</fromnode-name>
+    <fromnode-name>getFileNames</fromnode-name>
     <fromserviceparameter-name>medFile</fromserviceparameter-name>
     <tonode-name>ExportToMED</tonode-name>
     <toserviceparameter-name>fileName</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>355</x>
-      <y>555</y>     </coord>
      <coord>
-<x>355</x>
-      <y>665</y>     </coord>    </coord-list>   </link>
+      <x>355</x>
+      <y>555</y>
+     </coord>
+     <coord>
+      <x>355</x>
+      <y>665</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>getFileNames</fromnode-name>
+    <fromnode-name>getFileNames</fromnode-name>
     <fromserviceparameter-name>medFile</fromserviceparameter-name>
     <tonode-name>ImportToVISU</tonode-name>
     <toserviceparameter-name>fileName</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>842</x>
-      <y>531</y>     </coord>
      <coord>
-<x>842</x>
-      <y>430</y>     </coord>
+      <x>842</x>
+      <y>531</y>
+     </coord>
      <coord>
-<x>355</x>
-      <y>430</y>     </coord>
+      <x>842</x>
+      <y>430</y>
+     </coord>
      <coord>
-<x>355</x>
-      <y>665</y>     </coord>    </coord-list>   </link>
+      <x>355</x>
+      <y>430</y>
+     </coord>
+     <coord>
+      <x>355</x>
+      <y>665</y>
+     </coord>
+    </coord-list>
+   </link>
    <link>
-<fromnode-name>getFileNames</fromnode-name>
+    <fromnode-name>getFileNames</fromnode-name>
     <fromserviceparameter-name>jpegFile</fromserviceparameter-name>
     <tonode-name>ExportToJPEG</tonode-name>
     <toserviceparameter-name>fileName</toserviceparameter-name>
     <coord-list>
-<coord>
-<x>356</x>
-      <y>729</y>     </coord>
      <coord>
-<x>356</x>
-      <y>685</y>     </coord>    </coord-list>   </link>  </link-list>
+      <x>356</x>
+      <y>729</y>
+     </coord>
+     <coord>
+      <x>356</x>
+      <y>685</y>
+     </coord>
+    </coord-list>
+   </link>
+  </link-list>
   <data-list>
-<data>
-<fromnode-name>aNewDataFlow_1</fromnode-name>
+   <data>
+    <fromnode-name>aNewDataFlow_1</fromnode-name>
     <fromserviceparameter-name>Loop__nbIter</fromserviceparameter-name>
     <tonode-name>Loop</tonode-name>
     <toserviceparameter-name>nbIter</toserviceparameter-name>
     <data-value>
-<value-type>3</value-type>
-     <value>500</value>    </data-value>
-    <coord-list/>   </data>
+     <value-type>3</value-type>
+     <value>500</value>
+    </data-value>
+    <coord-list/>
+   </data>
    <data>
-<fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow_1</fromnode-name>
     <fromserviceparameter-name>Loop__iter</fromserviceparameter-name>
     <tonode-name>Loop</tonode-name>
     <toserviceparameter-name>iter</toserviceparameter-name>
     <data-value>
-<value-type>3</value-type>
-     <value>0</value>    </data-value>
-    <coord-list/>   </data>
+     <value-type>3</value-type>
+     <value>0</value>
+    </data-value>
+    <coord-list/>
+   </data>
    <data>
-<fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow_1</fromnode-name>
     <fromserviceparameter-name>ExportToMED__size</fromserviceparameter-name>
     <tonode-name>ExportToMED</tonode-name>
     <toserviceparameter-name>size</toserviceparameter-name>
     <data-value>
-<value-type>7</value-type>
-     <value>100</value>    </data-value>
-    <coord-list/>   </data>
+     <value-type>7</value-type>
+     <value>100</value>
+    </data-value>
+    <coord-list/>
+   </data>
    <data>
-<fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow_1</fromnode-name>
     <fromserviceparameter-name>getFileNames__medFile</fromserviceparameter-name>
     <tonode-name>getFileNames</tonode-name>
     <toserviceparameter-name>medFile</toserviceparameter-name>
     <data-value>
-<value-type>18</value-type>
-     <value><![CDATA[/tmp/sierpinsky_graph2.med]]></value>    </data-value>
-    <coord-list/>   </data>
+     <value-type>18</value-type>
+     <value>/tmp/sierpinsky_graph2.med</value>
+    </data-value>
+    <coord-list/>
+   </data>
    <data>
-<fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow_1</fromnode-name>
     <fromserviceparameter-name>getFileNames__jpegFile</fromserviceparameter-name>
     <tonode-name>getFileNames</tonode-name>
     <toserviceparameter-name>jpegFile</toserviceparameter-name>
     <data-value>
-<value-type>18</value-type>
-     <value><![CDATA[/tmp/sierpinsky_graph2.jpg]]></value>    </data-value>
-    <coord-list/>   </data>
+     <value-type>18</value-type>
+     <value>/tmp/sierpinsky_graph2.jpg</value>
+    </data-value>
+    <coord-list/>
+   </data>
    <data>
-<fromnode-name>aNewDataFlow_1</fromnode-name>
+    <fromnode-name>aNewDataFlow_1</fromnode-name>
     <fromserviceparameter-name>ExportToJPEG__size</fromserviceparameter-name>
     <tonode-name>ExportToJPEG</tonode-name>
     <toserviceparameter-name>size</toserviceparameter-name>
     <data-value>
-<value-type>3</value-type>
-     <value>100</value>    </data-value>
-    <coord-list/>   </data>  </data-list> </dataflow></supergraph>
+     <value-type>3</value-type>
+     <value>100</value>
+    </data-value>
+    <coord-list/>
+   </data>
+  </data-list>
+ </dataflow>
+</supergraph>
+

diff --git a/src/Sierpinsky/Makefile.in b/src/Sierpinsky/Makefile.in
index cafbee765365b8749fb31bd523c26a041a7c8c99..c9c0894638f9b87f48d6386cc61b7fe6313f2eeb 100644 (file)
--- a/src/Sierpinsky/Makefile.in
+++ b/src/Sierpinsky/Makefile.in
@@ -20,12 +20,12 @@ LIB = libSIERPINSKYEngine.la
 
 LIB_SRC = SIERPINSKY_Gen_i.cxx 
 
-LIB_SERVER_IDL = Sierpinsky.idl
+LIB_SERVER_IDL = Sierpinsky.idl MED.idl
 LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl
 
-CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) $(HDF5_INCLUDES)
+CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(HDF5_INCLUDES) -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
 
-LDFLAGS       += -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper
-LDFLAGSFORBIN += -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper
+LDFLAGS       += -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper
+LDFLAGSFORBIN += -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
 
 @CONCLUDE@

diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
index 6f94aca26f803d11e4cbd783dc6052d3b109c0b9..7069dbb5e74685512d0dad3c6bec5580cca44a53 100644 (file)
--- a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
+++ b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
@@ -22,9 +22,9 @@ extern "C"
                                                       const char*               instanceName,
                                                       const char*               interfaceName )
 {
-    SIERPINSKY_Gen_i* anEngine = new SIERPINSKY_Gen_i( orb, poa, contId, instanceName, interfaceName );
-    return anEngine->getId() ;
-  }
+  SIERPINSKY_Gen_i* anEngine = new SIERPINSKY_Gen_i( orb, poa, contId, instanceName, interfaceName );
+  return anEngine->getId() ;
+}
 }
 
 /*!

diff --git a/src/SierpinskyGUI/Makefile.in b/src/SierpinskyGUI/Makefile.in
index 93900a79257b39bc64d24ae8fd4b25f7b4214e93..4f2b94a0021e15f49703adece8685221fca9e4b4 100644 (file)
--- a/src/SierpinskyGUI/Makefile.in
+++ b/src/SierpinskyGUI/Makefile.in
@@ -27,13 +27,16 @@ LIB_SRC = \
        SierpinskyGUI_RunDlg.cxx
 
 LIB_MOC = \
-       SierpinskyGUI_RunDlg.h
+       SierpinskyGUI_RunDlg.h \
+       SierpinskyGUI.h
 
 LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl Sierpinsky.idl Randomizer.idl \
 SALOME_GenericObj.idl SALOMEDS_Attributes.idl SALOME_Comm.idl MED.idl VISU_Gen.idl
 
-CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome
-CXXFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome
-LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome $(QT_LIBS) -lSalomeGUI -lSIERPINSKYEngine -L${RANDOMIZER_ROOT_DIR}/lib/salome
+CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+
+CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
+
+LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome $(QT_LIBS) -L${GUI_ROOT_DIR}/lib/salome -lSalomeApp -lSIERPINSKYEngine -L${RANDOMIZER_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/include/salome -lSalomeLifeCycleCORBA
 
 @CONCLUDE@

diff --git a/src/SierpinskyGUI/SIERPINSKY_icons.po b/src/SierpinskyGUI/SIERPINSKY_icons.po
index b386757ac53d6333472512568ee1dd51b605f34c..d1fc0e858201dc5d1d010f1849d9bb54c1847097 100644 (file)
--- a/src/SierpinskyGUI/SIERPINSKY_icons.po
+++ b/src/SierpinskyGUI/SIERPINSKY_icons.po
@@ -9,3 +9,5 @@ msgstr ""
 "Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 
+msgid "ICON_RUN_DLG"
+msgstr "go.png"

diff --git a/src/SierpinskyGUI/SIERPINSKY_msg_en.po b/src/SierpinskyGUI/SIERPINSKY_msg_en.po
index 0681603d48a75d14c42fa92a8fc349161aa709b8..7777329c089960901c0ddb5e2f2be248575933a2 100644 (file)
--- a/src/SierpinskyGUI/SIERPINSKY_msg_en.po
+++ b/src/SierpinskyGUI/SIERPINSKY_msg_en.po
@@ -10,6 +10,15 @@ msgstr ""
 "Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 
+msgid "SierpinskyGUI::RUN"
+msgstr "Run"
+
+msgid "SierpinskyGUI::CAPTION"
+msgstr "Run Sierpinsky dialog"
+
+msgid "SierpinskyGUI::MENU_Sierpinsky"
+msgstr "Sierpinsky"
+
 msgid "SierpinskyGUI_RunDlg::CAPTION"
 msgstr "Run Sierpinsky Algo"
 

diff --git a/src/SierpinskyGUI/SierpinskyGUI.cxx b/src/SierpinskyGUI/SierpinskyGUI.cxx
index ef8568cdbb2c23055260fcec9f964aa27decb2af..eb872682ec92a23f080f131f51e7efef9a3d41bd 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI.cxx
+++ b/src/SierpinskyGUI/SierpinskyGUI.cxx
@@ -6,52 +6,121 @@
 ///////////////////////////////////////////////////////////
 
 #include "SierpinskyGUI.h"
-#include "SierpinskyGUI_RunDlg.h"
 
-#include "QAD_Desktop.h"
+#include <SUIT_MessageBox.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <SALOME_LifeCycleCORBA.hxx>
+#include <SierpinskyGUI_RunDlg.h>
 
-SierpinskyGUI* SierpinskyGUI::GetSierpinskyGUI()
+#include <SUIT_Desktop.h>
+
+/*!
+ * Constructor
+ */
+SierpinskyGUI::SierpinskyGUI() : 
+  SalomeApp_Module("Sierpinsky")
 {
-  static SierpinskyGUI gui;
-  return &gui;
+}
+
+/*! 
+ * Gets an reference to the module's engine
+ */
+SIERPINSKY_ORB::SIERPINSKY_ptr SierpinskyGUI::InitSIERPINSKYGen( SalomeApp_Application* app )
+{
+  SIERPINSKY_ORB::SIERPINSKY_ptr clr;
+  try{
+    Engines::Component_var comp = app->lcc()->FindOrLoad_Component( "FactoryServer","SIERPINSKY" );
+    clr = SIERPINSKY_ORB::SIERPINSKY::_narrow(comp);
+  }
+  catch (CORBA::Exception&){
+    MESSAGE("Caught CORBA::Exception.");
+  }
+  catch (...){
+    MESSAGE("Caught unknown exception.");
+  }
+  return clr;
 }
 
 /*!
- * Constructor
+ * Module's initialization
  */
-SierpinskyGUI::SierpinskyGUI( const QString& name, QObject* parent )
+void SierpinskyGUI::initialize( CAM_Application* app )
 {
+  SalomeApp_Module::initialize( app );
+
+  InitSIERPINSKYGen( dynamic_cast<SalomeApp_Application*>( app ) );
+
+  QWidget* aParent = app->desktop();
+  SUIT_ResourceMgr* aResourceMgr = app->resourceMgr();
+
+  // create actions
+  QPixmap aPixmap = aResourceMgr->loadPixmap( "SIERPINSKY",tr( "ICON_RUN_DLG" ) );
+  createAction( 901, tr( "Run Dialog" ), QIconSet(aPixmap), tr( "RUN" ), tr( "CAPTION" ), 0, aParent, false,
+               this, SLOT( OnRun() ) );
+
+  // create menus
+  int aMenuId;
+  aMenuId = createMenu( tr( "MENU_Sierpinsky" ), -1, -1, 30 );
+  createMenu( 901, aMenuId, 10 );
+
+  // create toolbars
+  int aToolId = createTool ( tr( "TOOL_Sierpinsky" ) );
+  createTool( 901, aToolId );
 }
 
 /*!
- * Destructor
+ * Module's engine IOR
  */
-SierpinskyGUI::~SierpinskyGUI()
+QString SierpinskyGUI::engineIOR() const
 {
+  CORBA::String_var anIOR = getApp()->orb()->object_to_string( InitSIERPINSKYGen( getApp() ) );
+  return QString( anIOR.in() );
 }
 
 /*!
- * Processes GUI event
+ * Module's activation
  */
-bool SierpinskyGUI::OnGUIEvent( int theCommandID, QAD_Desktop* parent )
-{
-  switch( theCommandID ) {
-  case 10000:
-    {
-      SierpinskyGUI_RunDlg* aDlg = new SierpinskyGUI_RunDlg( parent );
-      aDlg->exec();
-      break;
-    }
-  }
-  return true;
+bool SierpinskyGUI::activateModule( SUIT_Study* theStudy )
+{
+  bool bOk = SalomeApp_Module::activateModule( theStudy );
+
+  setMenuShown(true);
+  setToolShown(true);
+
+  return bOk;
+}
+
+/*!
+ * Module's deactivation
+ */
+bool SierpinskyGUI::deactivateModule( SUIT_Study* theStudy )
+{
+  setMenuShown(false);
+  setToolShown(false);
+
+  return SalomeApp_Module::deactivateModule( theStudy );
 }
 
 /*!
- * GUI factory
+ * Destructor
  */
-extern "C"
+SierpinskyGUI::~SierpinskyGUI()
 {
-  Standard_EXPORT SALOMEGUI* GetComponentGUI() {
-    return SierpinskyGUI::GetSierpinskyGUI();
+}
+
+
+// Action slot
+void SierpinskyGUI::OnRun()
+{
+  QWidget* aParent = getApp()->desktop();
+  SierpinskyGUI_RunDlg* aDlg = new SierpinskyGUI_RunDlg( aParent );
+  aDlg->exec();
+}
+
+extern "C" {
+  CAM_Module* createModule()
+  {
+    return new SierpinskyGUI();
   }
 }

diff --git a/src/SierpinskyGUI/SierpinskyGUI.h b/src/SierpinskyGUI/SierpinskyGUI.h
index c296982a9707e9d5a37da52be41c19d4aec74f33..eba7f078b7b84650044c2cde7a7e980131cfd8aa 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI.h
+++ b/src/SierpinskyGUI/SierpinskyGUI.h
@@ -8,23 +8,36 @@
 #ifndef __SIERPINSKYGUI_H
 #define __SIERPINSKYGUI_H
 
-#include "SALOMEGUI.h"
+#include <SalomeApp_Module.h>
 
-class QAD_Desktop;
+#include <SALOMEconfig.h>
+#include CORBA_CLIENT_HEADER(Sierpinsky)
 
-class SierpinskyGUI : public SALOMEGUI
+class SUIT_Desktop;
+class SalomeApp_Application;
+
+class SierpinskyGUI : public SalomeApp_Module
 {
+  Q_OBJECT;
+
 public:
   // Constructor
-  SierpinskyGUI( const QString& name = "", QObject* parent = 0 );
+  SierpinskyGUI();
   // Destructor
   ~SierpinskyGUI();
 
-  // Get the only instance of GUI
-  static SierpinskyGUI* SierpinskyGUI::GetSierpinskyGUI();
+  void    initialize( CAM_Application* );
+  virtual QString     engineIOR() const;
+
+  static SIERPINSKY_ORB::SIERPINSKY_ptr InitSIERPINSKYGen( SalomeApp_Application* );
+  
+public slots:
+  bool    deactivateModule( SUIT_Study* );
+  bool    activateModule( SUIT_Study* );
+
+protected slots:
+  void    OnRun();
 
-  // Processes GUI event
-  virtual bool OnGUIEvent( int theCommandID, QAD_Desktop* parent );
 };
 
 #endif // __SIERPINSKYGUI_H

diff --git a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
index 146bea94e7d2a9241b7e998009e484c735826a01..b47f1ef689c689bcc2722195c749d930ea4b4094 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
+++ b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
@@ -6,6 +6,9 @@
 ///////////////////////////////////////////////////////////
 
 #include "SierpinskyGUI_RunDlg.h"
+#include "SALOME_LifeCycleCORBA.hxx"
+#include "SalomeApp_Application.h"
+//#include "VisuGUI_Tools.h"
 
 #include <qlabel.h>
 #include <qlineedit.h>
@@ -18,11 +21,11 @@
 #include <qprogressbar.h>
 #include <qapplication.h>
 
-#include <QAD_Application.h>
-#include <QAD_Desktop.h>
-#include <QAD_FileDlg.h>
-#include <QAD_SpinBoxDbl.h>
-#include <QAD_MessageBox.h>
+#include <SUIT_Application.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_FileDlg.h>
+#include <QtxDblSpinBox.h>
+#include <SUIT_MessageBox.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(Sierpinsky)
@@ -37,10 +40,17 @@ static RANDOMIZER_ORB::RANDOMIZER_var getRandomizerEngine()
 {
   static RANDOMIZER_ORB::RANDOMIZER_var aGen;
   if( CORBA::is_nil( aGen ) ) {
-    if( QAD_Desktop* aDesktop = QAD_Application::getDesktop() ) {
-      Engines::Component_var aComponent = aDesktop->getEngine( "FactoryServerPy","RANDOMIZER" );
+    try{
+      SALOME_LifeCycleCORBA aLCC(SalomeApp_Application::namingService());
+      Engines::Component_var aComponent = aLCC.FindOrLoad_Component("FactoryServerPy","RANDOMIZER");
       aGen = RANDOMIZER_ORB::RANDOMIZER::_narrow( aComponent );
     }
+    catch (CORBA::Exception&){
+      MESSAGE("Caught CORBA::Exception.");
+    }
+    catch (...){
+      MESSAGE("Caught unknown exception.");
+    }
   }
   return aGen;
 }
@@ -52,10 +62,17 @@ static SIERPINSKY_ORB::SIERPINSKY_var getSierpinskyEngine()
 {
   static SIERPINSKY_ORB::SIERPINSKY_var aGen;
   if( CORBA::is_nil( aGen ) ) {
-    if( QAD_Desktop* aDesktop = QAD_Application::getDesktop() ) {
-      Engines::Component_var aComponent = aDesktop->getEngine( "FactoryServer","SIERPINSKY" );
+    try{
+      SALOME_LifeCycleCORBA aLCC(SalomeApp_Application::namingService());
+      Engines::Component_var aComponent = aLCC.FindOrLoad_Component("FactoryServer","SIERPINSKY");
       aGen = SIERPINSKY_ORB::SIERPINSKY::_narrow( aComponent );
     }
+    catch (CORBA::Exception&){
+      MESSAGE("Caught CORBA::Exception.");
+    }
+    catch (...){
+      MESSAGE("Caught unknown exception.");
+    }
   }
   return aGen;
 }
@@ -67,10 +84,18 @@ static VISU::VISU_Gen_var getVisuEngine()
 {
   static VISU::VISU_Gen_var aGen;
   if( CORBA::is_nil( aGen ) ) {
-    if( QAD_Desktop* aDesktop = QAD_Application::getDesktop() ) {
-      Engines::Component_var aComponent = aDesktop->getEngine( "FactoryServer","VISU" );
+    try{
+      SALOME_LifeCycleCORBA aLCC(SalomeApp_Application::namingService());
+      Engines::Component_var aComponent = aLCC.FindOrLoad_Component("FactoryServer","VISU");
       aGen = VISU::VISU_Gen::_narrow( aComponent );
     }
+    catch (CORBA::Exception&){
+      MESSAGE("Caught CORBA::Exception.");
+    }
+    catch (...){
+      MESSAGE("Caught unknown exception.");
+    }
+
   }
   return aGen;
 }
@@ -149,11 +174,11 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent )
   box1Layout->setMargin( MARGIN_SIZE ); box1Layout->setSpacing( SPACING_SIZE );
 
   QLabel* labX = new QLabel( "X:", box1 );
-  myStartX = new QAD_SpinBoxDbl( box1, 0.0, 1.0, 0.1 );
+  myStartX = new QtxDblSpinBox( 0.0, 1.0, 0.1 ,box1);
   myStartX->setMinimumWidth( 150 );
 
   QLabel* labY = new QLabel( "Y:", box1 );
-  myStartY = new QAD_SpinBoxDbl( box1, 0.0, 1.0, 0.1 );
+  myStartY = new QtxDblSpinBox( 0.0, 1.0, 0.1 ,box1);
   myStartY->setMinimumWidth( 150 );
 
   myStartRandom = new QCheckBox( tr( "RANDOM" ), box1 );
@@ -173,27 +198,27 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent )
   box2Layout->setMargin( MARGIN_SIZE ); box2Layout->setSpacing( SPACING_SIZE );
 
   QLabel* labX1 = new QLabel( "X1:", box2 );
-  myX1 = new QAD_SpinBoxDbl( box2, 0.0, 1.0, 0.1 );
+  myX1 = new QtxDblSpinBox( 0.0, 1.0, 0.1 , box2);
   myX1->setMinimumWidth( 150 );
 
   QLabel* labY1 = new QLabel( "Y1:", box2 );
-  myY1 = new QAD_SpinBoxDbl( box2, 0.0, 1.0, 0.1 );
+  myY1 = new QtxDblSpinBox( 0.0, 1.0, 0.1 , box2);
   myY1->setMinimumWidth( 150 );
 
   QLabel* labX2 = new QLabel( "X2:", box2 );
-  myX2 = new QAD_SpinBoxDbl( box2, 0.0, 1.0, 0.1 );
+  myX2 = new QtxDblSpinBox( 0.0, 1.0, 0.1 , box2);
   myX2->setMinimumWidth( 150 );
 
   QLabel* labY2 = new QLabel( "Y2:", box2 );
-  myY2 = new QAD_SpinBoxDbl( box2, 0.0, 1.0, 0.1 );
+  myY2 = new QtxDblSpinBox( 0.0, 1.0, 0.1, box2);
   myY2->setMinimumWidth( 150 );
 
   QLabel* labX3 = new QLabel( "X3:", box2 );
-  myX3 = new QAD_SpinBoxDbl( box2, 0.0, 1.0, 0.1 );
+  myX3 = new QtxDblSpinBox( 0.0, 1.0, 0.1, box2);
   myX3->setMinimumWidth( 150 );
 
   QLabel* labY3 = new QLabel( "Y3:", box2 );
-  myY3 = new QAD_SpinBoxDbl( box2, 0.0, 1.0, 0.1 );
+  myY3 = new QtxDblSpinBox( 0.0, 1.0, 0.1, box2);
   myY3->setMinimumWidth( 150 );
 
   myBaseRandom  = new QCheckBox( tr( "RANDOM" ), box2 );
@@ -248,7 +273,7 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent )
   myMedBtn->setFixedSize( 20, 20 );
 
   QLabel* labMed = new QLabel( tr( "MESH_SIZE" ), box3 );
-  myMedSize = new QAD_SpinBoxDbl( box3, 0.0, 1000, 1.0 );
+  myMedSize = new QtxDblSpinBox( 0.0, 1000, 1.0, box3);
   myMedSize->setMinimumWidth( 150 );
 
   myVisuCheck = new QCheckBox( tr( "IMPORT_MED_2_VISU" ), box3 );
@@ -334,7 +359,7 @@ void SierpinskyGUI_RunDlg::onBrowse()
 {
   const QObject* snd = sender();
   bool jpg = snd == myJpegBtn;
-  QString aFileName = QAD_FileDlg::getFileName( this, 
+  QString aFileName = SUIT_FileDlg::getFileName( this, 
                                                jpg ? myJpegFile->text() : myMedFile->text(), 
                                                QStringList::split( ":", jpg ? tr( "JPEG_FILES") : tr( "MED_FILES" ) ),
                                                jpg ? tr( "EXPORT_JPEG_FILE" ) : tr( "EXPORT_MED_FILE" ),
@@ -389,7 +414,7 @@ void SierpinskyGUI_RunDlg::accept()
   SIERPINSKY_ORB::SIERPINSKY_var aSierpGen = getSierpinskyEngine();
 
   if( CORBA::is_nil( aRandGen ) || CORBA::is_nil( aSierpGen ) ) {
-    QAD_MessageBox::error1( this,
+    SUIT_MessageBox::error1( this,
                            tr( "ERR_ERROR" ),
                            tr( "EXEC_ERROR" ),
                            tr( "OK_BTN") );
@@ -403,7 +428,7 @@ void SierpinskyGUI_RunDlg::accept()
     aJPEGFile = myJpegFile->text().stripWhiteSpace();
     aJPEGSize = myJpegSize->value();
     if ( aJPEGFile.isEmpty() || aJPEGSize <= 0 ) {
-      int res = QAD_MessageBox::warn2( this,
+      int res = SUIT_MessageBox::warn2( this,
                                       tr( "WRN_WARNING" ),
                                       tr( "JPEG_PARAMETERS_ERROR" ),
                                       tr( "YES_BTN"), tr( "NO_BTN" ), 0, 1, 0 );
@@ -418,7 +443,7 @@ void SierpinskyGUI_RunDlg::accept()
     aMEDFile = myMedFile->text().stripWhiteSpace();
     aMEDSize = myMedSize->value();
     if ( aMEDFile.isEmpty() || aMEDSize <= 0 ) {
-      int res = QAD_MessageBox::warn2( this,
+      int res = SUIT_MessageBox::warn2( this,
                                       tr( "WRN_WARNING" ),
                                       tr( "MED_PARAMETERS_ERROR" ),
                                       tr( "YES_BTN"), tr( "NO_BTN" ), 0, 1, 0 );
@@ -521,7 +546,6 @@ void SierpinskyGUI_RunDlg::nextStep( const int step )
             VISU::Result_var aResult = aVisuGen->ImportFile( aMEDFile.latin1() );
             if ( !CORBA::is_nil( aResult ) )
               aVisuGen->MeshOnEntity( aResult, "Sierpinsky", VISU::NODE );
-            QAD_Application::getDesktop()->getActiveStudy()->updateObjBrowser( true );
           }
         }
       }

diff --git a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h
index 428e5b7fb402f3103a1201f79b3d8c3d0033a35e..5e3a70d0c14b761cf19e5fb20c2556342b779073 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h
+++ b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h
@@ -15,7 +15,7 @@ class QCheckBox;
 class QSpinBox;
 class QPushButton;
 class QGroupBox;
-class QAD_SpinBoxDbl;
+class QtxDblSpinBox;
 class MyThread;
 class QProgressBar;
 
@@ -46,17 +46,17 @@ protected slots:
 private:
   // widgets
   QGroupBox*      box1;
-  QAD_SpinBoxDbl* myStartX;
-  QAD_SpinBoxDbl* myStartY;
+  QtxDblSpinBox* myStartX;
+  QtxDblSpinBox* myStartY;
   QCheckBox*      myStartRandom;
 
   QGroupBox*      box2;
-  QAD_SpinBoxDbl* myX1;
-  QAD_SpinBoxDbl* myY1;
-  QAD_SpinBoxDbl* myX2;
-  QAD_SpinBoxDbl* myY2;
-  QAD_SpinBoxDbl* myX3;
-  QAD_SpinBoxDbl* myY3;
+  QtxDblSpinBox* myX1;
+  QtxDblSpinBox* myY1;
+  QtxDblSpinBox* myX2;
+  QtxDblSpinBox* myY2;
+  QtxDblSpinBox* myX3;
+  QtxDblSpinBox* myY3;
   QCheckBox*      myBaseRandom;
   QCheckBox*      myBaseDefault;
 
@@ -70,7 +70,7 @@ private:
   QCheckBox*      myMedCheck;
   QLineEdit*      myMedFile;
   QPushButton*    myMedBtn;
-  QAD_SpinBoxDbl* myMedSize;
+  QtxDblSpinBox* myMedSize;
   QCheckBox*      myVisuCheck;
 
   QPushButton*    myStartBtn;