From: rnv Date: Wed, 13 Dec 2017 08:43:05 +0000 (+0300) Subject: Merge V8_4_BR branch. X-Git-Tag: V9_0_0^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b97ef329f0db1a411d808dd0e4d2f09a58510ad5;hp=ef8b2021feabc717c59a3239f7cc6d5efa0d0548;p=plugins%2Fblsurfplugin.git Merge V8_4_BR branch. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 74fe737..3a2fc52 100755 --- 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 c8f821a..5444010 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx @@ -40,9 +40,6 @@ #include #include -// kernel includes -#include - 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 4b5ce15..09e3c30 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -37,7 +37,6 @@ extern "C"{ #include -#include #include #include @@ -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 bd56b83..bd6517e 100755 --- 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 BLSURFPluginGUI_AdvWidget enforce_cad_edge_sizes - enforce_cad_edge_sizes + Force la taille des éléments par la CAO jacobian_rectification_respect_geometry - Priorité de la géométrie sur le Jacobien + Priorité de la géométrie sur le Jacobien max_number_of_points_per_patch @@ -679,7 +679,7 @@ Plus la distance est petite, plus le maillage sera proche de la surface (disponi discard_input_topology - discard_input_topology + Ignorer la topologie process_3d_topology diff --git a/src/GUI/BLSURFPlugin_msg_ja.ts b/src/GUI/BLSURFPlugin_msg_ja.ts index d5085f3..3fb6a31 100644 --- a/src/GUI/BLSURFPlugin_msg_ja.ts +++ b/src/GUI/BLSURFPlugin_msg_ja.ts @@ -92,36 +92,32 @@ 3D要素内の２本の隣接エッジ長間の最大比 - BLSURF_ALLOW_QUADRANGLES - 四角形を許可 + BLSURF_ELEMENT_TYPE + 要素タイプ - BLSURF_ELEMENT_TYPE - Element type + BLSURF_TRIANGLES + 三角形要素 - BLSURF_TRIANGLES - Triangles + BLSURF_QUADRANGLE_DOMINANT + 四辺形優位な - BLSURF_QUADRANGLE_DOMINANT - Quadrangle dominant + BLSURF_QUADRANGLES + 四辺形要素 - BLSURF_QUADRANGLES - Quadrangles + BLSURF_ALLOW_QUADRANGLES_TOOLTIP + ドミナント四角形要素の生成 - BLSURF_ALLOW_QUADRANGLES_TOOLTIP - ドミナント四角形要素の生成 + BLSURF_TRIANGLES_TOOLTIP + 三角形要素のみのメッシュ生成 - BLSURF_TRIANGLES_TOOLTIP - To generate triangles-only mesh - - - BLSURF_QUADRANGLES_TOOLTIP - To generate quadrangles-only mesh + BLSURF_QUADRANGLES_TOOLTIP + 四辺形要素のみのメッシュ生成 BLSURF_GEOMETRICAL_SIZE @@ -644,15 +640,15 @@ max_number_of_threads - Maximal number of threads + 最大スレッド数 rectify_jacobian ヤコビアンの修正 - use_deprecated_patch_mesher - use deprecated patch mesher + use_deprecated_patch_mesher + 非推奨パッチメッシャの使用 respect_geometry diff --git a/tests/sphere.py b/tests/sphere.py index bea9381..ac4b96d 100644 --- 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)