Merge V8_4_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74fe737f5e6e1a0588434491ec5752cd26fd3cbf..3a2fc52cbdbd3b21a8597a774b2ff1301d396949 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 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})

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
index c8f821a21452b0eef9d2c3c428e91d23e31f80bb..544401010857d0871a736b8926512637ee5e1872 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
@@ -40,9 +40,6 @@
 #include <Precision.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
 
-// kernel includes
-#include <Basics_OCCTVersion.hxx>
-
 BLSURFPlugin_Attractor::BLSURFPlugin_Attractor ()
   : _face(),
   _attractorShape(),
@@ -197,11 +194,7 @@ void BLSURFPlugin_Attractor::edgeInit(Handle(Geom_Surface) theSurf, const TopoDS
   Handle(Geom_Curve) aCurve3d = BRep_Tool::Curve (anEdge, first, last);
   ShapeConstruct_ProjectCurveOnSurface curveProjector;
   curveProjector.Init(theSurf, Precision::Confusion());
-#if OCC_VERSION_LARGE > 0x07010000
   curveProjector.Perform (aCurve3d, first, last, aCurve2d);
-#else
-  curveProjector.PerformAdvanced (aCurve3d, first, last, aCurve2d);
-#endif
 
   int N = 1200;
   for (i=0; i<=N; i++){

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 4b5ce15b3d76bebbc4cebca5976c9649356d1d3e..09e3c30e20e69d19d7d6693728c0929560425206 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -37,7 +37,6 @@ extern "C"{
 
 
 #include <Basics_Utils.hxx>
-#include <Basics_OCCTVersion.hxx>
 
 #include <SMDS_EdgePosition.hxx>
 #include <SMESHDS_Group.hxx>
@@ -2019,11 +2018,7 @@ bool BLSURFPlugin_BLSURF::compute(SMESH_Mesh&         aMesh,
      * (For this face, it will be called by cadsurf with your_face_object_ptr
      * as last parameter.
      */
-#if OCC_VERSION_MAJOR < 7
-    cad_face_t *fce = cad_face_new(c, iface, surf_fun, surfaces.back());
-#else
     cad_face_t *fce = cad_face_new(c, iface, surf_fun, surfaces.back().get());
-#endif
 
     /* by default a face has no tag (color).
        The following call sets it to the same value as the Geom module ID : */
@@ -2224,11 +2219,7 @@ bool BLSURFPlugin_BLSURF::compute(SMESH_Mesh&         aMesh,
       }
 
       /* attach the edge to the current cadsurf face */
-#if OCC_VERSION_MAJOR < 7
-      cad_edge_t *edg = cad_edge_new(fce, ic, tmin, tmax, curv_fun, curves.back());
-#else
       cad_edge_t *edg = cad_edge_new(fce, ic, tmin, tmax, curv_fun, curves.back().get());
-#endif
 
       /* by default an edge has no tag (color).
          The following call sets it to the same value as the edge_id : */

diff --git a/src/GUI/BLSURFPlugin_msg_fr.ts b/src/GUI/BLSURFPlugin_msg_fr.ts
index bd56b83d8f95ae767653c6bfac0af38966fa5fe6..bd6517ec8178b49dd08f82df06c2312e1c4c84b2 100755 (executable)
--- a/src/GUI/BLSURFPlugin_msg_fr.ts
+++ b/src/GUI/BLSURFPlugin_msg_fr.ts
@@ -639,11 +639,11 @@ Plus la distance est petite, plus le maillage sera proche de la surface (disponi
     <name>BLSURFPluginGUI_AdvWidget</name>
     <message>
         <source>enforce_cad_edge_sizes</source>
-        <translation>enforce_cad_edge_sizes</translation>
+        <translation>Force la taille des éléments par la CAO</translation>
     </message>
     <message>
         <source>jacobian_rectification_respect_geometry</source>
-        <translation> Priorité de la géométrie sur le Jacobien</translation>
+        <translation>Priorité de la géométrie sur le Jacobien</translation>
     </message>
     <message>
         <source>max_number_of_points_per_patch</source>
@@ -679,7 +679,7 @@ Plus la distance est petite, plus le maillage sera proche de la surface (disponi
     </message>
     <message>
         <source>discard_input_topology</source>
-        <translation>discard_input_topology</translation>
+        <translation>Ignorer la topologie</translation>
     </message>
     <message>
         <source>process_3d_topology</source>

diff --git a/src/GUI/BLSURFPlugin_msg_ja.ts b/src/GUI/BLSURFPlugin_msg_ja.ts
index d5085f3b4fb5071897b414e0ba45e68232bdea58..3fb6a316077046d94417f71caea18be920dd2d97 100644 (file)
--- a/src/GUI/BLSURFPlugin_msg_ja.ts
+++ b/src/GUI/BLSURFPlugin_msg_ja.ts
@@ -92,36 +92,32 @@
       <translation>3D要素内の２本の隣接エッジ長間の最大比</translation>
     </message>
     <message>
-      <source>BLSURF_ALLOW_QUADRANGLES</source>
-      <translation>四角形を許可</translation>
+      <source>BLSURF_ELEMENT_TYPE</source>
+      <translation>要素タイプ</translation>
     </message>
     <message>
-        <source>BLSURF_ELEMENT_TYPE</source>
-        <translation type="unfinished">Element type</translation>
+      <source>BLSURF_TRIANGLES</source>
+      <translation>三角形要素</translation>
     </message>
     <message>
-        <source>BLSURF_TRIANGLES</source>
-        <translation type="unfinished">Triangles</translation>
+      <source>BLSURF_QUADRANGLE_DOMINANT</source>
+      <translation>四辺形優位な</translation>
     </message>
     <message>
-        <source>BLSURF_QUADRANGLE_DOMINANT</source>
-        <translation type="unfinished">Quadrangle dominant</translation>
+      <source>BLSURF_QUADRANGLES</source>
+      <translation>四辺形要素</translation>
     </message>
     <message>
-        <source>BLSURF_QUADRANGLES</source>
-        <translation type="unfinished">Quadrangles</translation>
+      <source>BLSURF_ALLOW_QUADRANGLES_TOOLTIP</source>
+      <translation>ドミナント四角形要素の生成</translation>
     </message>
     <message>
-        <source>BLSURF_ALLOW_QUADRANGLES_TOOLTIP</source>
-        <translation>ドミナント四角形要素の生成</translation>
+      <source>BLSURF_TRIANGLES_TOOLTIP</source>
+      <translation>三角形要素のみのメッシュ生成</translation>
     </message>
     <message>
-        <source>BLSURF_TRIANGLES_TOOLTIP</source>
-        <translation type="unfinished">To generate triangles-only mesh</translation>
-    </message>
-    <message>
-        <source>BLSURF_QUADRANGLES_TOOLTIP</source>
-        <translation type="unfinished">To generate quadrangles-only mesh</translation>
+      <source>BLSURF_QUADRANGLES_TOOLTIP</source>
+      <translation>四辺形要素のみのメッシュ生成</translation>
     </message>
     <message>
       <source>BLSURF_GEOMETRICAL_SIZE</source>
@@ -644,15 +640,15 @@
     </message>
     <message>
       <source>max_number_of_threads</source>
-      <translation type="unfinished">Maximal number of threads</translation>
+      <translation>最大スレッド数</translation>
     </message>
     <message>
       <source>rectify_jacobian</source>
       <translation>ヤコビアンの修正</translation>
     </message>
     <message>
-        <source>use_deprecated_patch_mesher</source>
-        <translation>use deprecated patch mesher</translation>
+      <source>use_deprecated_patch_mesher</source>
+      <translation>非推奨パッチメッシャの使用</translation>
     </message>
     <message>
       <source>respect_geometry</source>

diff --git a/tests/sphere.py b/tests/sphere.py
index bea9381625675c00cc70b3c534a60c430d475a7c..ac4b96d9a67230bd824ce39934bf6bf23a926c75 100644 (file)
--- a/tests/sphere.py
+++ b/tests/sphere.py
@@ -42,12 +42,15 @@ ok = Mesh_1.Compute()
 if not ok:
     raise Exception("Error when computing surface mesh")
 
-Mesh_1.Tetrahedron(algo=smeshBuilder.MG_Tetra)
+try:
+    Mesh_1.Tetrahedron(algo=smeshBuilder.MG_Tetra)
 
-ok = Mesh_1.Compute()
+    ok = Mesh_1.Compute()
 
-if not ok:
-    raise Exception("Error when computing volume mesh")
+    if not ok:
+        raise Exception("Error when computing volume mesh")
+except AttributeError:
+    print "Warning: Cannot build volume mesh: MG-Tetra plugin seems to be unavailable"
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(True)