ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 08:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V9_8_BR'

Browse Source
This commit is contained in:
vsr 2021-12-10 12:47:22 +03:00
commit de59ee6d8d
6 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -38,7 +38,7 @@ ENDIF()
# Versioning
# ===========
SALOME_SETUP_VERSION(9.7.0 DEVELOPMENT)
SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
# Find KERNEL

5
doc/salome/examples/test_smeshplugins.py
View File

@ -17,6 +17,7 @@ __revision__ = "V1.0"
ComputeMeshes = True
import salome
import platform
salome.salome_init_without_session()
theStudy = salome.myStudy
@ -74,6 +75,8 @@ while not ERROR :
print(TEXTE+": OK")
# B.2. Gmsh
# GMSH for windows not yet implemented BOS #18709
if platform.system() != "Windows" :
TEXTE = "Gmsh"
MESH_2 = smesh.Mesh(BOX)
smesh.SetName(MESH_2.GetMesh(), "M_"+TEXTE)
@ -91,6 +94,8 @@ while not ERROR :
ERROR += 1
else :
print(TEXTE+": OK")
else :
print("Skipping B.2 on windows")
# B.3. MG_CADSurf
TEXTE = "MG_CADSurf"

9
doc/salome/examples/tests.set
View File

@ -43,9 +43,7 @@ SET(BAD_TESTS
quality_controls_ex22.py
viewing_meshes_ex01.py
radial_prism_3d_algo.py
test_smeshplugin_mg_tetra_parallele.py
test_smeshplugins.py
MGAdaptTests_without_session.py
blocFissure_01_without_session.py
blocFissure_02_without_session.py
blocFissure_03_without_session.py
@ -55,6 +53,13 @@ SET(BAD_TESTS
blocFissure_07_without_session.py
)
IF(NOT WIN32)
LIST(APPEND BAD_TESTS
MGAdaptTests_without_session.py
test_smeshplugin_mg_tetra_parallele.py
)
ENDIF(NOT WIN32)
SET(GOOD_TESTS
cartesian_algo.py
create_penta_biquad.py

13
src/SMESHGUI/SMESHGUI.cxx
View File

@ -2083,6 +2083,19 @@ void SMESHGUI::OnEditDelete()
aStudyBuilder->RemoveObjectWithChildren( SO );
}
else {// default action: remove SObject from the study
// Find Sub-Meshes and Group and delete corresopning visual objects and actors
_PTR(ChildIterator) it1 = aStudy->NewChildIterator(SO);
for (it1->InitEx(false); it1->More(); it1->Next()) {
_PTR(SObject) SObj = it1->Value();
if (!SObj) continue;
if (SObj->FindAttribute(anAttr, "AttributeIOR")) {
SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(SMESH::SObjectToObject(SObj));
SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow(SMESH::SObjectToObject(SObj));
if (!aGroup->_is_nil() || !aSubMesh->_is_nil()) {
SMESH::RemoveVisualObjectWithActors(SObj->GetID().c_str(), true);
}
}
}
// san - it's no use opening a transaction here until UNDO/REDO is provided in SMESH
//SUIT_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy);
//op->start();

2
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
View File

@ -4458,7 +4458,7 @@ namespace
// connect pn2 (probably new, at _eIntNodes) with a split
int i, iConn;
int i, iConn = 0;
size_t nbCommon;
TGeomID commonFaces[20];
_Node* nPrev = nullptr;

6
src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
View File

@ -637,7 +637,11 @@ bool StdMeshers_MEFISTO_2D::LoadPoints(TWireVector & wires,
m++;
}
int mFirst = mOnVertex.front(), mLast = m - 1;
int mFirst = 0, mLast = 0;
if (!mOnVertex.empty()) {
mFirst = mOnVertex.front();
mLast = m - 1;
}
list< int >::iterator mIt = mOnVertex.begin();
for ( ; mIt != mOnVertex.end(); ++mIt)
{