Merge from V7_3_BR branch 18/12/2013

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfcee4583bbac392d05f3b83aa748057d6eeed65..5c2ac47c5fe1b26ba46f68c800ede1ff58e10d8a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -220,6 +220,9 @@ ADD_SUBDIRECTORY(resources)
 IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF()
+IF(SALOME_BUILD_TESTS)
+  ADD_SUBDIRECTORY(test)
+ENDIF()
 ADD_SUBDIRECTORY(bin)
 
 # Header configuration

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index bf04c2e3ef60b011e2e369c767349620b9bd87b0..cca0073363a3d1823b3f033ec4434e3d102b09a5 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -46,9 +46,9 @@
     <parameter name="Create new ParaView view" value="Ctrl+Alt+F"/>
   </section>
  <section name="windows_geometry">
-  <parameter value="#00 #00 #00 #FF #00 #00 #00 #00 #FD #00 #00 #00 #03 #00 #00 #00 #00 #00 #00 #01 #15 #00 #00 #02 #86 #FC #02 #00 #00 #00 #05 #FC #00 #00 #00 #BF #00 #00 #00 #9C #00 #00 #00 #00 #00 #FF #FF #FF #FA #FF #FF #FF #FF #02 #00 #00 #00 #02 #FB #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #33 #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #82 #00 #FF #FF #FF #FB #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #30 #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #53 #00 #FF #FF #FF #FB #00 #00 #00 #26 #00 #70 #00 #69 #00 #70 #00 #65 #00 #6C #00 #69 #00 #6E #00 #65 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #9D #00 #00 #01 #5B #00 #00 #00 #53 #00 #FF #FF #FF #FC #00 #00 #02 #00 #00 #00 #01 #23 #00 #00 #00 #A6 #01 #00 #00 #14 #FA #00 #00 #00 #00 #01 #00 #00 #00 #02 #FB #00 #00 #00 #1C #00 #70 #00 #72 #00 #6F #00 #70 #00 #65 #00 #72 #00 #74 #00 #69 #00 #65 #00 #73 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #01 #15 #00 #FF #FF #FF #FB #00 #00 #00 #1E #00 #69 #00 #6E #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #00 #00 #01 #15 #00 #00 #00 #46 #00 #FF #FF #FF #FB #00 #00 #00 #2C #00 #73 #00 #65 #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #4F #00 #FF #FF #FF #FB #00 #00 #00 #28 #00 #63 #00 #6F #00 #6D #00 #70 #00 #61 #00 #72 #00 #61 #00 #74 #00 #69 #00 #76 #00 #65 #00 #50 #00 #61 #00 #6E #00 #65 #00 #6C #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #01 #2C #00 #FF #FF #FF #00 #00 #00 #01 #00 #00 #00 #00 #00 #00 #00 #00 #FC #02 #00 #00 #00 #03 #FB #00 #00 #00 #2C #00 #63 #00 #6F #00 #6C #00 #6C #00 #61 #00 #62 #00 #6F #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #50 #00 #61 #00 #6E #00 #65 #00 #6C #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #FE #00 #FF #FF #FF #FB #00 #00 #00 #26 #00 #6D #00 #65 #00 #6D #00 #6F #00 #72 #00 #79 #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #01 #27 #00 #FF #FF #FF #FB #00 #00 #00 #1E #00 #70 #00 #71 #00 #52 #00 #65 #00 #6D #00 #6F #00 #74 #00 #65 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #A1 #00 #FF #FF #FF #00 #00 #00 #03 #00 #00 #05 #40 #00 #00 #00 #53 #FC #01 #00 #00 #00 #04 #FB #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #31 #00 #00 #00 #00 #00 #00 #00 #04 #62 #00 #00 #00 #46 #00 #FF #FF #FF #FB #00 #00 #00 #24 #00 #73 #00 #74 #00 #61 #00 #74 #00 #69 #00 #73 #00 #74 #00 #69 #00 #63 #00 #73 #00 #56 #00 #69 #00 #65 #00 #77 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #46 #00 #FF #FF #FF #FB #00 #00 #00 #22 #00 #61 #00 #6E #00 #69 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #56 #00 #69 #00 #65 #00 #77 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #02 #0F #00 #FF #FF #FF #FB #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #32 #00 #00 #00 #00 #00 #00 #00 #05 #40 #00 #00 #00 #46 #00 #FF #FF #FF #00 #00 #04 #23 #00 #00 #02 #86 #00 #00 #00 #04 #00 #00 #00 #04 #00 #00 #00 #08 #00 #00 #00 #08 #FC #00 #00 #00 #09 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #10 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #0E #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #CE #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #05 #00 #00 #00 #26 #00 #4D #00 #61 #00 #69 #00 #6E #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #20 #00 #73 #00 #65 #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #01 #1E #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #14 #00 #56 #00 #43 #00 #52 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #02 #24 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #24 #00 #63 #00 #75 #00 #72 #00 #72 #00 #65 #00 #6E #00 #74 #00 #54 #00 #69 #00 #6D #00 #65 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #02 #EC #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #0A #00 #50 #00 #72 #00 #69 #00 #73 #00 #6D #00 #00 #00 #03 #CD #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #04 #00 #00 #00 #1E #00 #76 #00 #61 #00 #72 #00 #69 #00 #61 #00 #62 #00 #6C #00 #65 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #00 #00 #00 #01 #59 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #2A #00 #72 #00 #65 #00 #70 #00 #72 #00 #65 #00 #73 #00 #65 #00 #6E #00 #74 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #01 #59 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #63 #00 #61 #00 #6D #00 #65 #00 #72 #00 #61 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #01 #FD #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #16 #00 #61 #00 #78 #00 #65 #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #03 #03 #00 #00 #03 #43 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #01 #00 #00 #00 #18 #00 #44 #00 #61 #00 #74 #00 #61 #00 #41 #00 #6E #00 #61 #00 #6C #00 #79 #00 #73 #00 #69 #00 #73 #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #0C #00 #43 #00 #6F #00 #6D #00 #6D #00 #6F #00 #6E #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #4D #00 #61 #00 #63 #00 #72 #00 #6F #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #01 #63 #00 #00 #03 #DD #00 #00 #00 #00 #00 #00 #00 #00" name="PARAVIS"/>
+  <parameter value="#00 #00 #00 #FF #00 #00 #00 #00 #FD #00 #00 #00 #03 #00 #00 #00 #00 #00 #00 #01 #27 #00 #00 #02 #75 #FC #02 #00 #00 #00 #05 #FC #00 #00 #00 #BF #00 #00 #00 #9C #00 #00 #00 #00 #00 #FF #FF #FF #FA #FF #FF #FF #FF #02 #00 #00 #00 #02 #FB #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #33 #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #82 #00 #FF #FF #FF #FB #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #30 #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #53 #00 #FF #FF #FF #FB #00 #00 #00 #26 #00 #70 #00 #69 #00 #70 #00 #65 #00 #6C #00 #69 #00 #6E #00 #65 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #9D #00 #00 #01 #11 #00 #00 #00 #53 #00 #FF #FF #FF #FC #00 #00 #01 #B6 #00 #00 #01 #5C #00 #00 #00 #86 #01 #00 #00 #14 #FA #00 #00 #00 #00 #01 #00 #00 #00 #04 #FB #00 #00 #00 #2A #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #57 #00 #69 #00 #64 #00 #67 #00 #65 #00 #74 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #01 #13 #00 #FF #FF #FF #FB #00 #00 #00 #16 #00 #64 #00 #69 #00 #73 #00 #70 #00 #6C #00 #61 #00 #79 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #46 #00 #FF #FF #FF #FB #00 #00 #00 #1C #00 #70 #00 #72 #00 #6F #00 #70 #00 #65 #00 #72 #00 #74 #00 #69 #00 #65 #00 #73 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #FB #00 #00 #00 #1E #00 #69 #00 #6E #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #00 #00 #01 #15 #00 #00 #00 #46 #00 #FF #FF #FF #FB #00 #00 #00 #2C #00 #73 #00 #65 #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #4F #00 #FF #FF #FF #FB #00 #00 #00 #28 #00 #63 #00 #6F #00 #6D #00 #70 #00 #61 #00 #72 #00 #61 #00 #74 #00 #69 #00 #76 #00 #65 #00 #50 #00 #61 #00 #6E #00 #65 #00 #6C #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #01 #2C #00 #FF #FF #FF #00 #00 #00 #01 #00 #00 #00 #00 #00 #00 #00 #00 #FC #02 #00 #00 #00 #03 #FB #00 #00 #00 #2C #00 #63 #00 #6F #00 #6C #00 #6C #00 #61 #00 #62 #00 #6F #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #50 #00 #61 #00 #6E #00 #65 #00 #6C #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #FE #00 #FF #FF #FF #FB #00 #00 #00 #26 #00 #6D #00 #65 #00 #6D #00 #6F #00 #72 #00 #79 #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #01 #27 #00 #FF #FF #FF #FB #00 #00 #00 #1E #00 #70 #00 #71 #00 #52 #00 #65 #00 #6D #00 #6F #00 #74 #00 #65 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #A1 #00 #FF #FF #FF #00 #00 #00 #03 #00 #00 #05 #40 #00 #00 #00 #53 #FC #01 #00 #00 #00 #04 #FB #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #31 #00 #00 #00 #00 #00 #00 #00 #04 #62 #00 #00 #00 #46 #00 #FF #FF #FF #FB #00 #00 #00 #24 #00 #73 #00 #74 #00 #61 #00 #74 #00 #69 #00 #73 #00 #74 #00 #69 #00 #63 #00 #73 #00 #56 #00 #69 #00 #65 #00 #77 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #46 #00 #FF #FF #FF #FB #00 #00 #00 #22 #00 #61 #00 #6E #00 #69 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #56 #00 #69 #00 #65 #00 #77 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #02 #0F #00 #FF #FF #FF #FB #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #32 #00 #00 #00 #00 #00 #00 #00 #05 #40 #00 #00 #00 #46 #00 #FF #FF #FF #00 #00 #04 #11 #00 #00 #02 #75 #00 #00 #00 #04 #00 #00 #00 #04 #00 #00 #00 #08 #00 #00 #00 #08 #FC #00 #00 #00 #09 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #10 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #0E #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #CE #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #04 #00 #00 #00 #26 #00 #4D #00 #61 #00 #69 #00 #6E #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #20 #00 #73 #00 #65 #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #01 #1E #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #14 #00 #56 #00 #43 #00 #52 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #02 #24 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #24 #00 #63 #00 #75 #00 #72 #00 #72 #00 #65 #00 #6E #00 #74 #00 #54 #00 #69 #00 #6D #00 #65 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #02 #EC #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #04 #00 #00 #00 #1E #00 #76 #00 #61 #00 #72 #00 #69 #00 #61 #00 #62 #00 #6C #00 #65 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #00 #00 #00 #01 #59 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #2A #00 #72 #00 #65 #00 #70 #00 #72 #00 #65 #00 #73 #00 #65 #00 #6E #00 #74 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #01 #59 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #63 #00 #61 #00 #6D #00 #65 #00 #72 #00 #61 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #01 #FD #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #16 #00 #61 #00 #78 #00 #65 #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #03 #03 #00 #00 #03 #43 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #01 #00 #00 #00 #18 #00 #44 #00 #61 #00 #74 #00 #61 #00 #41 #00 #6E #00 #61 #00 #6C #00 #79 #00 #73 #00 #69 #00 #73 #00 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #0C #00 #43 #00 #6F #00 #6D #00 #6D #00 #6F #00 #6E #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #4D #00 #61 #00 #63 #00 #72 #00 #6F #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #01 #63 #00 #00 #03 #DD #00 #00 #00 #00 #00 #00 #00 #00" name="PARAVIS"/>
  </section>
  <section name="windows_visibility">
