new document type "visualization" is added.

diff --git a/Workspace/Siman-Common/src/test/som.properties b/Workspace/Siman-Common/src/test/som.properties
index 51c5543e930bc9c211ebfbf5a2fde8c7c993756a..20bc72059c848a151cb9b1d12b181c30110feff1 100644 (file)
--- a/Workspace/Siman-Common/src/test/som.properties
+++ b/Workspace/Siman-Common/src/test/som.properties
@@ -40,6 +40,7 @@ type.document.memorandum     = Note technique
 type.document.minutes        = Compte rendu
 type.document.coparisonResult= Study comparison result
 type.document.schema         = Calculation schema
+type.document.visualisation  = Visualisation of the results
 
 type.context.customer        = Client
 type.context.product         = Produit

diff --git a/Workspace/Siman-Common/src/test/som.xml b/Workspace/Siman-Common/src/test/som.xml
index 0d54cadf1fb1dcaaa58328ce3ec57769e9783a04..d3015996f2524127afdfd88274156a4388e7dedb 100644 (file)
--- a/Workspace/Siman-Common/src/test/som.xml
+++ b/Workspace/Siman-Common/src/test/som.xml
@@ -70,8 +70,11 @@
         <article type="log"           uses="script"/>
         <article type="results"       uses="script"/>
         <article type="report"        uses="results"/>
+        <article type="schema"/>
         <article type="memorandum"/>
         <article type="minutes"/>
+        <article type="coparisonResult"/>
+        <article type="visualisation"/>
     </documents>
 
 
@@ -92,7 +95,7 @@
     <!-- Geometry characteristics               Examples:                 -->
         <article type="object"/>           <!-- Car, Plane, Equipment...  -->
         <article type="part"/>             <!-- Crankcase, Outer layer... -->
-        <artivle type="geometry"/>         <!-- Surface, Volume           -->
+        <article type="geometry"/>         <!-- Surface, Volume           -->
 
     <!-- Model characteristics                  Examples:            -->
         <article type="model"/>            <!-- CSG, FEM...          -->
@@ -160,12 +163,18 @@
             <module name="CASTEM"/>
         </step>
         <step name="postprocessing">
-            <flow contents="memorandum,minutes"/>
+            <flow contents="memorandum,minutes,coparisonResult,visualisation" result="coparisonResult"/>
             <storage path="6.Report"/>
+            <module name="VISU"/>
+        </step>
+        <step name="schema">
+            <flow contents="schema" result="schema"/>
+            <storage path="7.Schema"/>
+            <module name="YACS"/>
         </step>
         <step name="capitalization">
             <flow contents="knowledge"/>
-            <storage path="6.Report"/>
+            <storage path="8.Summary"/>
         </step>
       </scenario>
         <step name="reporting">
@@ -210,8 +219,11 @@
         <document type="results">
             <import format="med"/>      <!-- Calculation results source file          -->
         </document>
+        <document type="schema">
+            <import format="xml"/>      <!-- Calculation results source file          -->
+        </document>
     </mappings>
-
+    
     <default-doctypes>
         <step number="1">
             <mapping extension="pdf"    type="requirements"/>
@@ -241,6 +253,13 @@
             <mapping extension="med"    type="model"/>
             <mapping extension="py"     type="model"/>             <!-- SMESH Python script             -->
         </step>
+        <step number="6">
+            <mapping extension="srd"    type="coparisonResult"/>
+            <mapping extension="py"     type="visualisation"/>
+        </step>
+        <step number="7">
+            <mapping extension="xml"    type="schema"/>
+        </step>
     </default-doctypes>
-
+    
 </project-structure>
\ No newline at end of file

diff --git a/Workspace/Siman-WS/WebContent/conf/som.xml b/Workspace/Siman-WS/WebContent/conf/som.xml
index 8f7515625f754b827a65b404e19d2fc346abb20a..c85982bdb38940a7dff1bfc45d1de487d65a5246 100644 (file)
--- a/Workspace/Siman-WS/WebContent/conf/som.xml
+++ b/Workspace/Siman-WS/WebContent/conf/som.xml
@@ -74,6 +74,7 @@
         <article type="memorandum"/>
         <article type="minutes"/>
         <article type="coparisonResult"/>
+        <article type="visualisation"/>
     </documents>
 
 
@@ -162,8 +163,9 @@
             <module name="CASTEM"/>
         </step>
         <step name="postprocessing">
-            <flow contents="memorandum,minutes,coparisonResult" result="coparisonResult"/>
+            <flow contents="memorandum,minutes,coparisonResult,visualisation" result="coparisonResult"/>
             <storage path="6.Report"/>
+            <module name="VISU"/>
         </step>
         <step name="schema">
             <flow contents="schema" result="schema"/>
