Merge from V7_3_BR branch 18/12/2013

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 031aab9751af1a0fb6009d3e678134a52eac1788..4f361b2d7e85eb4ee6d0643f7b2ad6a4d6ee0e33 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,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})
@@ -141,6 +141,12 @@ IF(EXISTS ${SMESH_ROOT_DIR})
       MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH with GUI, please set SALOME_BUILD_GUI=ON in SMESH module")
     ENDIF(NOT SALOME_SMESH_BUILD_GUI)
   ENDIF(SALOME_BUILD_GUI)
+  IF(SALOME_BUILD_DOC)
+    IF(NOT SALOME_SMESH_BUILD_DOC)
+      MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH documentation to build GHS3DPLUGIN documentation. "
+                         "So, you should either set SALOME_BUILD_DOC=OFF in GHS3DPLUGIN or set SALOME_BUILD_DOC=ON in SMESH module.")
+    ENDIF(NOT SALOME_SMESH_BUILD_DOC)
+  ENDIF(SALOME_BUILD_DOC)
 ELSE(EXISTS ${SMESH_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR")
 ENDIF(EXISTS ${SMESH_ROOT_DIR})

diff --git a/doc/salome/gui/GHS3DPLUGIN/CMakeLists.txt b/doc/salome/gui/GHS3DPLUGIN/CMakeLists.txt
index bcd73b500a79919f9227e458542b6fbf55a688ab..b30912c637763bd96d9cf3e235b8a178e61119f4 100755 (executable)
--- a/doc/salome/gui/GHS3DPLUGIN/CMakeLists.txt
+++ b/doc/salome/gui/GHS3DPLUGIN/CMakeLists.txt
@@ -47,4 +47,5 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GHS3DPLUGIN DESTINATION ${SALOME_I
 INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GHS3DPLUGIN)
 INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GHS3DPLUGIN/ghs3dpluginpy_doc)
 
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES GHS3DPLUGIN)
\ No newline at end of file
+SET(make_clean_files GHS3DPLUGIN ghs3dpluginpy_doc.tag)
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${make_clean_files}")

diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
index 4ae382f3d5b5906b6cad248e2d5be073acbc749d..e5c72f29a8bc03ff64fcd7adbca7eab5f27174a2 100644 (file)
--- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
@@ -3377,10 +3377,11 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
   TCollection_AsciiString aLogFileName    = aGenericName + ".log";    // log
   TCollection_AsciiString aResultFileName;
 
-  TCollection_AsciiString aGMFFileName, aRequiredVerticesFileName, aSolFileName;
+  TCollection_AsciiString aGMFFileName, aRequiredVerticesFileName, aSolFileName, aResSolFileName;
 //#ifdef _DEBUG_
   aGMFFileName              = aGenericName + ".mesh"; // GMF mesh file
   aResultFileName           = aGenericName + "Vol.mesh"; // GMF mesh file
+  aResSolFileName           = aGenericName + "Vol.sol"; // GMF mesh file
   aRequiredVerticesFileName = aGenericNameRequired + ".mesh"; // GMF required vertices mesh file
   aSolFileName              = aGenericNameRequired + ".sol"; // GMF solution file
 //#else
@@ -3645,6 +3646,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
     removeFile( aGMFFileName );
     removeFile( aRequiredVerticesFileName );
     removeFile( aSolFileName );
+    removeFile( aResSolFileName );
     removeFile( aResultFileName );
     removeFile( aSmdsToGhs3dIdMapFileName );
   }
@@ -3683,10 +3685,11 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
   TCollection_AsciiString aResultFileName;
   bool Ok;
 
-  TCollection_AsciiString aGMFFileName, aRequiredVerticesFileName, aSolFileName;
+  TCollection_AsciiString aGMFFileName, aRequiredVerticesFileName, aSolFileName, aResSolFileName;
 //#ifdef _DEBUG_
   aGMFFileName              = aGenericName + ".mesh"; // GMF mesh file
   aResultFileName           = aGenericName + "Vol.mesh"; // GMF mesh file
+  aResSolFileName           = aGenericName + "Vol.sol"; // GMF mesh file
   aRequiredVerticesFileName = aGenericNameRequired + ".mesh"; // GMF required vertices mesh file
   aSolFileName              = aGenericNameRequired + ".sol"; // GMF solution file
 //#else
@@ -3883,6 +3886,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh&         theMesh,
     removeFile( aResultFileName );
     removeFile( aRequiredVerticesFileName );
     removeFile( aSolFileName );
+    removeFile( aResSolFileName );
   }
   return Ok;
 }

diff --git a/src/GUI/GHS3DPlugin_msg_ja.ts b/src/GUI/GHS3DPlugin_msg_ja.ts
index 5ff2e041077a9c3ad033f390389bb78f54ee3264..eac4660d458fbd802bc879a2fdb53797f42213ce 100644 (file)
--- a/src/GUI/GHS3DPlugin_msg_ja.ts
+++ b/src/GUI/GHS3DPlugin_msg_ja.ts
@@ -33,11 +33,11 @@
     </message>
     <message>
       <source>GHS3D_TO_MAKE_DOMAIN_GROUPS</source>
-      <translation>GHS3D_TO_MAKE_DOMAIN_GROUPS</translation>
+      <translation>ドメインのグループを確認するには</translation>
     </message>
     <message>
       <source>ADVANCED_MESHING_GROUP_TITLE</source>
-      <translation>ADVANCED_MESHING_GROUP_TITLE</translation>
+      <translation>高度なメッシュ オプション</translation>
     </message>
     <message>
       <source>INIT_MEMORY_SIZE</source>
@@ -45,7 +45,7 @@
     </message>
     <message>
       <source>KEEP_WORKING_FILES</source>
-      <translation>一時ファイルを保持します。</translation>
+      <translation>すべての一時ファイルを保持します。</translation>
     </message>
     <message>
       <source>LEVEL_NONE</source>
@@ -69,11 +69,11 @@
     </message>
     <message>
       <source>LOG_IN_FILE</source>
-      <translation>LOG_IN_FILE</translation>
+      <translation>ログ ファイルへの印刷します。</translation>
     </message>
     <message>
       <source>LOG_GROUP_TITLE</source>
-      <translation>LOG_GROUP_TITLE</translation>
+      <translation>Et のログをデバッグ</translation>
     </message>
     <message>
       <source>MAX_MEMORY_SIZE</source>
@@ -85,7 +85,7 @@
     </message>
     <message>
       <source>MEMORY_GROUP_TITLE</source>
-      <translation>MEMORY_GROUP_TITLE</translation>
+      <translation>メモリの設定</translation>
     </message>
     <message>
       <source>NO_INITIAL_CENTRAL_POINT</source>
@@ -97,7 +97,7 @@
     </message>
     <message>
       <source>FEM_CORRECTION</source>
-      <translation>使用 fix GEF</translation>
+      <translation>GEF 補正を使用してください。</translation>
     </message>
     <message>
       <source>GHS3D_GRADATION</source>
@@ -105,7 +105,7 @@
     </message>
     <message>
       <source>REMOVE_LOG_ON_SUCCESS</source>
-      <translation>REMOVE_LOG_ON_SUCCESS</translation>
+      <translation>削除ログ成功</translation>
     </message>
     <message>
       <source>SELECT_DIR</source>
@@ -205,7 +205,7 @@
     </message>
     <message>
       <source>GHS3D_ENF_MESH_CONSTRAINT_FACE</source>
-      <translation>フェース</translation>
+      <translation>Faces</translation>
     </message>
     <message>
       <source>GHS3D_ENF_SIZE_LABEL</source>