-  <parameter value="#00 #00 #00 #00 #2D #00 #00 #00 #24 #00 #33 #00 #44 #00 #20 #00 #56 #00 #69 #00 #65 #00 #77 #00 #20 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #26 #00 #41 #00 #64 #00 #64 #00 #20 #00 #45 #00 #6C #00 #65 #00 #6D #00 #65 #00 #6E #00 #74 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #3C #00 #41 #00 #64 #00 #64 #00 #20 #00 #4E #00 #6F #00 #6E #00 #20 #00 #4C #00 #69 #00 #6E #00 #65 #00 #61 #00 #72 #00 #20 #00 #45 #00 #6C #00 #65 #00 #6D #00 #65 #00 #6E #00 #74 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #10 #00 #41 #00 #64 #00 #76 #00 #61 #00 #6E #00 #63 #00 #65 #00 #64 #01 #00 #00 #00 #0A #00 #42 #00 #61 #00 #73 #00 #69 #00 #63 #01 #00 #00 #00 #0C #00 #42 #00 #6C #00 #6F #00 #63 #00 #6B #00 #73 #01 #00 #00 #00 #24 #00 #42 #00 #6F #00 #6F #00 #6C #00 #65 #00 #61 #00 #6E #00 #20 #00 #6F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #0A #00 #42 #00 #75 #00 #69 #00 #6C #00 #64 #01 #00 #00 #00 #0C #00 #43 #00 #6F #00 #6D #00 #6D #00 #6F #00 #6E #01 #00 #00 #00 #18 #00 #44 #00 #61 #00 #74 #00 #61 #00 #41 #00 #6E #00 #61 #00 #6C #00 #79 #00 #73 #00 #69 #00 #73 #00 #00 #00 #00 #28 #00 #44 #00 #69 #00 #73 #00 #70 #00 #6C #00 #61 #00 #79 #00 #20 #00 #4D #00 #6F #00 #64 #00 #65 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #2A #00 #45 #00 #64 #00 #67 #00 #65 #00 #20 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #00 #00 #00 #00 #2A #00 #46 #00 #61 #00 #63 #00 #65 #00 #20 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #00 #00 #00 #00 #14 #00 #47 #00 #65 #00 #6E #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #01 #00 #00 #00 #1A #00 #47 #00 #72 #00 #6F #00 #75 #00 #70 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1E #00 #49 #00 #6D #00 #70 #00 #6F #00 #72 #00 #74 #00 #20 #00 #2F #00 #20 #00 #45 #00 #78 #00 #70 #00 #6F #00 #72 #00 #74 #01 #00 #00 #00 #26 #00 #49 #00 #6E #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1A #00 #4D #00 #61 #00 #63 #00 #72 #00 #6F #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #26 #00 #4D #00 #61 #00 #69 #00 #6E #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #28 #00 #4D #00 #65 #00 #61 #00 #73 #00 #75 #00 #72 #00 #65 #00 #6D #00 #65 #00 #6E #00 #74 #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #10 #00 #4D #00 #65 #00 #61 #00 #73 #00 #75 #00 #72 #00 #65 #00 #73 #00 #00 #00 #00 #18 #00 #4D #00 #65 #00 #73 #00 #68 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #18 #00 #4D #00 #6F #00 #64 #00 #69 #00 #66 #00 #69 #00 #63 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #01 #00 #00 #00 #28 #00 #4D #00 #6F #00 #64 #00 #69 #00 #66 #00 #69 #00 #63 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #0E #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #2A #00 #4E #00 #6F #00 #64 #00 #65 #00 #20 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #00 #00 #00 #00 #14 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #10 #00 #50 #00 #69 #00 #63 #00 #74 #00 #75 #00 #72 #00 #65 #00 #73 #01 #00 #00 #00 #14 #00 #50 #00 #72 #00 #69 #00 #6D #00 #69 #00 #74 #00 #69 #00 #76 #00 #65 #00 #73 #01 #00 #00 #00 #0A #00 #50 #00 #72 #00 #69 #00 #73 #00 #6D #00 #00 #00 #00 #28 #00 #52 #00 #65 #00 #63 #00 #6F #00 #72 #00 #64 #00 #69 #00 #6E #00 #67 #00 #20 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #1C #00 #52 #00 #65 #00 #6D #00 #6F #00 #76 #00 #65 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #26 #00 #52 #00 #65 #00 #6E #00 #75 #00 #6D #00 #62 #00 #65 #00 #72 #00 #69 #00 #6E #00 #67 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #10 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #1C #00 #54 #00 #72 #00 #61 #00 #6E #00 #73 #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #01 #00 #00 #00 #2C #00 #54 #00 #72 #00 #61 #00 #6E #00 #73 #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #14 #00 #56 #00 #43 #00 #52 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1E #00 #56 #00 #69 #00 #65 #00 #77 #00 #20 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #2E #00 #56 #00 #6F #00 #6C #00 #75 #00 #6D #00 #65 #00 #20 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #00 #00 #00 #00 #16 #00 #61 #00 #78 #00 #65 #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1A #00 #63 #00 #61 #00 #6D #00 #65 #00 #72 #00 #61 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #24 #00 #63 #00 #75 #00 #72 #00 #72 #00 #65 #00 #6E #00 #74 #00 #54 #00 #69 #00 #6D #00 #65 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #2A #00 #72 #00 #65 #00 #70 #00 #72 #00 #65 #00 #73 #00 #65 #00 #6E #00 #74 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #20 #00 #73 #00 #65 #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1E #00 #76 #00 #61 #00 #72 #00 #69 #00 #61 #00 #62 #00 #6C #00 #65 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #01 #00 #00 #00 #0E #00 #00 #00 #22 #00 #61 #00 #6E #00 #69 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #56 #00 #69 #00 #65 #00 #77 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #2C #00 #63 #00 #6F #00 #6C #00 #6C #00 #61 #00 #62 #00 #6F #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #50 #00 #61 #00 #6E #00 #65 #00 #6C #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #28 #00 #63 #00 #6F #00 #6D #00 #70 #00 #61 #00 #72 #00 #61 #00 #74 #00 #69 #00 #76 #00 #65 #00 #50 #00 #61 #00 #6E #00 #65 #00 #6C #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #1E #00 #69 #00 #6E #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #26 #00 #6D #00 #65 #00 #6D #00 #6F #00 #72 #00 #79 #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #26 #00 #70 #00 #69 #00 #70 #00 #65 #00 #6C #00 #69 #00 #6E #00 #65 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #1E #00 #70 #00 #71 #00 #52 #00 #65 #00 #6D #00 #6F #00 #74 #00 #65 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #00 #00 #00 #1C #00 #70 #00 #72 #00 #6F #00 #70 #00 #65 #00 #72 #00 #74 #00 #69 #00 #65 #00 #73 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #2C #00 #73 #00 #65 #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #24 #00 #73 #00 #74 #00 #61 #00 #74 #00 #69 #00 #73 #00 #74 #00 #69 #00 #63 #00 #73 #00 #56 #00 #69 #00 #65 #00 #77 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #30 #00 #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #31 #00 #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #32 #00 #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #33 #00" name="PARAVIS"/>
+  <parameter value="#00 #00 #00 #00 #2D #00 #00 #00 #24 #00 #33 #00 #44 #00 #20 #00 #56 #00 #69 #00 #65 #00 #77 #00 #20 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #26 #00 #41 #00 #64 #00 #64 #00 #20 #00 #45 #00 #6C #00 #65 #00 #6D #00 #65 #00 #6E #00 #74 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #3C #00 #41 #00 #64 #00 #64 #00 #20 #00 #4E #00 #6F #00 #6E #00 #20 #00 #4C #00 #69 #00 #6E #00 #65 #00 #61 #00 #72 #00 #20 #00 #45 #00 #6C #00 #65 #00 #6D #00 #65 #00 #6E #00 #74 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #10 #00 #41 #00 #64 #00 #76 #00 #61 #00 #6E #00 #63 #00 #65 #00 #64 #01 #00 #00 #00 #0A #00 #42 #00 #61 #00 #73 #00 #69 #00 #63 #01 #00 #00 #00 #0C #00 #42 #00 #6C #00 #6F #00 #63 #00 #6B #00 #73 #01 #00 #00 #00 #24 #00 #42 #00 #6F #00 #6F #00 #6C #00 #65 #00 #61 #00 #6E #00 #20 #00 #6F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #0A #00 #42 #00 #75 #00 #69 #00 #6C #00 #64 #01 #00 #00 #00 #0C #00 #43 #00 #6F #00 #6D #00 #6D #00 #6F #00 #6E #01 #00 #00 #00 #18 #00 #44 #00 #61 #00 #74 #00 #61 #00 #41 #00 #6E #00 #61 #00 #6C #00 #79 #00 #73 #00 #69 #00 #73 #00 #00 #00 #00 #28 #00 #44 #00 #69 #00 #73 #00 #70 #00 #6C #00 #61 #00 #79 #00 #20 #00 #4D #00 #6F #00 #64 #00 #65 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #2A #00 #45 #00 #64 #00 #67 #00 #65 #00 #20 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #00 #00 #00 #00 #2A #00 #46 #00 #61 #00 #63 #00 #65 #00 #20 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #00 #00 #00 #00 #14 #00 #47 #00 #65 #00 #6E #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #01 #00 #00 #00 #1A #00 #47 #00 #72 #00 #6F #00 #75 #00 #70 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1E #00 #49 #00 #6D #00 #70 #00 #6F #00 #72 #00 #74 #00 #20 #00 #2F #00 #20 #00 #45 #00 #78 #00 #70 #00 #6F #00 #72 #00 #74 #01 #00 #00 #00 #26 #00 #49 #00 #6E #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1A #00 #4D #00 #61 #00 #63 #00 #72 #00 #6F #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #26 #00 #4D #00 #61 #00 #69 #00 #6E #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #28 #00 #4D #00 #65 #00 #61 #00 #73 #00 #75 #00 #72 #00 #65 #00 #6D #00 #65 #00 #6E #00 #74 #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #10 #00 #4D #00 #65 #00 #61 #00 #73 #00 #75 #00 #72 #00 #65 #00 #73 #00 #00 #00 #00 #18 #00 #4D #00 #65 #00 #73 #00 #68 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #18 #00 #4D #00 #6F #00 #64 #00 #69 #00 #66 #00 #69 #00 #63 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #01 #00 #00 #00 #28 #00 #4D #00 #6F #00 #64 #00 #69 #00 #66 #00 #69 #00 #63 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #0E #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #2A #00 #4E #00 #6F #00 #64 #00 #65 #00 #20 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #00 #00 #00 #00 #14 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #10 #00 #50 #00 #69 #00 #63 #00 #74 #00 #75 #00 #72 #00 #65 #00 #73 #01 #00 #00 #00 #14 #00 #50 #00 #72 #00 #69 #00 #6D #00 #69 #00 #74 #00 #69 #00 #76 #00 #65 #00 #73 #01 #00 #00 #00 #0A #00 #50 #00 #72 #00 #69 #00 #73 #00 #6D #00 #00 #00 #00 #28 #00 #52 #00 #65 #00 #63 #00 #6F #00 #72 #00 #64 #00 #69 #00 #6E #00 #67 #00 #20 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #1C #00 #52 #00 #65 #00 #6D #00 #6F #00 #76 #00 #65 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #26 #00 #52 #00 #65 #00 #6E #00 #75 #00 #6D #00 #62 #00 #65 #00 #72 #00 #69 #00 #6E #00 #67 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #10 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #1C #00 #54 #00 #72 #00 #61 #00 #6E #00 #73 #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #01 #00 #00 #00 #2C #00 #54 #00 #72 #00 #61 #00 #6E #00 #73 #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #14 #00 #56 #00 #43 #00 #52 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1E #00 #56 #00 #69 #00 #65 #00 #77 #00 #20 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #2E #00 #56 #00 #6F #00 #6C #00 #75 #00 #6D #00 #65 #00 #20 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #73 #00 #20 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #00 #00 #00 #00 #16 #00 #61 #00 #78 #00 #65 #00 #73 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1A #00 #63 #00 #61 #00 #6D #00 #65 #00 #72 #00 #61 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #24 #00 #63 #00 #75 #00 #72 #00 #72 #00 #65 #00 #6E #00 #74 #00 #54 #00 #69 #00 #6D #00 #65 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #2A #00 #72 #00 #65 #00 #70 #00 #72 #00 #65 #00 #73 #00 #65 #00 #6E #00 #74 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #20 #00 #73 #00 #65 #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #00 #00 #00 #1E #00 #76 #00 #61 #00 #72 #00 #69 #00 #61 #00 #62 #00 #6C #00 #65 #00 #54 #00 #6F #00 #6F #00 #6C #00 #62 #00 #61 #00 #72 #01 #01 #00 #00 #00 #10 #00 #00 #00 #22 #00 #61 #00 #6E #00 #69 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #56 #00 #69 #00 #65 #00 #77 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #2C #00 #63 #00 #6F #00 #6C #00 #6C #00 #61 #00 #62 #00 #6F #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #50 #00 #61 #00 #6E #00 #65 #00 #6C #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #28 #00 #63 #00 #6F #00 #6D #00 #70 #00 #61 #00 #72 #00 #61 #00 #74 #00 #69 #00 #76 #00 #65 #00 #50 #00 #61 #00 #6E #00 #65 #00 #6C #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #16 #00 #64 #00 #69 #00 #73 #00 #70 #00 #6C #00 #61 #00 #79 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #1E #00 #69 #00 #6E #00 #66 #00 #6F #00 #72 #00 #6D #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #26 #00 #6D #00 #65 #00 #6D #00 #6F #00 #72 #00 #79 #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #2A #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #57 #00 #69 #00 #64 #00 #67 #00 #65 #00 #74 #01 #00 #00 #00 #26 #00 #70 #00 #69 #00 #70 #00 #65 #00 #6C #00 #69 #00 #6E #00 #65 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #1E #00 #70 #00 #71 #00 #52 #00 #65 #00 #6D #00 #6F #00 #74 #00 #65 #00 #43 #00 #6F #00 #6E #00 #74 #00 #72 #00 #6F #00 #6C #00 #00 #00 #00 #1C #00 #70 #00 #72 #00 #6F #00 #70 #00 #65 #00 #72 #00 #74 #00 #69 #00 #65 #00 #73 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #2C #00 #73 #00 #65 #00 #6C #00 #65 #00 #63 #00 #74 #00 #69 #00 #6F #00 #6E #00 #49 #00 #6E #00 #73 #00 #70 #00 #65 #00 #63 #00 #74 #00 #6F #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #24 #00 #73 #00 #74 #00 #61 #00 #74 #00 #69 #00 #73 #00 #74 #00 #69 #00 #63 #00 #73 #00 #56 #00 #69 #00 #65 #00 #77 #00 #44 #00 #6F #00 #63 #00 #6B #00 #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #30 #00 #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #31 #00 #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #32 #00 #00 #00 #00 #10 #00 #77 #00 #69 #00 #6E #00 #64 #00 #6F #00 #77 #00 #5F #00 #33 #00" name="PARAVIS"/>
  </section>
 </document>

