ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 02:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V8_3_BR' into ngr/python3_dev

Browse Source 
Conflicts:
	src/Tools/padder/spadderpy/gui/inputdialog.py
This commit is contained in:
Gilles DAVID 2017-05-18 18:03:44 +02:00
commit 442fd64c19
10 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/salome/gui/SMESH/static/footer.html
View File

@ -4,7 +4,7 @@
<ul>
$navpath
<li class="footer">
Copyright &copy; 2007-2016 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2007-2017 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
</li>
</ul>

2
doc/salome/tui/static/footer.html
View File

@ -4,7 +4,7 @@
<ul>
$navpath
<li class="footer">
Copyright &copy; 2007-2016 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2007-2017 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
</li>
</ul>

19
src/OBJECT/SMESH_ScalarBarActor.cxx
View File

@ -578,15 +578,18 @@ int SMESH_ScalarBarActor::RenderOpaqueGeometry(vtkViewport *viewport)
// rnv begin
// Customization of the vtkScalarBarActor to show distribution histogram.
if(myDistributionColoringType == SMESH_MULTICOLOR_TYPE && GetDistributionVisibility() && distrVisibility)
{
rgb = distColors->GetPointer(3*dcCount); //write into array directly
rgb[0] = rgba[0];
rgb[1] = rgba[1];
rgb[2] = rgba[2];
dcCount++;
}
if ( myDistributionColoringType == SMESH_MULTICOLOR_TYPE &&
GetDistributionVisibility() &&
distrVisibility &&
myNbValues[i] > 0 )
{
rgb = distColors->GetPointer(3*dcCount); //write into array directly
rgb[0] = rgba[0];
rgb[1] = rgba[1];
rgb[2] = rgba[2];
dcCount++;
}
}
// Now position everything properly
//

36
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -7458,8 +7458,8 @@ void SMESH_MeshEditor::MergeNodes (TListOfListOfNodes & theGroupsOfNodes,
for ( size_t i = 0; i < newElemDefs.size(); ++i )
{
if ( i > 0 || !mesh->ChangeElementNodes( elem, &
newElemDefs[i].myNodes[0],
if ( i > 0 || !mesh->ChangeElementNodes( elem,
& newElemDefs[i].myNodes[0],
newElemDefs[i].myNodes.size() ))
{
if ( i == 0 )
@ -7553,6 +7553,30 @@ bool SMESH_MeshEditor::applyMerge( const SMDS_MeshElement* elem,
toRemove = true;
nbResElems = 0;
if ( elem->IsQuadratic() && newElemDefs[0].myType == SMDSAbs_Face && nbNodes > 6 )
{
// if corner nodes stick, remove medium nodes between them from uniqueNodes
int nbCorners = nbNodes / 2;
for ( int iCur = 0; iCur < nbCorners; ++iCur )
{
int iPrev = ( iCur + 1 ) % nbCorners;
if ( curNodes[ iCur ] == curNodes[ iPrev ] ) // corners stick
{
int iMedium = iCur + nbCorners;
vector< const SMDS_MeshNode* >::iterator i =
std::find( uniqueNodes.begin() + nbCorners - nbRepl,
uniqueNodes.end(),
curNodes[ iMedium ]);
if ( i != uniqueNodes.end() )
{
--nbUniqueNodes;
for ( ; i+1 != uniqueNodes.end(); ++i )
*i = *(i+1);
}
}
}
}
switch ( entity )
{
case SMDSEntity_Polygon:
@ -7670,11 +7694,9 @@ bool SMESH_MeshEditor::applyMerge( const SMDS_MeshElement* elem,
// | |
// +---+---+
// 0 7 3
if (( nbUniqueNodes == 6 && nbRepl == 2 ) &&
(( iRepl[0] == 1 && iRepl[1] == 4 && curNodes[1] == curNodes[0] ) ||
( iRepl[0] == 2 && iRepl[1] == 5 && curNodes[2] == curNodes[1] ) ||
( iRepl[0] == 3 && iRepl[1] == 6 && curNodes[3] == curNodes[2] ) ||
( iRepl[0] == 3 && iRepl[1] == 7 && curNodes[3] == curNodes[0] )))
if ( nbUniqueNodes == 6 &&
iRepl[0] < 4 &&
( nbRepl == 1 || iRepl[1] >= 4 ))
{
toRemove = false;
}

4
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -277,6 +277,10 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy,
SO = aStudyBuilder->NewObjectToTag( theFatherObject, theTag );
isNewSO = true;
}
else
{
isInUseCaseTree = useCaseBuilder->IsUseCaseNode( SO );
}
}
else
{

2
src/Tools/MGCleanerPlug/doc/conf.py.in
View File

@ -36,7 +36,7 @@ master_doc = 'index'
# General substitutions.
project = 'MGCleaner Plug-in'
copyright = '2013-2016, EDF R&D'
copyright = '2013-2017, EDF R&D'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.

2
src/Tools/Verima/Doc/conf.py.in
View File

@ -36,7 +36,7 @@ master_doc = 'index'
# General substitutions.
project = 'Verima Plug-in'
copyright = '2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE'
copyright = '2007-2017 CEA/DEN, EDF R&D, OPEN CASCADE'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.

2
src/Tools/YamsPlug/doc/conf.py.in
View File

@ -36,7 +36,7 @@ master_doc = 'index'
# General substitutions.
project = 'MeshGems-SurfOpt Plug-in'
copyright = '2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE'
copyright = '2007-2017 CEA/DEN, EDF R&D, OPEN CASCADE'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.

2
src/Tools/ZCracksPlug/doc/conf.py.in
View File

@ -36,7 +36,7 @@ master_doc = 'index'
# General substitutions.
project = 'ZCracks Plug-in'
copyright = '2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE'
copyright = '2007-2017 CEA/DEN, EDF R&D, OPEN CASCADE'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.

2
src/Tools/blocFissure/doc/conf.py.in
View File

@ -36,7 +36,7 @@ master_doc = 'index'
# General substitutions.
project = 'Plug-in blocFissure'
copyright = '2010-2016 EDF R&D'
copyright = '2010-2017 EDF R&D'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.