Merge branch 'V7_7_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f37f1ce781e62f861a7386bd64911d9b5033a87..82f642d86bab8118af97c87d7c4420db79aeab35 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,11 +30,11 @@ 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 6)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
 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)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Find KERNEL (optional)
 # ==============

diff --git a/src/engine/DynParaLoop.cxx b/src/engine/DynParaLoop.cxx
index e946381908261a8f68b1213e8d54b79b8c6cdc20..71a5fe368fd348bb45f22c7cdbfd28e833d4f616 100644 (file)
--- a/src/engine/DynParaLoop.cxx
+++ b/src/engine/DynParaLoop.cxx
@@ -480,7 +480,7 @@ void DynParaLoop::checkControlDependancy(OutPort *start, InPort *end, bool cross
 }
 
 void DynParaLoop::checkLinkPossibility(OutPort *start, const std::list<ComposedNode *>& pointsOfViewStart,
-                                InPort *end, const std::list<ComposedNode *>& pointsOfViewEnd) throw(Exception)
+                                InPort *end, const std::list<ComposedNode *>& pointsOfViewEnd) throw(YACS::Exception)
 {
   ComposedNode::checkLinkPossibility(start, pointsOfViewStart, end, pointsOfViewEnd);
   Node * startNode = isInMyDescendance(start->getNode());

diff --git a/src/engine/Executor.cxx b/src/engine/Executor.cxx
index daa578be6bec8f1f1356f114175a126852ea49d9..456caf6d3eb52e59d65a93c42c77c63a1f124446 100644 (file)
--- a/src/engine/Executor.cxx
+++ b/src/engine/Executor.cxx
@@ -649,11 +649,18 @@ void Executor::stopExecution()
 bool Executor::saveState(const std::string& xmlFile)
 {
   DEBTRACE("Executor::saveState() in " << xmlFile);
-  YACS::ENGINE::VisitorSaveState vst(_root);
-  vst.openFileDump(xmlFile.c_str());
-  _root->accept(&vst);
-  vst.closeFileDump();
-  return true;
+  bool result = false;
+  try {
+    YACS::ENGINE::VisitorSaveState vst(_root);
+    vst.openFileDump(xmlFile.c_str());
+    _root->accept(&vst);
+    vst.closeFileDump();
+    result = true;
+  }
+  catch(Exception& ex) {
+    std::cerr << ex.what() << std::endl;
+  }
+  return result;
 }
 
 //! not yet implemented

diff --git a/src/engine/OptimizerLoop.cxx b/src/engine/OptimizerLoop.cxx
index df634a0fb5fb4157b71e78952c626e29862f801f..83d9dce364aa473b7a7287ff06fd64d6f82512ab 100644 (file)
--- a/src/engine/OptimizerLoop.cxx
+++ b/src/engine/OptimizerLoop.cxx
@@ -522,14 +522,14 @@ void OptimizerLoop::checkCFLinks(const std::list<OutPort *>& starts, InputPort *
 }
 
 void OptimizerLoop::checkLinkPossibility(OutPort *start, const std::list<ComposedNode *>& pointsOfViewStart,
-                          InPort *end, const std::list<ComposedNode *>& pointsOfViewEnd) throw(Exception)
+                          InPort *end, const std::list<ComposedNode *>& pointsOfViewEnd) throw(YACS::Exception)
 {
   DynParaLoop::checkLinkPossibility(start, pointsOfViewStart, end, pointsOfViewEnd);
   std::string linkName("(");
   linkName += start->getName()+" to "+end->getName()+")";
 
   // Yes, it should be possible to link back the result port to any input port of the loop.
-  if(end == &_nbOfBranches or end == &_algoInitPort)
+  if(end == &_nbOfBranches || end == &_algoInitPort)
     if(start != &_algoResultPort)
       throw Exception(std::string("Illegal OptimizerLoop link.") + linkName);
     else
@@ -539,7 +539,7 @@ void OptimizerLoop::checkLinkPossibility(OutPort *start, const std::list<Compose
     throw Exception(std::string("Illegal OptimizerLoop link: \
 The 'algoResult' port can't be linked within the scope of the loop.") + linkName);
   
-  if(end == &_retPortForOutPool and isInMyDescendance(start->getNode())!=_node)
+  if(end == &_retPortForOutPool && isInMyDescendance(start->getNode())!=_node)
     throw Exception(std::string("Illegal OptimizerLoop link: \
 The 'evalResults' port can only be linked to the working node.") + linkName);
 }

diff --git a/src/genericgui/GuiExecutor.cxx b/src/genericgui/GuiExecutor.cxx
index 8a1e1a12dbf36a7b0019f4b9472b12d020e8005e..4bd977c69451a22148d5ac76b68957558d519ee6 100644 (file)
--- a/src/genericgui/GuiExecutor.cxx
+++ b/src/genericgui/GuiExecutor.cxx
@@ -279,8 +279,12 @@ void GuiExecutor::saveState(const std::string& xmlFile)
   bool StartFinish = (getExecutorState() == YACS::NOTYETINITIALIZED ||
                       getExecutorState() == YACS::FINISHED);
   if ( _isRunning ||
-       !(CORBA::is_nil(_procRef)) && StartFinish )
-    _procRef->saveState(xmlFile.c_str());
+       !(CORBA::is_nil(_procRef)) && StartFinish ) {
+    if ( !_procRef->saveState(xmlFile.c_str()) ) {
+      string what = "Impossible to open file for writing: " + xmlFile;
+      throw Exception(what);
+    }
+  }
 }
 
 void GuiExecutor::setLoadStateFile(std::string xmlFile)