diff --git a/src/Macro/CMakeLists.txt b/src/Macro/CMakeLists.txt
index 455de015d9a934be045e46d451ea10a300c9bbd8..65106b25ab432e60d51327597e59f281a1347537 100644 (file)
--- a/src/Macro/CMakeLists.txt
+++ b/src/Macro/CMakeLists.txt
@@ -20,5 +20,5 @@
 SET(_PYFILES_TO_INSTALL
   modes.py
   )
-  
-INSTALL_AND_COMPILE_PYTHON_FILE("${_PYFILES_TO_INSTALL}" ${SALOME_INSTALL_SCRIPT_PYTHON})
+
+INSTALL_AND_COMPILE_PYTHON_FILE("${_PYFILES_TO_INSTALL}" ${SALOME_INSTALL_SCRIPT_PYTHON}/Macro)

diff --git a/src/PVGUI/PVGUI_Module_widgets.cxx b/src/PVGUI/PVGUI_Module_widgets.cxx
index 455c282a7508303bed82b133870df081c4fc6978..b15c923cf336e51a77d67f9701239ec8c428bbec 100644 (file)
--- a/src/PVGUI/PVGUI_Module_widgets.cxx
+++ b/src/PVGUI/PVGUI_Module_widgets.cxx
@@ -54,6 +54,8 @@
 #include <pqSelectionInspectorWidget.h>
 #include <pqProgressWidget.h>
 #include <pqProgressManager.h>
