From 5dece98ca427992c49617c1fa823a20a1cfd3c1e Mon Sep 17 00:00:00 2001 From: akl Date: Mon, 10 Jun 2013 13:57:08 +0000 Subject: [PATCH] Supervisor sample graphs 'graph1.xml' and 'graph2.xml' were replaced by the same YACS schemas. --- README | 29 +- resources/Makefile.am | 4 +- resources/graph1.xml | 455 ----------------- resources/graph2.xml | 1127 ----------------------------------------- resources/schema1.xml | 117 +++++ resources/schema2.xml | 251 +++++++++ 6 files changed, 385 insertions(+), 1598 deletions(-) delete mode 100644 resources/graph1.xml delete mode 100644 resources/graph2.xml create mode 100644 resources/schema1.xml create mode 100644 resources/schema2.xml diff --git a/README b/README index 8c36269..64c0a2d 100755 --- a/README +++ b/README @@ -23,8 +23,8 @@ Randomizer and Sierpinsky SALOME-based modules implement simple interface to cal 2. Prerequisites. ======================================================= -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. +SALOME platform. +All other products are those used by SALOME. ======================================================= 3. Installation. @@ -32,13 +32,13 @@ All other products are those used by SALOME v3.0.2. The compilation procedure is exactly the same as for other SALOME modules: -3.1. install SALOME 3.0.2 with all prerequisite products; +3.1. install SALOME with all prerequisite products; 3.2. unpack Randomizer and Sierpinsky modules sources; 3.3 set environment: source /env_products.csh - where is a directory where SALOME 3.0.2 is installed to. + where is a directory where SALOME 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 /env_products.csh - where is a directory where SALOME 3.0.2 is installed to. + where is a directory where SALOME is installed to. 4.3. add Randomizer and Sierpinsky modules environment: @@ -81,7 +81,7 @@ To launch SALOME application the following steps should be performed: 4.4. launch SALOME: - ${KERNEL_ROOT_DIR}/bin/salome/runSalome --module=MED,VISU,SUPERV,RANDOMIZER,SIERPINSKY + ${KERNEL_ROOT_DIR}/bin/salome/runSalome --modules=MED,VISU,RANDOMIZER,SIERPINSKY ======================================================= 5. Functionality. @@ -167,7 +167,7 @@ After pressing the 'Start' button the calculation begins. It is possible to stop 6.2. Visualization. Activate Post-Pro (VISU) module by clicking the corresponding button on the 'Components' toolbar. -Select 'File/Import from file' menu command. Select the MED file, click 'Open' button. The MED file is imported +Select 'File - Import from file' menu command. Select the MED file, click 'Open' button. The MED file is imported to the study. Note: the MED file can be automatically imported to the study after finishing of the calculations (see previous paragraph). @@ -176,20 +176,21 @@ Select 'Post-Pro/.med/Sierpinsky/Families/onNodes' object in the Objec menu by mouse right-button click and select 'Display Only' command. The cloud of points is displayed in the viewer. Note: the visualizaion of mesh is only possible in the VTK viewer. -6.3. Supervisor. +6.3. Supervision. -Activate Supervisor module by clicking the corresponding button on the 'Components' toolbar. -There are two sample Supervisor graphs which allow to test the Randomizer and Sierpinsky modules +Activate YACS module by clicking the corresponding button on the 'Components' toolbar. +There are two sample YACS schemas which allow to test the Randomizer and Sierpinsky modules functionality. These files can be found in the /share/salome/resources directory where is the directory where you have installed Sierpinsky module (see paragraph 3). -Call 'File/Import Dataflow' menu command, then browse to the 'graph1.xml' or 'graph2.xml' file and click 'Open' button. -To launch the graph, call 'Supervisor/Run' menu command or just click the corresponding toolbar button. +Call 'YACS - Import Schema' menu command, then browse to the 'schema1.xml' or 'schema2.xml' file and click 'Open' button. +To prepare the schema for execution, call 'YACS - Run Current Schema' menu command or just click the corresponding toolbar button. +Then launch the ready schema by calling 'YACS - Start/Resume execution' menu command. -The both graphs implement simple loop to perform calculations. The first graph uses default parameters and +The both schemas implement simple loop to perform calculations. The first schema uses default parameters and exports the generated data to the JPEG file after calculation finishing. -The second graph is some more complicated. It uses random start and reference points. After the calculations finishing +The second schema is some more complicated. It uses random start and reference points. After the calculations finishing it exports the data to the JPEG file and to the MED file, then automatically imports the MED file to the Post-Pro module and displays it in the new 3d viewer (the 'ImportToVisu' inline node performs the importation and visualizing). diff --git a/resources/Makefile.am b/resources/Makefile.am index d3738d3..6f0d6b0 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -27,8 +27,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_salomeres_DATA = \ SIERPINSKY.png \ go.png \ - graph1.xml \ - graph2.xml + schema1.xml \ + schema2.xml # VSR: little trick to avoid putting if SIERPINSKYCatalog.xml to the distribution archive nodist_salomeres_SCRIPTS = SIERPINSKYCatalog.xml SalomeApp.xml diff --git a/resources/graph1.xml b/resources/graph1.xml deleted file mode 100644 index e20387e..0000000 --- a/resources/graph1.xml +++ /dev/null @@ -1,455 +0,0 @@ - - - - - - -? - ? - aNewDataFlow_1_3 - 1 - ? - -aNewDataFlow_1_3 - - -long - Loop__nbIter - -long - Loop__iter - -string - ExportToJPEG__fileName - -long - ExportToJPEG__size - - -double - EndLoop__x - -double - EndLoop__y - -long - EndLoop__nbIter - -long - EndLoop__iter - -boolean - ExportToJPEG__return - - - 13/7/2005 - 13:45:3 - 14/7/2005 - 17:9:25 - 2.0 - ? - ? - ? - 0 - 0 - - -RANDOMIZER - RANDOMIZER - InitPoint - 0 - ? - -InitPoint - - - -double - theX - -double - theY - - - 14/7/2005 - 17:9:25 - 14/7/2005 - 17:9:25 - 2.0 - ? - FactoryServerPy - InitPoint from RANDOMIZER - 20 - 7 - -RANDOMIZER - RANDOMIZER - NextIteration - 0 - ? - -NextIteration - - - -long - return - - - 14/7/2005 - 17:9:25 - 14/7/2005 - 17:9:25 - 2.0 - ? - FactoryServerPy - NextIteration from RANDOMIZER - 433 - 115 - -SIERPINSKY - SIERPINSKY - NextPoint - 0 - ? - -NextPoint - - -double - X - -double - Y - -long - iter - - -double - nextX - -double - nextY - - - 14/7/2005 - 17:9:25 - 14/7/2005 - 17:9:25 - 2.0 - ? - localhost/FactoryServer - NextPoint from SIERPINSKY - 638 - 7 - -? - ? - Loop - 4 - EndLoop - -Loop - - -double - x - -double - y - -long - nbIter - -long - iter - - -double - x - -double - y - -long - nbIter - -long - iter - - - -InitLoop - - - - - -MoreLoop - - - - - - -NextLoop - - - - - 14/7/2005 - 17:9:25 - 14/7/2005 - 17:9:25 - 2.0 - ? - ? - Compute Node - 229 - 47 - -? - ? - EndLoop - 5 - Loop - -EndLoop - - -double - x - -double - y - -long - nbIter - -long - iter - - -double - x - -double - y - -long - nbIter - -long - iter - - - -EndLoop - - 14/7/2005 - 17:9:25 - 14/7/2005 - 17:9:25 - 2.0 - ? - ? - Compute Node - 833 - 47 - -SIERPINSKY - SIERPINSKY - ExportToJPEG - 0 - ? - -ExportToJPEG - - -string - fileName - -long - size - - -boolean - return - - - 14/7/2005 - 17:9:25 - 14/7/2005 - 17:9:25 - 2.0 - ? - localhost/FactoryServer - ExportToJPEG from SIERPINSKY - 1032 - 47 - -SIERPINSKY - SIERPINSKY - Reset - 0 - ? - -Reset - - - - - 14/7/2005 - 17:9:25 - 14/7/2005 - 17:9:25 - 2.0 - ? - localhost/FactoryServer - Reset from SIERPINSKY - 19 - 152 - - -InitPoint - theX - Loop - x - - -InitPoint - theY - Loop - y - - -NextIteration - return - NextPoint - iter - - -616 - 118 - -616 - 186 - -NextPoint - nextX - EndLoop - x - - -NextPoint - nextY - EndLoop - y - - -Loop - DoLoop - EndLoop - DoLoop - - -Loop - x - NextPoint - X - - -Loop - y - NextPoint - Y - - -Loop - nbIter - EndLoop - nbIter - - -Loop - iter - EndLoop - iter - - -Loop - Gate - NextIteration - Gate - - -409 - 210 - -409 - 162 - -EndLoop - DoLoop - Loop - DoLoop - - -EndLoop - Gate - ExportToJPEG - Gate - - -Reset - Gate - Loop - Gate - - -205 - 162 - -205 - 227 - - -aNewDataFlow_1_3 - Loop__nbIter - Loop - nbIter - -3 - 500 - - -aNewDataFlow_1_3 - Loop__iter - Loop - iter - -3 - 0 - - -aNewDataFlow_1_3 - ExportToJPEG__fileName - ExportToJPEG - fileName - -18 - - - -aNewDataFlow_1_3 - ExportToJPEG__size - ExportToJPEG - size - -3 - 200 - diff --git a/resources/graph2.xml b/resources/graph2.xml deleted file mode 100644 index 7921979..0000000 --- a/resources/graph2.xml +++ /dev/null @@ -1,1127 +0,0 @@ - - - - - - - ? - ? - aNewDataFlow_1 - 1 - ? - - aNewDataFlow_1 - - - long - Loop__nbIter - - - long - Loop__iter - - - double - ExportToMED__size - - - string - getFileNames__medFile - - - string - getFileNames__jpegFile - - - long - ExportToJPEG__size - - - - - double - EndLoop__x - - - double - EndLoop__y - - - long - EndLoop__nbIter - - - long - EndLoop__iter - - - long - CheckMedFile__ko - - - boolean - ExportToJPEG__return - - - - - - 13/7/2005 - 13:45:3 - 5/9/2005 - 17:48:48 - 2.0 - ? - ? - ? - 0 - 0 - - - - - RANDOMIZER - RANDOMIZER - InitPoint - 0 - ? - - InitPoint - - - - double - theX - - - double - theY - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - FactoryServerPy - InitPoint from RANDOMIZER - 20 - 7 - - - RANDOMIZER - RANDOMIZER - NextIteration - 0 - ? - - NextIteration - - - - long - return - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - FactoryServerPy - NextIteration from RANDOMIZER - 633 - 207 - - - SIERPINSKY - SIERPINSKY - NextPoint - 0 - ? - - NextPoint - - - double - X - - - double - Y - - - long - iter - - - - - double - nextX - - - double - nextY - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - localhost/FactoryServer - NextPoint from SIERPINSKY - 825 - 7 - - - ? - ? - Loop - 4 - EndLoop - - Loop - - - double - x - - - double - y - - - long - nbIter - - - long - iter - - - - - double - x - - - double - y - - - long - nbIter - - - long - iter - - - - - - - InitLoop - - - - - - - MoreLoop - - - - - - - - NextLoop - - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - ? - Compute Node - 432 - 47 - - - ? - ? - EndLoop - 5 - Loop - - EndLoop - - - double - x - - - double - y - - - long - nbIter - - - long - iter - - - - - double - x - - - double - y - - - long - nbIter - - - long - iter - - - - - - - EndLoop - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - ? - Compute Node - 1015 - 47 - - - SIERPINSKY - SIERPINSKY - ExportToMED - 0 - ? - - ExportToMED - - - string - fileName - - - double - size - - - - - boolean - return - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - localhost/FactoryServer - ExportToMED from SIERPINSKY - 474 - 484 - - - ? - ? - ImportToVISU - 3 - ? - - ImportToVISU - - - string - fileName - - - - - - - - ImportToVISU - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - ? - Compute Node - 861 - 460 - - - ? - ? - CheckMedFile - 6 - EndOfCheckMedFile - - CheckMedFile - - - long - ok - - - - - long - ok - - - long - ko - - - - - - - CheckMedFile - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - ? - Compute Node - 662 - 524 - - - ? - ? - EndOfCheckMedFile - 7 - CheckMedFile - - EndOfCheckMedFile - - - - - - - EndImportToVISU - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - ? - Compute Node - 1054 - 520 - - - SIERPINSKY - SIERPINSKY - Init - 0 - ? - - Init - - - double - X1 - - - double - Y1 - - - double - X2 - - - double - Y2 - - - double - X3 - - - double - Y3 - - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - localhost/FactoryServer - Init from SIERPINSKY - 234 - 185 - - - RANDOMIZER - RANDOMIZER - InitPoint_1 - 0 - ? - - InitPoint - - - - double - theX - - - double - theY - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - FactoryServerPy - InitPoint from RANDOMIZER - 20 - 185 - - - RANDOMIZER - RANDOMIZER - InitPoint_2 - 0 - ? - - InitPoint - - - - double - theX - - - double - theY - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - FactoryServerPy - InitPoint from RANDOMIZER - 20 - 317 - - - RANDOMIZER - RANDOMIZER - InitPoint_3 - 0 - ? - - InitPoint - - - - double - theX - - - double - theY - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - FactoryServerPy - InitPoint from RANDOMIZER - 20 - 448 - - - ? - ? - getFileNames - 3 - ? - - getFileNames - - - string - medFile - - - string - jpegFile - - - - - string - medFile - - - string - jpegFile - - - - - - - getMedFileName - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - ? - Compute Node - 21 - 594 - - - SIERPINSKY - SIERPINSKY - ExportToJPEG - 0 - ? - - ExportToJPEG - - - string - fileName - - - long - size - - - - - boolean - return - - - - - - 5/9/2005 - 17:48:48 - 5/9/2005 - 17:48:48 - 2.0 - ? - localhost/FactoryServer - ExportToJPEG from SIERPINSKY - 474 - 658 - - - - - InitPoint - theX - Loop - x - - - - InitPoint - theY - Loop - y - - - - NextIteration - return - NextPoint - iter - - - 807 - 118 - - - 807 - 278 - - - - - NextPoint - nextX - EndLoop - x - - - - NextPoint - nextY - EndLoop - y - - - - Loop - DoLoop - EndLoop - DoLoop - - - - Loop - x - NextPoint - X - - - - Loop - y - NextPoint - Y - - - - Loop - nbIter - EndLoop - nbIter - - - - Loop - iter - EndLoop - iter - - - - Loop - Gate - NextIteration - Gate - - - 615 - 302 - - - 615 - 162 - - - - - EndLoop - DoLoop - Loop - DoLoop - - - - EndLoop - Gate - ExportToMED - Gate - - - 457 - 599 - - - 457 - 377 - - - 1195 - 377 - - - 1195 - 162 - - - - - EndLoop - Gate - ExportToJPEG - Gate - - - 457 - 773 - - - 457 - 377 - - - 1195 - 377 - - - 1195 - 162 - - - - - ExportToMED - return - CheckMedFile - ok - - - - ImportToVISU - Gate - EndOfCheckMedFile - Default - - - - CheckMedFile - ok - ImportToVISU - Gate - - - - Init - Gate - Loop - Gate - - - 412 - 162 - - - 412 - 380 - - - - - InitPoint_1 - theX - Init - X1 - - - - InitPoint_1 - theY - Init - Y1 - - - - InitPoint_2 - theX - Init - X2 - - - 198 - 296 - - - 198 - 388 - - - - - InitPoint_2 - theY - Init - Y2 - - - 204 - 316 - - - 204 - 408 - - - - - InitPoint_3 - theX - Init - X3 - - - 210 - 336 - - - 210 - 519 - - - - - InitPoint_3 - theY - Init - Y3 - - - 216 - 356 - - - 216 - 539 - - - - - getFileNames - medFile - ExportToMED - fileName - - - 355 - 555 - - - 355 - 665 - - - - - getFileNames - medFile - ImportToVISU - fileName - - - 842 - 531 - - - 842 - 430 - - - 355 - 430 - - - 355 - 665 - - - - - getFileNames - jpegFile - ExportToJPEG - fileName - - - 356 - 729 - - - 356 - 685 - - - - - - - aNewDataFlow_1 - Loop__nbIter - Loop - nbIter - - 3 - 500 - - - - - aNewDataFlow_1 - Loop__iter - Loop - iter - - 3 - 0 - - - - - aNewDataFlow_1 - ExportToMED__size - ExportToMED - size - - 7 - 100 - - - - - aNewDataFlow_1 - getFileNames__medFile - getFileNames - medFile - - 18 - /tmp/sierpinsky_graph2.med - - - - - aNewDataFlow_1 - getFileNames__jpegFile - getFileNames - jpegFile - - 18 - /tmp/sierpinsky_graph2.jpg - - - - - aNewDataFlow_1 - ExportToJPEG__size - ExportToJPEG - size - - 3 - 100 - - - - - - - diff --git a/resources/schema1.xml b/resources/schema1.xml new file mode 100644 index 0000000..e6dfb34 --- /dev/null +++ b/resources/schema1.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RANDOMIZER + + InitPoint + + + + + + + InitPoint + NextIteration + + + + SIERPINSKY + + NextPoint + + + + + + + NextIteration NextPoint + + NextIteration return + NextPoint iter + + + + Bloc.NextPoint nextX + Bloc.NextPoint X + + + Bloc.NextPoint nextY + Bloc.NextPoint Y + + + + ForLoop.Bloc.NextPoint + ExportToJPEG + + + + + + ForLoop.Bloc.NextPoint + Reset + + InitPoint ForLoop + ForLoop ExportToJPEG + Reset ForLoop + + InitPoint theX + ForLoop.Bloc.NextPoint X + + + InitPoint theY + ForLoop.Bloc.NextPoint Y + + + ExportToJPEGfileName + /tmp/sierpinsky_schema1.jpg + + + ExportToJPEGsize + 200 + + + ForLoopnsteps + 500 + + + + + + + + + + diff --git a/resources/schema2.xml b/resources/schema2.xml new file mode 100644 index 0000000..6298a99 --- /dev/null +++ b/resources/schema2.xml @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RANDOMIZER + + InitPoint + + + + + + + InitPoint + NextIteration + + + + SIERPINSKY + + NextPoint + + + + + + + NextIteration NextPoint + + NextIteration return + NextPoint iter + + + + Bloc.NextPoint nextX + Bloc.NextPoint X + + + Bloc.NextPoint nextY + Bloc.NextPoint Y + + + + ForLoop.Bloc.NextPoint + Init + + + + + + + + + InitPoint + InitPoint + + + + + InitPoint + InitPoint + + + + + InitPoint + InitPoint + + + + + ForLoop.Bloc.NextPoint + ExportToMED + + + + + + ForLoop.Bloc.NextPoint + ExportToJPEG + + + + + + + + + + + + + + + /tmp/sierpinsky_schema2.med + + + /tmp/sierpinsky_schema2.jpg + + + InitPoint ForLoop + ForLoop ExportToMED + ForLoop ExportToJPEG + Init ForLoop + InitPoint_1 Init + InitPoint_2 Init + InitPoint_3 Init + ExportToMED ImportToVISU + getFileNames ExportToMED + getFileNames ExportToJPEG + + InitPoint theX + ForLoop.Bloc.NextPoint X + + + InitPoint theY + ForLoop.Bloc.NextPoint Y + + + InitPoint_1 theX + Init X1 + + + InitPoint_1 theY + Init Y1 + + + InitPoint_2 theX + Init X2 + + + InitPoint_2 theY + Init Y2 + + + InitPoint_3 theX + Init X3 + + + InitPoint_3 theY + Init Y3 + + + ExportToMED return + ImportToVISU isFile + + + getFileNames medFile + ImportToVISU fileName + + + getFileNames medFile + ExportToMED fileName + + + getFileNames jpegFile + ExportToJPEG fileName + + + ForLoopnsteps + 500 + + + ExportToMEDsize + 100 + + + ExportToJPEGsize + 100 + + + + + + + + + + + + + + + + -- 2.30.2