diff --git a/src/runtime/Test/CMakeLists.txt b/src/runtime/Test/CMakeLists.txt
index 3589502f83d137e9bb38fbe5bc1d74c1e3169d63..506be0e11cd922d00d78541834831886291e914b 100644 (file)
--- a/src/runtime/Test/CMakeLists.txt
+++ b/src/runtime/Test/CMakeLists.txt
@@ -117,10 +117,10 @@ IF(NOT WIN32)
   SALOME_CONFIGURE_FILE(xmlrun_orig.sh xmlrun.sh)
   ADD_TEST(NAME runtimeTest COMMAND ${SHELL} ${CMAKE_CURRENT_SOURCE_DIR}/runtimeTest.sh)
   SET_TESTS_PROPERTIES(runtimeTest PROPERTIES ENVIRONMENT "${tests_env}")
+  INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xmlrun.sh DESTINATION ${LOCAL_TEST_DIR})
 ENDIF() 
 
 INSTALL(PROGRAMS runtimeTest.sh DESTINATION ${LOCAL_TEST_DIR})
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xmlrun.sh DESTINATION ${LOCAL_TEST_DIR})
 INSTALL(TARGETS runtime_echo DESTINATION ${SALOME_YACS_INSTALL_TEST_LIB})
 INSTALL(TARGETS TestRuntime DESTINATION ${LOCAL_TEST_DIR})
 INSTALL(TARGETS runtimeTestEchoSrv DESTINATION ${LOCAL_TEST_DIR})

diff --git a/src/salomegui/resources/YACS_msg_ja.ts b/src/salomegui/resources/YACS_msg_ja.ts
index a8508990e3a372a236dd16a603c4394096e328e9..238430cb92f6e0c71a43bbd793ba88bef47c6b54 100644 (file)
--- a/src/salomegui/resources/YACS_msg_ja.ts
+++ b/src/salomegui/resources/YACS_msg_ja.ts
@@ -543,7 +543,7 @@
     </message>
     <message>
       <source>Put Graph Content in Node</source>
-      <translation type="unfinished">ノード内のグラフの内容を置く</translation>
+      <translation>ノード内のグラフの内容を置く</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">選択中のノードを展開または縮小</translation>
+      <translation>選択中のノードを展開または縮小</translation>
     </message>
     <message>
       <source>shrink or expand elementary nodes of the selected node recursively</source>
-      <translation type="unfinished">選択中のノードを展開または縮小</translation>
+      <translation>選択中のノードを展開または縮小</translation>
     </message>
     <message>
       <source>shrink/expand</source>
@@ -607,11 +607,11 @@
     </message>
     <message>
       <source>shrink/expand children</source>
-      <translation type="unfinished">展開/縮小</translation>
+      <translation>展開/縮小</translation>
     </message>
     <message>
       <source>shrink/expand elementary</source>
-      <translation type="unfinished">展開/縮小</translation>
+      <translation>展開/縮小</translation>
     </message>
     <message>
       <source>draw straight or orthogonal links</source>