+#include <pqObjectInspectorWidget.h>
+#include <pqDisplayProxyEditorWidget.h>
 
 #include <pqAlwaysConnectedBehavior.h>
 #include <pqApplicationCore.h>
@@ -75,7 +77,6 @@
 #include <pqParaViewMenuBuilders.h>
 #include <pqCollaborationPanel.h>
 #include <pqMemoryInspectorPanel.h>
-#include <pqPropertiesPanel.h>
 
 class ResizeHelper : public pqPVAnimationWidget
 {
@@ -124,15 +125,40 @@ void PVGUI_Module::setupDockWidgets()
   pipelineBrowserDock->setWidget(browser);
   myDockWidgets[pipelineBrowserDock] = true;
 
-  // Properties dock
-  QDockWidget* propertiesDock = new QDockWidget(tr( "TTL_OBJECT_INSPECTOR" ), desk);
-  propertiesDock->setObjectName("propertiesDock");
-  pqPropertiesPanel* propertiesPanel = new pqPropertiesPanel();
-  propertiesPanel->setObjectName("propertiesPanel");
-  propertiesDock->setWidget(propertiesPanel);
-  desk->addDockWidget(Qt::LeftDockWidgetArea, propertiesDock);
-  connect( propertiesPanel, SIGNAL( helpRequested(const QString&, const QString&) ),  this, SLOT( showHelpForProxy(const QString&, const QString&) ) );
-  myDockWidgets[propertiesDock] = true;
+  //Object inspector
+  QDockWidget* objectInspectorDock = new QDockWidget( tr( "TTL_OBJECT_INSPECTOR" ), desk );
+  objectInspectorDock->setObjectName("objectInspectorDock");
+  objectInspectorDock->setAllowedAreas( Qt::LeftDockWidgetArea|Qt::NoDockWidgetArea|Qt::RightDockWidgetArea );
+  desk->addDockWidget( Qt::LeftDockWidgetArea, objectInspectorDock );
+
+  pqObjectInspectorWidget* objectInspectorWidget = new pqObjectInspectorWidget(objectInspectorDock);
+  objectInspectorDock->setObjectName("objectInspectorWidget");
+  objectInspectorWidget->setShowOnAccept(true);
+  objectInspectorDock->setWidget(objectInspectorWidget);
+  connect( objectInspectorWidget, SIGNAL( helpRequested(const QString&, const QString&) ),  this, SLOT( showHelpForProxy(const QString&, const QString&) ) );
+  myDockWidgets[objectInspectorDock] = true;
+
+  //Display Dock
+  QDockWidget* displayDock = new QDockWidget( tr( "TTL_DISPLAY" ), desk );
+  displayDock->setObjectName("displayDock");
+  QWidget* displayWidgetFrame = new QWidget(displayDock);
+  displayWidgetFrame->setObjectName("displayWidgetFrame");
+  displayDock->setWidget(displayWidgetFrame);
+
+  QScrollArea* displayScrollArea = new QScrollArea(displayWidgetFrame);
+  displayScrollArea->setObjectName("displayScrollArea");
+  displayScrollArea->setWidgetResizable(true);
+
+  QVBoxLayout* verticalLayout = new QVBoxLayout(displayWidgetFrame);
+  verticalLayout->setSpacing(0);
+  verticalLayout->setContentsMargins(0, 0, 0, 0);
+
+  pqDisplayProxyEditorWidget* displayWidget = new pqDisplayProxyEditorWidget(displayDock);
+  displayWidget->setObjectName("displayWidget");
+  displayScrollArea->setWidget(displayWidget);
+  verticalLayout->addWidget(displayScrollArea);
+
+  myDockWidgets[displayDock] = true;
 
   // information dock
   QDockWidget* informationDock = new QDockWidget(tr( "TTL_INFORMATION" ), desk);
@@ -157,13 +183,13 @@ void PVGUI_Module::setupDockWidgets()
   verticalLayout_2->addWidget(informationScrollArea);
   informationDock->setWidget(informationWidgetFrame);
 
-  desk->addDockWidget(Qt::LeftDockWidgetArea, informationDock);
   myDockWidgets[informationDock] = true;
 
-  // put 'Properties' and 'Information' widgets into tabs
   desk->setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North);