@@ -253,6 +255,7 @@
         </step>
         <step number="6">
             <mapping extension="srd"    type="coparisonResult"/>
+            <mapping extension="py"     type="visualisation"/>
         </step>
         <step number="7">
             <mapping extension="xml"    type="schema"/>

diff --git a/Workspace/Siman-WS/src/som.properties b/Workspace/Siman-WS/src/som.properties
index 51c5543e930bc9c211ebfbf5a2fde8c7c993756a..20bc72059c848a151cb9b1d12b181c30110feff1 100644 (file)
--- a/Workspace/Siman-WS/src/som.properties
+++ b/Workspace/Siman-WS/src/som.properties
@@ -40,6 +40,7 @@ type.document.memorandum     = Note technique
 type.document.minutes        = Compte rendu
 type.document.coparisonResult= Study comparison result
 type.document.schema         = Calculation schema
+type.document.visualisation  = Visualisation of the results
 
 type.context.customer        = Client
 type.context.product         = Produit

diff --git a/Workspace/Siman-WS/src/som_en.properties b/Workspace/Siman-WS/src/som_en.properties
index 8b088f10ea3b982eb116efce01d7cd5249bb34a5..635b313f9ec56933a433f19f75c258ba7a6a3148 100644 (file)
--- a/Workspace/Siman-WS/src/som_en.properties
+++ b/Workspace/Siman-WS/src/som_en.properties
@@ -40,6 +40,7 @@ type.document.memorandum     = Technical report
 type.document.minutes        = Minute meeting
 type.document.coparisonResult= Study comparison result
 type.document.schema         = Calculation schema
+type.document.visualisation  = Visualisation of the results
 
 type.context.customer        = Customer
 type.context.product         = Product

diff --git a/Workspace/Siman/WebContent/conf/som.xml b/Workspace/Siman/WebContent/conf/som.xml
index b26d101c9f7a03b2c3b27bccec694b91cade5043..27a147afce4b3efc10d0f50f403b43a456a41ef5 100644 (file)
--- a/Workspace/Siman/WebContent/conf/som.xml
+++ b/Workspace/Siman/WebContent/conf/som.xml
@@ -6,7 +6,7 @@
 <!-- 1. Database physical location
      -->
     <database>
-        <repository disk="D:\users\rkv\SALOME_SIMER\rep" />
+               <repository disk="/home/siman/Repository" />
     </database>
 
 
@@ -74,6 +74,7 @@
         <article type="memorandum"/>
         <article type="minutes"/>
         <article type="coparisonResult"/>
+        <article type="visualisation"/>
     </documents>
 
 
@@ -162,8 +163,9 @@
             <module name="CASTEM"/>
         </step>
         <step name="postprocessing">
-            <flow contents="memorandum,minutes,coparisonResult" result="coparisonResult"/>
+            <flow contents="memorandum,minutes,coparisonResult,visualisation" result="coparisonResult"/>
             <storage path="6.Report"/>
+            <module name="VISU"/>
         </step>
         <step name="schema">
             <flow contents="schema" result="schema"/>
@@ -253,6 +255,7 @@
         </step>
         <step number="6">
             <mapping extension="srd"    type="coparisonResult"/>
+            <mapping extension="py"     type="visualisation"/>
         </step>
         <step number="7">
             <mapping extension="xml"    type="schema"/>

diff --git a/Workspace/Siman/src/som.properties b/Workspace/Siman/src/som.properties
index 51c5543e930bc9c211ebfbf5a2fde8c7c993756a..20bc72059c848a151cb9b1d12b181c30110feff1 100644 (file)
--- a/Workspace/Siman/src/som.properties
+++ b/Workspace/Siman/src/som.properties
@@ -40,6 +40,7 @@ type.document.memorandum     = Note technique
 type.document.minutes        = Compte rendu
 type.document.coparisonResult= Study comparison result
 type.document.schema         = Calculation schema
+type.document.visualisation  = Visualisation of the results
 
 type.context.customer        = Client
 type.context.product         = Produit

diff --git a/Workspace/Siman/src/som_en.properties b/Workspace/Siman/src/som_en.properties
index 8b088f10ea3b982eb116efce01d7cd5249bb34a5..635b313f9ec56933a433f19f75c258ba7a6a3148 100644 (file)
--- a/Workspace/Siman/src/som_en.properties
+++ b/Workspace/Siman/src/som_en.properties
@@ -40,6 +40,7 @@ type.document.memorandum     = Technical report
 type.document.minutes        = Minute meeting
 type.document.coparisonResult= Study comparison result
 type.document.schema         = Calculation schema
+type.document.visualisation  = Visualisation of the results
 
 type.context.customer        = Customer
 type.context.product         = Product