Merge branch V7_6_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4d0ca23fe21164ec67b5a3b4e7db397ca613b5b..fa52f24e51d52e8e613697bfc3ca1311c56c9f29 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,8 @@ 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 5)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
+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})
 SET(${PROJECT_NAME_UC}_VERSION_DEV 1)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 29849a4328fb2114d5341665644d72784a0ff954..294b24b8cbf0013d8df4b019d03e170eaa4394cd 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -102,5 +102,7 @@ INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/YACS)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/yacsloader/samples 
         DESTINATION ${SALOME_INSTALL_DOC}/tui/YACS
         PATTERN "CVS" EXCLUDE
-        )  
+        PATTERN "*.md5" EXCLUDE
+        PATTERN "*.map" EXCLUDE
+        )
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES YACS)

diff --git a/src/engine/ForEachLoop.hxx b/src/engine/ForEachLoop.hxx
index e57778a5b8b1ac455005ee88bff65b50df69e7e5..03333be63f16d53074774876f3cfab722fdef8be 100644 (file)
--- a/src/engine/ForEachLoop.hxx
+++ b/src/engine/ForEachLoop.hxx
@@ -123,7 +123,7 @@ namespace YACS
       static const char NAME[];
     };
 
-    class ForEachLoopPassedData
+    class YACSLIBENGINE_EXPORT ForEachLoopPassedData
     {
     public:
       ForEachLoopPassedData(const std::vector<unsigned int>& passedIds, const std::vector<SequenceAny *>& passedOutputs, const std::vector<std::string>& nameOfOutputs);

diff --git a/src/engine/OptimizerLoop.cxx b/src/engine/OptimizerLoop.cxx
index d36affd030b9eff1b1afc03fbb898a0969eec372..53c67c7ac5af16203f5bd413720f56d0275e510e 100644 (file)
--- a/src/engine/OptimizerLoop.cxx
+++ b/src/engine/OptimizerLoop.cxx
@@ -170,7 +170,6 @@ void OptimizerLoop::exUpdateState()
 
           // Initialize and launch the algorithm
           _alg->initializeProxy(_algoInitPort.getValue());
-          _alg->startProxy();
           if (_alg->hasError()) {
             string error = _alg->getError();
             _alg->finishProxy();
@@ -181,6 +180,14 @@ void OptimizerLoop::exUpdateState()
           int i;
           int nbOfBr=_nbOfBranches.getIntValue();
           _alg->setNbOfBranches(nbOfBr);
+
+          _alg->startProxy();
+          if (_alg->hasError()) {
+            string error = _alg->getError();
+            _alg->finishProxy();
+            throw Exception(error);
+          }
+
           if(nbOfBr==0)
             {
               // A number of branches of 0 is acceptable if there are no output ports

diff --git a/src/salomegui/resources/YACS_msg_fr.ts b/src/salomegui/resources/YACS_msg_fr.ts
index ae221267b3e4b1e9cb012fc7b51ae3650c2d052d..a1f7bfa5bf34fc88b5d405a5a5585e8b8de02fdf 100644 (file)
--- a/src/salomegui/resources/YACS_msg_fr.ts
+++ b/src/salomegui/resources/YACS_msg_fr.ts
@@ -543,7 +543,7 @@
     </message>
     <message>
         <source>Put Graph Content in Node</source>
-        <translation type="unfinished">Put Graph Content in Node</translation>
+        <translation>Mettre le contenu du graphe dans le nœud</translation>
     </message>
     <message>
         <source>arrange nodes on that bloc level, without recursion</source>
@@ -595,11 +595,11 @@
     </message>
     <message>
         <source>shrink or expand direct children of the selected node</source>
-        <translation type="unfinished">contracter ou étendre le noeud choisi</translation>
+        <translation>contracter ou étendre le noeud choisi</translation>
     </message>
     <message>
         <source>shrink or expand elementary nodes of the selected node recursively</source>
-        <translation type="unfinished">contracter ou étendre le noeud choisi</translation>
+        <translation>contracter ou étendre le noeud choisi</translation>
     </message>
     <message>
         <source>shrink/expand</source>
@@ -607,11 +607,11 @@
     </message>
     <message>
         <source>shrink/expand children</source>
-        <translation type="unfinished">contracter/étendre</translation>
+        <translation >contracter/étendre</translation>
     </message>
     <message>
         <source>shrink/expand elementary</source>
-        <translation type="unfinished">contracter/étendre</translation>
+        <translation>contracter/étendre</translation>
     </message>
     <message>
         <source>draw straight or orthogonal links</source>