-  desk->tabifyDockWidget(propertiesDock, informationDock);
-  propertiesDock->raise();
+  desk->tabifyDockWidget(objectInspectorDock, displayDock);
+  desk->tabifyDockWidget(objectInspectorDock, informationDock);
+  objectInspectorDock->raise();
+
 
   // Statistic View
   QDockWidget* statisticsViewDock  = new QDockWidget( tr( "TTL_STATISTICS_VIEW" ), desk );
@@ -214,9 +240,11 @@ void PVGUI_Module::setupDockWidgets()
   // Memory inspector dock
   QDockWidget* memoryInspectorDock = new QDockWidget(tr( "TTL_MEMORY_INSPECTOR" ), desk);
   memoryInspectorDock->setObjectName("memoryInspectorDock");
+#ifndef WIN32
   pqMemoryInspectorPanel* dockWidgetContents = new pqMemoryInspectorPanel();
   dockWidgetContents->setObjectName("dockWidgetContents");
   memoryInspectorDock->setWidget(dockWidgetContents);
+#endif
   desk->addDockWidget(Qt::RightDockWidgetArea, memoryInspectorDock);
   myDockWidgets[memoryInspectorDock] = false; // hidden by default
 

diff --git a/src/PVGUI/resources/PARAVIS_msg_fr.ts b/src/PVGUI/resources/PARAVIS_msg_fr.ts
index 7238c218204f594ba2706c616a77016b939ac85b..93d657b57f5d75f304af56a13d3a52ae1028f891 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_msg_fr.ts
+++ b/src/PVGUI/resources/PARAVIS_msg_fr.ts
@@ -3,6 +3,18 @@
 <TS version="2.0" language="fr">
 <context>
     <name>@default</name>
+    <message>
+        <source>STB_RESTART_TRACE</source>
+        <translation type="unfinished">Re-initialize Trace</translation>
+    </message>
+    <message>
+        <source>TOP_RESTART_TRACE</source>
+        <translation type="unfinished">Re-initialize Trace</translation>
+    </message>
+    <message>
+        <source>MEN_RESTART_TRACE</source>
+        <translation type="unfinished">Re-initialize Trace</translation>
+    </message>
     <message>
         <source>TOP_CLEAR_ALL</source>
         <translation>Effacer tout</translation>
@@ -181,6 +193,10 @@
 </context>
 <context>
     <name>PVGUI_Module</name>
+    <message>
+        <source>PREF_SHOW_COLOR_LEGEND</source>
+        <translation type="unfinished">Show Color Legend</translation>
+    </message>
     <message>
         <source>TTL_PIPELINE_BROWSER</source>
         <translation>Navigateur des conduites</translation>

diff --git a/src/PVGUI/resources/PARAVIS_msg_ja.ts b/src/PVGUI/resources/PARAVIS_msg_ja.ts
index 6201b4f139bee7501e0b8d6aaf0a4e95aa5e0e24..0474842cc3d938d7914fb6be13bfe2d17331119e 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_msg_ja.ts
+++ b/src/PVGUI/resources/PARAVIS_msg_ja.ts
@@ -21,7 +21,7 @@
     </message>
     <message>
       <source>MEN_LIGHT</source>
-      <translation>レジェ</translation>
+      <translation>LIGHT</translation>
     </message>
     <message>
       <source>MEN_LOAD_FILE</source>
@@ -29,11 +29,11 @@
     </message>
     <message>
       <source>WRN_UNKNOWN_COMMAND</source>
-      <translation>認識されないコマンド ！</translation>
+      <translation>不明なコマンド ！</translation>
     </message>
     <message>
       <source>BUT_OK</source>
-      <translation>OK</translation>
+      <translation>わかりました(&amp;O)</translation>
     </message>
     <message>
       <source>WRN_ADD_FAILED</source>
@@ -73,7 +73,7 @@
     </message>
     <message>
       <source>WRN_DUMP_FAILED</source>
-      <translation>ã\82¹ã\83\8aã\83\83ã\83\97ã\82·ã\83§ã\83\83ã\83\88 ã\83\95ã\82¡ã\82¤ã\83«ã\81\8c失æ\95\97ã\81\97ã\81¾ã\81\97ã\81\9fã\80\82</translation>
+      <translation>ã\83\95ã\82¡ã\82¤ã\83«ã\82\92ä¿\9då­\98ã\81\99ã\82\8bã\81\93ã\81¨ã\81¯ã\81§ã\81\8dã\81¾ã\81\9bã\82\93 ï¼\81</translation>
     </message>
     <message>
       <source>WRN_LOAD_FAILED</source>
