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

Merge branch 'master' into pre/penta18

Browse Source
This commit is contained in:
Paul RASCLE 2017-09-15 11:15:53 +02:00
commit 30ce546b0c
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DriverCGNS/DriverCGNS_Write.cxx
View File

@ -628,7 +628,7 @@ Driver_Mesh::Status DriverCGNS_Write::Perform()
return addMessage( cg_get_error(), /*fatal = */true); return addMessage( cg_get_error(), /*fatal = */true);
// write BC location // write BC location
if ( location != CGNS_ENUMV( Vertex )) if ( location != CGNS_ENUMV( Vertex ) || meshDim == 1 )
{ {
if ( cg_boco_gridlocation_write( _fn, iBase, iZone, iBC, location) != CG_OK ) if ( cg_boco_gridlocation_write( _fn, iBase, iZone, iBC, location) != CG_OK )
return addMessage( cg_get_error(), /*fatal = */false); return addMessage( cg_get_error(), /*fatal = */false);

3
src/OBJECT/SMESH_DeviceActor.cxx
View File

@ -37,6 +37,7 @@
#include <VTKViewer_Transform.h> #include <VTKViewer_Transform.h>
#include <VTKViewer_TransformFilter.h> #include <VTKViewer_TransformFilter.h>
#include <VTKViewer_ExtractUnstructuredGrid.h> #include <VTKViewer_ExtractUnstructuredGrid.h>
#include <VTKViewer_Actor.h>
// VTK Includes // VTK Includes
#include <vtkObjectFactory.h> #include <vtkObjectFactory.h>
@ -94,7 +95,7 @@ SMESH_DeviceActor
myMapper = VTKViewer_PolyDataMapper::New(); myMapper = VTKViewer_PolyDataMapper::New();
myPlaneCollection = vtkPlaneCollection::New(); myPlaneCollection = vtkPlaneCollection::New();
vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor, VTKViewer_Actor::GetDefaultPolygonOffsetParameters(myPolygonOffsetFactor,
myPolygonOffsetUnits); myPolygonOffsetUnits);
myMapper->UseLookupTableScalarRangeOn(); myMapper->UseLookupTableScalarRangeOn();

17
src/SMESH_I/SMESH_MeshEditor_i.cxx
View File

@ -3108,17 +3108,14 @@ SMESH_MeshEditor_i::mirror(TIDSortedElemSet & theElements,
::SMESH_MeshEditor::PGroupIDs groupIds = ::SMESH_MeshEditor::PGroupIDs groupIds =
getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh);
if ( theCopy && !myIsPreviewMode) if ( !myIsPreviewMode )
{ {
if ( theTargetMesh ) if ( theTargetMesh )
{
theTargetMesh->GetMeshDS()->Modified(); theTargetMesh->GetMeshDS()->Modified();
}
else else
{
declareMeshModified( /*isReComputeSafe=*/false ); declareMeshModified( /*isReComputeSafe=*/false );
} }
}
return theMakeGroups ? getGroups(groupIds.get()) : 0; return theMakeGroups ? getGroups(groupIds.get()) : 0;
SMESH_CATCH( SMESH::throwCorbaException ); SMESH_CATCH( SMESH::throwCorbaException );
@ -3375,17 +3372,13 @@ SMESH_MeshEditor_i::translate(TIDSortedElemSet & theElements,
::SMESH_MeshEditor::PGroupIDs groupIds = ::SMESH_MeshEditor::PGroupIDs groupIds =
getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh);
if ( theCopy && !myIsPreviewMode ) if ( !myIsPreviewMode )
{ {
if ( theTargetMesh ) if ( theTargetMesh )
{
theTargetMesh->GetMeshDS()->Modified(); theTargetMesh->GetMeshDS()->Modified();
}
else else
{
declareMeshModified( /*isReComputeSafe=*/false ); declareMeshModified( /*isReComputeSafe=*/false );
} }
}
return theMakeGroups ? getGroups(groupIds.get()) : 0; return theMakeGroups ? getGroups(groupIds.get()) : 0;
@ -3632,7 +3625,7 @@ SMESH_MeshEditor_i::rotate(TIDSortedElemSet & theElements,
::SMESH_MeshEditor::PGroupIDs groupIds = ::SMESH_MeshEditor::PGroupIDs groupIds =
getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh);
if ( theCopy && !myIsPreviewMode) if ( !myIsPreviewMode)
{ {
if ( theTargetMesh ) theTargetMesh->GetMeshDS()->Modified(); if ( theTargetMesh ) theTargetMesh->GetMeshDS()->Modified();
else declareMeshModified( /*isReComputeSafe=*/false ); else declareMeshModified( /*isReComputeSafe=*/false );
@ -3932,7 +3925,7 @@ SMESH_MeshEditor_i::scale(SMESH::SMESH_IDSource_ptr theObject,
::SMESH_MeshEditor::PGroupIDs groupIds = ::SMESH_MeshEditor::PGroupIDs groupIds =
getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh);
if ( theCopy && !myIsPreviewMode ) if ( !myIsPreviewMode )
{ {
if ( theTargetMesh ) theTargetMesh->GetMeshDS()->Modified(); if ( theTargetMesh ) theTargetMesh->GetMeshDS()->Modified();
else declareMeshModified( /*isReComputeSafe=*/false ); else declareMeshModified( /*isReComputeSafe=*/false );