@@ -93,11 +93,11 @@
     </message>
     <message>
       <source>LIGHT_ROOT_TOOLTIP</source>
-      <translation>光モジュールのルート オブジェクト</translation>
+      <translation>LIGHTモジュール ルート オブジェクト</translation>
     </message>
     <message>
       <source>LIGHT_LIGHT</source>
-      <translation>レジェ</translation>
+      <translation>LIGHT</translation>
     </message>
     <message>
       <source>MEN_SAVE_FILE</source>
@@ -121,7 +121,7 @@
     </message>
     <message>
       <source>TOP_ADD_LINE</source>
-      <translation>行を追加</translation>
+      <translation>行を追加します。</translation>
     </message>
     <message>
       <source>MEN_DEL_LINE</source>
@@ -149,7 +149,7 @@
     </message>
     <message>
       <source>LIGHT_LINE</source>
-      <translation>線</translation>
+      <translation>Line</translation>
     </message>
     <message>
       <source>STB_DEL_LINE</source>
@@ -173,15 +173,15 @@
     </message>
     <message>
       <source>MEN_RESTART_TRACE</source>
-      <translation>MEN_RESTART_TRACE</translation>
+      <translation>トレースを再初期化します。</translation>
     </message>
     <message>
       <source>TOP_RESTART_TRACE</source>
-      <translation>TOP_RESTART_TRACE</translation>
+      <translation>トレースを再初期化します。</translation>
     </message>
     <message>
       <source>STB_RESTART_TRACE</source>
-      <translation>STB_RESTART_TRACE</translation>
+      <translation>トレースを再初期化します。</translation>
     </message>
   </context>
   <context>

diff --git a/src/Plugins/CMakeLists.txt b/src/Plugins/CMakeLists.txt
index 0312b37f3ed90a21abcef758e390f601b6b8c7bd..9a4bd3bab2727398ecc6f987e0f6050a4dec965b 100755 (executable)
--- a/src/Plugins/CMakeLists.txt
+++ b/src/Plugins/CMakeLists.txt
@@ -19,6 +19,13 @@
 
 INCLUDE(${PARAVIEW_USE_FILE})
 
+IF(WIN32)
+  REMOVE_DEFINITIONS(-D_SECURE_SCL=0 -D_SECURE_SCL_THROWS=0)
+  IF(NOT CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
+    REMOVE_DEFINITIONS(-D_HAS_ITERATOR_DEBUGGING=0)  
+  ENDIF() 
+ENDIF() 
+
 SET(_subdirs
   #Filter 
   #ToolBar 

diff --git a/src/Plugins/MedReader/IO/vtkMedDriver30.cxx b/src/Plugins/MedReader/IO/vtkMedDriver30.cxx
index e3f86cd71e9546c917ef207816dbe97ce7fd7f81..924cc856efab2227ea81e9bc8ebd3eac5b38c37e 100644 (file)
--- a/src/Plugins/MedReader/IO/vtkMedDriver30.cxx
+++ b/src/Plugins/MedReader/IO/vtkMedDriver30.cxx
@@ -463,7 +463,7 @@ void vtkMedDriver30::ReadUnstructuredGridInformation(
     }
 
   this->ReadNumberOfEntity(grid, MED_CELL, MED_NODAL);
-  this->ReadNumberOfEntity(grid, MED_CELL, MED_DESCENDING);
+  //this->ReadNumberOfEntity(grid, MED_CELL, MED_DESCENDING);  // VSR: 29.11.2013: commented according to the issue 22327: descending connectivity is wrongly processed
   this->ReadNumberOfEntity(grid, MED_DESCENDING_FACE, MED_NODAL);
   this->ReadNumberOfEntity(grid, MED_DESCENDING_FACE, MED_DESCENDING);
   this->ReadNumberOfEntity(grid, MED_DESCENDING_EDGE, MED_NODAL);

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4cc1f0f248b6bf4d8a3335f33033f6ba73690b8b..7dc45d411aa6381812b7c5490d4d48d08db8b3df 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,20 +20,19 @@
 ADD_SUBDIRECTORY(VisuPrs)
 
 SET(_demo_files
-  demo_0_med.py
-  demo_1_med.py
-  demo_2_med.py
-  demo_3_med.py
-  demo_4_med.py
-  demo_5_med.py
-  demo_6_med.py
-  demo_7_med.py
-  demo_8_med.py
-  demo_9_med.py
-  demo_10_med.py
-  demo_11_med.py
-  demo_12_med.py
-  demo_13_med.py
+  demo0.py
+  demo1.py
+  demo2.py
+  demo3.py
+  demo4.py
+  demo5.py
+  demo6.py
+  demo7.py
+  demo8.py
+  demo9.py
+  demo10.py
+  demo11.py
+  demo12.py
   demo_14_med.py
   demo_15_med.py
   )

diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt
index 0863a48071a4f227f07869cf12dc583e903dffc1..a41f7de37eebb5e6146084f6dc92e3e6e73c5e83 100644 (file)
--- a/test/VisuPrs/2D_viewer/CMakeLists.txt
+++ b/test/VisuPrs/2D_viewer/CMakeLists.txt
@@ -17,13 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1)
+  ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES ENVIRONMENT "${tests_env}") 
+ENDFOREACH()

diff --git a/test/VisuPrs/3D_viewer/CMakeLists.txt b/test/VisuPrs/3D_viewer/CMakeLists.txt
index 69e7300dccc913461170c7725d56e361e2252d24..8bb08c123d2108843066627093fb21751f5d578e 100755 (executable)
--- a/test/VisuPrs/3D_viewer/CMakeLists.txt
+++ b/test/VisuPrs/3D_viewer/CMakeLists.txt
@@ -17,23 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2)
+  ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()
+

diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt
index 2cfa9fc787757acc97759f28ed1964437911d906..3ae9fa516953ba8efc5671aeadd60788701e2ada 100755 (executable)
--- a/test/VisuPrs/Animation/CMakeLists.txt
+++ b/test/VisuPrs/Animation/CMakeLists.txt
@@ -17,41 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A4
-      A7
-      A8
-      B2
-      B5
-      B6  
-      C0
-      C1
-      C3
-      C8
-      D1
-      D2
-      D6
-      D9
-      E0
-      E4
-      E7
-      E8
-      F2
-      F5
-      F6
-      G0
-      G3
-      G4
-      G8
-      H1
-      H2
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A4 A7 A8 B2 B5 B6 C0 C1 C3 C8 D1 D2 D6 D9 
+              E0 E4 E7 E8 F2 F5 F6 G0 G3 G4 G8 H1 H2)
+  ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/CMakeLists.txt b/test/VisuPrs/CMakeLists.txt
index 7e48950e294a1097780bf07d847a1cbc7d879139..65f5249404ba7b581830859790a2b3854b9befde 100644 (file)
--- a/test/VisuPrs/CMakeLists.txt
+++ b/test/VisuPrs/CMakeLists.txt
@@ -17,7 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_SUBDIRECTORY(
+SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
+
+SET(TEST_DIRECTORIES 
   Util
   2D_viewer
   3D_viewer
@@ -41,3 +43,7 @@ ADD_SUBDIRECTORY(
   imps
   dump_study
 )
+
+FOREACH(test_dir ${TEST_DIRECTORIES})
+  ADD_SUBDIRECTORY(${test_dir})
+ENDFOREACH()

diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt
index 36f05ff288782ee0f747942153df2658df447578..763ba3aafab83cf0dc492ec6932069c45c191e59 100644 (file)
--- a/test/VisuPrs/CutLines/CMakeLists.txt
+++ b/test/VisuPrs/CutLines/CMakeLists.txt
@@ -17,47 +17,11 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0   
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      B3
-      E0
-      E1
-      E2
-      E3      
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6 
-      F7
-      F8
-      F9
-      G0     
-      G1
-      G2      
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 
+              E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 
+              F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G2)
+  ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/CutPlanes/CMakeLists.txt b/test/VisuPrs/CutPlanes/CMakeLists.txt
index 9ee393f1db629b74dfe008a7bfa2e7c36cb8da20..47925505fe8435bd145593497b411d948b1f38e4 100644 (file)
--- a/test/VisuPrs/CutPlanes/CMakeLists.txt
+++ b/test/VisuPrs/CutPlanes/CMakeLists.txt
@@ -17,47 +17,11 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      B3
-      E0
-      E1
-      E2
-      E3      
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7      
-      F8
-      F9
-      G0
-      G1
-      G2           
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 
+              E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 
+              F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G2)
+  ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/DeformedShape/CMakeLists.txt b/test/VisuPrs/DeformedShape/CMakeLists.txt
index 372b17b7cca4e4c3f8cc62a60e2875593b4c1423..b178d2118d217f4d184696b38f7b6d0fa04572df 100644 (file)
--- a/test/VisuPrs/DeformedShape/CMakeLists.txt
+++ b/test/VisuPrs/DeformedShape/CMakeLists.txt
@@ -17,45 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      B3
-      B4
-      E0
-      E1
-      E2
-      E3
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7
-      F8
-      F9
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 
+              E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F7 F8 F9)
+  ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/GaussPoints/CMakeLists.txt b/test/VisuPrs/GaussPoints/CMakeLists.txt
index 4106a9086d1863fbe773aa2d1c36eee2f34d8b27..b741b7a95dd15b3b2cf88fe3e2b37a861e5e3f44 100644 (file)
--- a/test/VisuPrs/GaussPoints/CMakeLists.txt
+++ b/test/VisuPrs/GaussPoints/CMakeLists.txt
@@ -17,40 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6
-      A7
-      A9
-      B0
-      B1
-      B2
-      B3
-      B4
-      B5
-      B6
-      B7
-      B8
-      B9
-      C0
-      C1
-      C2
-      C3
-      C4
-      C5
-      C6
-      C7
-      C8
-      C9
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A3 A4 A5 A6 A7 A9 B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 
+              C0 C1 C2 C3 C4 C5 C6 C7 C8 C9)
+  ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/ImportMedField/CMakeLists.txt b/test/VisuPrs/ImportMedField/CMakeLists.txt
index 0224205124023a612b4f40a68264c458d89f8067..d7ca98e77c7fc96b1f7f177e7914e6f64150d3cc 100644 (file)
--- a/test/VisuPrs/ImportMedField/CMakeLists.txt
+++ b/test/VisuPrs/ImportMedField/CMakeLists.txt
@@ -17,34 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      B3
-      B4
-      B5
-      B6
-      B7
-      B8
-      B9
-      C0
-      C1
-      C2
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(IMPORTMEDFIELD_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
-    SET_TESTS_PROPERTIES(IMPORTMEDFIELD_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 C0 C1 C2)
+  ADD_TEST(IMPORTMEDFIELD_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
+  SET_TESTS_PROPERTIES(IMPORTMEDFIELD_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(IMPORTMEDFIELD_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt
index 7928b98d6a68b492a516f19315cdb631e91a01cb..d280a555e6e95d36993b42b9591d59564b7be0be 100755 (executable)
--- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt
+++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt
@@ -17,46 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      E0
-      E1
-      E2
-      E3      
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7      
-      F8
-      F9
-      G0
-      G1
-      G2           
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 
+              E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G2)
+  ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/MeshPresentation/CMakeLists.txt b/test/VisuPrs/MeshPresentation/CMakeLists.txt
index ee345647479be10c6f64fdd2c1afbeb3d419015a..3ab9d33742dc50f32a6fe584c73d07c66783dd66 100644 (file)
--- a/test/VisuPrs/MeshPresentation/CMakeLists.txt
+++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt
@@ -17,97 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      E0
-      E1
-      E2
-      E3      
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7      
-      F8
-      F9
-      G0
-      G1      
-      G3
-      G4
-      G5
-      G6
-      G7
-      G8
-      G9
-      H0
-      H1
-      H2
-      H3
-      H4
-      H5
-      H6
-      H7
-      H8
-      H9
-      I0
-      I1
-      I2
-      I3
-      I4
-      I5
-      I6
-      I7
-      I8
-      I9
-      J0
-      J1
-      J2
-      J3
-      J4
-      J5
-      J6
-      J7
-      J8
-      J9
-      K0
-      K1
-      K2
-      K3
-      K4
-      K5
-      K6
-      K7
-      K8
-      K9
-      L0
-      L1
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 
+              F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G3 G4 G5 G6 G7 G8 G9 
+              H0 H1 H2 H3 H4 H5 H6 H7 H8 H9 I0 I1 I2 I3 I4 I5 I6 I7 I8 I9 
+              J0 J1 J2 J3 J4 J5 J6 J7 J8 J9 K0 K1 K2 K3 K4 K5 K6 K7 K8 K9 L0 L1)
+  ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()
 
 
 

diff --git a/test/VisuPrs/Plot3D/CMakeLists.txt b/test/VisuPrs/Plot3D/CMakeLists.txt
index b75e8749c4f73d84e1f905a7851bf4d87d59cf10..0a220c8ac44a5853138f909bd3d37d41a937ba7c 100755 (executable)
--- a/test/VisuPrs/Plot3D/CMakeLists.txt
+++ b/test/VisuPrs/Plot3D/CMakeLists.txt
@@ -17,46 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      E0
-      E1
-      E2
-      E3      
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7      
-      F8
-      F9
-      G0
-      G1
-      G2           
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 
+              F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G2)
+  ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/SWIG_scripts/CMakeLists.txt b/test/VisuPrs/SWIG_scripts/CMakeLists.txt
index 5163b64fef27c6c391e3c1e4fb6c1ccdfc1f764e..e00266a971893de92f03c11eb1f84a90414127e0 100644 (file)
--- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt
+++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt
@@ -17,30 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A1
-      A3
-      A4
-      A5
-      A6
-      A7
-      A8
-      A9
-      B0
-      B1
-      B4
-      B5
-      B6
-      B7
-      B8
-      B9
-      C3
-      C6
-      C7
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A1 A3 A4 A5 A6 A7 A8 A9 B0 B1 B4 B5 B6 B7 B8 B9 C3 C6 C7)
+  ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt
index ef5ae26358cee26ad66d3cff7b5a1aa3fab05835..e4e6bc95ecea70b2e0a6633dc42e1821754b39f5 100644 (file)
--- a/test/VisuPrs/ScalarMap/CMakeLists.txt
+++ b/test/VisuPrs/ScalarMap/CMakeLists.txt
@@ -17,47 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1       
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      B3
-      E0
-      E1
-      E2      
-      E3
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7
-      F8
-      F9
-      G0            
-      G1
-      G2
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 
+              F1 F2 F3 F4 F5 F6 F7 F8 F9 G0 G1 G2)
+  ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
index e6c320bf523b73b8962b65930c99ba2aa5f9d147..41a33f54691bee39b07c1b67635a860c5b1b0ace 100644 (file)
--- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
+++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt
@@ -17,43 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9 
-      B0
-      B1
-      B2
-      B3
-      E0
-      E1
-      E2
-      E3      
-      E4     
-      E5
-      E6
-      E7
-      E8
-      E9 
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7
-      F8               
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 
+              F1 F2 F3 F4 F5 F6 F7 F8)
+  ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/StreamLines/CMakeLists.txt b/test/VisuPrs/StreamLines/CMakeLists.txt
index af4fdc7aa5c361bf2a2a9a6633ff18e1b2ceb92a..906efa20c269be424cd7e2e61ca0528e254fc6c7 100644 (file)
--- a/test/VisuPrs/StreamLines/CMakeLists.txt
+++ b/test/VisuPrs/StreamLines/CMakeLists.txt
@@ -17,46 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      B3
-      B4
-      E0
-      E1
-      E2
-      E3
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7
-      F8
-      F9
-      G0
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 B4 
+              E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 F1 F2 F3 F4 F5 F6 F7 F8 F9 G0)
+  ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/Tables/CMakeLists.txt b/test/VisuPrs/Tables/CMakeLists.txt
index f1be315f08284c05f097a4a4ed08044076c5874d..c52678172d0f230b19d7a6f7d35ef28b35ef7c26 100644 (file)
--- a/test/VisuPrs/Tables/CMakeLists.txt
+++ b/test/VisuPrs/Tables/CMakeLists.txt
@@ -17,13 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A2
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A2)
+  ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/Util/CMakeLists.txt b/test/VisuPrs/Util/CMakeLists.txt
index ccb68ec88e95b7667f9fadea05aac8284f36074e..73c593e0dd8f45f481b7c6d6cba599824f799ee9 100644 (file)
--- a/test/VisuPrs/Util/CMakeLists.txt
+++ b/test/VisuPrs/Util/CMakeLists.txt
@@ -22,13 +22,4 @@ SET(dist_testscript_DATA
   paravistesthelper.py
   )
 
-FOREACH(f ${dist_testscript_DATA})
-  INSTALL(FILES ${f} DESTINATION bin/salome)
-
-  INSTALL(CODE "SET(PYTHON_FILE ${f})")
-  INSTALL(CODE "SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
-  INSTALL(CODE "SET(DEST bin/salome)")
-  INSTALL(CODE "SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})")
-  INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/install_and_compile_python_file.cmake)
-  
-ENDFOREACH(f ${dist_testscript_DATA})
+SALOME_INSTALL_SCRIPTS("${dist_testscript_DATA}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})

diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt
index e08cbb7c5dd72d07f02a695b3628d045776e6c50..6a6349e801fdfc746f6105518053ae382eca9ee0 100644 (file)
--- a/test/VisuPrs/Vectors/CMakeLists.txt
+++ b/test/VisuPrs/Vectors/CMakeLists.txt
@@ -17,44 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6      
-      A7
-      A8
-      A9
-      B0
-      B1
-      B2
-      B3
-      E0
-      E1
-      E2
-      E3      
-      E4
-      E5
-      E6
-      E7
-      E8
-      E9
-      F1
-      F2
-      F3
-      F4
-      F5
-      F6
-      F7      
-      F8
-      F9
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-    SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B2 B3 E0 E1 E2 E3 E4 E5 E6 E7 E8 E9 
+              F1 F2 F3 F4 F5 F6 F7 F8 F9)
+  ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
+  SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/bugs/CMakeLists.txt b/test/VisuPrs/bugs/CMakeLists.txt
index 81e00821f1cb910b21a11ddad1c6d3ce3dff8b8c..5f876a7ed1bdb4b532624e6df54732e91f4a3d90 100644 (file)
--- a/test/VisuPrs/bugs/CMakeLists.txt
+++ b/test/VisuPrs/bugs/CMakeLists.txt
@@ -17,35 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6
-      A7
-      A9
-      B1
-      C3
-      C4
-      C5
-      C6
-      C7
-      C8
-      C9
-      D0
-      D1
-      D3
-      D5
-      D6
-      D7
-      E0
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(BUGS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
-    SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH ( tfile A0 A1 A2 A3 A4 A5 A6 A7 A9 B1 C3 C4 C5 C6 C7 C8 C9
+                D0 D1 D3 D5 D6 D7 E0)
+  ADD_TEST(BUGS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
+  SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(BUGS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/dump_study/CMakeLists.txt b/test/VisuPrs/dump_study/CMakeLists.txt
index 9a0c7ded37739159a21fddd2d3f4f1064c3b767e..86b9c159fc81313538495291783cc3d2d7015bbd 100644 (file)
--- a/test/VisuPrs/dump_study/CMakeLists.txt
+++ b/test/VisuPrs/dump_study/CMakeLists.txt
@@ -17,26 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A0
-      A1
-      A2
-      A3
-      A4
-      A5
-      A6
-      A7
-      A8
-      A9
-      B0
-      B1
-      B3
-      B4
-      B5
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(DUMPSTUDY_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
-    SET_TESTS_PROPERTIES(DUMPSTUDY_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 B0 B1 B3 B4 B5)
+  ADD_TEST(DUMPSTUDY_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
+  SET_TESTS_PROPERTIES(DUMPSTUDY_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(DUMPSTUDY_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/imps/CMakeLists.txt b/test/VisuPrs/imps/CMakeLists.txt
index 14a994202decc0a966763c928d6917bf22032fb1..995ad14a7f6cff58c94fee28e53fed24815aff62 100644 (file)
--- a/test/VisuPrs/imps/CMakeLists.txt
+++ b/test/VisuPrs/imps/CMakeLists.txt
@@ -17,19 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A1
-      A2
-      A3
-      A4
-      A6
-      A9
-      B1
-      B2
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(IMPS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
-    SET_TESTS_PROPERTIES(IMPS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A1 A2 A3 A4 A6 A9 B1 B2)
+  ADD_TEST(IMPS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
+  SET_TESTS_PROPERTIES(IMPS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(IMPS_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()

diff --git a/test/VisuPrs/united/CMakeLists.txt b/test/VisuPrs/united/CMakeLists.txt
index ac9a7f983e15bad3cbbd985cf8f152151f900f79..797cccc43f4086330970c4bb02ca8b4945b83bba 100644 (file)
--- a/test/VisuPrs/united/CMakeLists.txt
+++ b/test/VisuPrs/united/CMakeLists.txt
@@ -17,16 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-IF (PYTHON_EXECUTABLE)
-  FOREACH ( tfile
-      A1
-      A2
-      A4
-      A5
-      B0
-      )
-    SET(TIMEOUT 10000)
-    ADD_TEST(UNITED_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
-    SET_TESTS_PROPERTIES(UNITED_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
-  ENDFOREACH( tfile )
-ENDIF (PYTHON_EXECUTABLE)
+SET(TIMEOUT 10000)
+FOREACH(tfile A1 A2 A4 A5 B0)
+  ADD_TEST(UNITED_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR})
+  SET_TESTS_PROPERTIES(UNITED_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT})
+  SET_TESTS_PROPERTIES(UNITED_${tfile} PROPERTIES ENVIRONMENT "${tests_env}")
+ENDFOREACH()