ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Crash after pre-viewing mesh translation

Browse Source
This commit is contained in:
eap 2018-11-14 16:41:52 +03:00
parent 0e7304f3cc
commit 7abad597ce
12 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -1339,7 +1339,7 @@ void SMESHGUI_BaseComputeOp::onShowBadMesh()
prop->SetPointSize( aPointSize * 3 );
prop->SetColor( 250, 0, 250 );
myBadMeshDisplayer->GetActor()->SetProperty( prop );
myBadMeshDisplayer->SetData( aMeshData._retn() );
myBadMeshDisplayer->SetData( aMeshData.in() );
prop->Delete();
}
}
@ -1979,11 +1979,10 @@ void SMESHGUI_PrecomputeOp::onPreview()
SMESH::MeshPreviewStruct_var previewData =
gen->Precompute(myMesh, myMainShape, (SMESH::Dimension)dim, aShapesId);
SMESH::MeshPreviewStruct* previewRes = previewData._retn();
if ( previewRes && previewRes->nodesXYZ.length() > 0 )
if ( & previewData.in() && previewData->nodesXYZ.length() > 0 )
{
computeFailed = false;
myPreviewDisplayer->SetData( previewRes );
myPreviewDisplayer->SetData( previewData );
// append shape indices with computed mesh entities
for ( int i = 0, n = aShapesId->length(); i < n; i++ )
myMapShapeId[ aShapesId[ i ] ] = 0;

2
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
View File

@ -265,7 +265,7 @@ bool SMESHGUI_ConvToQuadOp::onApply()
prop->Delete();
SMESH::MeshPreviewStruct_var previewData = aEditor->GetPreviewData();
myBadElemsPreview->SetData( previewData._retn() );
myBadElemsPreview->SetData( previewData.in() );
myBadElemsPreview->SetVisibility(true);
SUIT_MessageBox* mb = new SUIT_MessageBox(SUIT_MessageBox::Warning,

2
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
View File

@ -1112,7 +1112,7 @@ void SMESHGUI_ExtrusionAlongPathDlg::onDisplaySimulation( bool toDisplayPreview
if( retVal == SMESH::SMESH_MeshEditor::EXTR_OK )
{
SMESH::MeshPreviewStruct_var aMeshPreviewStruct = meshEditor->GetPreviewData();
mySimulation->SetData( aMeshPreviewStruct._retn() );
mySimulation->SetData( aMeshPreviewStruct.in() );
}
else {
hidePreview();

2
src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
View File

@ -1573,7 +1573,7 @@ void SMESHGUI_ExtrusionDlg::onDisplaySimulation( bool toDisplayPreview )
makeGroups );
}
SMESH::MeshPreviewStruct_var aMeshPreviewStruct = meshEditor->GetPreviewData();
mySimulation->SetData(aMeshPreviewStruct._retn());
mySimulation->SetData(aMeshPreviewStruct);
} catch (...) {
hidePreview();

2
src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
View File

@ -536,7 +536,7 @@ void SMESHGUI_FindElemByPointOp::redisplayPreview()
myPreview->nodesXYZ[0].z = myDlg->myZ->GetValue();
if (!mySimulation)
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
mySimulation->SetData( myPreview._retn());
mySimulation->SetData( myPreview.in());
}
//================================================================================

4
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
View File

@ -811,9 +811,9 @@ void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
if (!mySimulation)
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
// display data
if ( aMeshPreviewStruct.operator->() )
if ( & aMeshPreviewStruct.in() )
{
mySimulation->SetData(aMeshPreviewStruct._retn());
mySimulation->SetData( aMeshPreviewStruct.in() );
}
else
{

8
src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
View File

@ -167,10 +167,10 @@ vtkIdType getCellType( const SMDSAbs_ElementType theType,
*/
//================================================================================
void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct_var previewData)
void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct& previewData)
{
// Create points
const SMESH::nodes_array& aNodesXYZ = previewData->nodesXYZ;
const SMESH::nodes_array& aNodesXYZ = previewData.nodesXYZ;
vtkPoints* aPoints = vtkPoints::New();
aPoints->SetNumberOfPoints(aNodesXYZ.length());
@ -182,8 +182,8 @@ void SMESHGUI_MeshEditPreview::SetData (const SMESH::MeshPreviewStruct_var previ
aPoints->Delete();
// Create cells
const SMESH::long_array& anElemConnectivity = previewData->elementConnectivities;
const SMESH::types_array& anElemTypes = previewData->elementTypes;
const SMESH::long_array& anElemConnectivity = previewData.elementConnectivities;
const SMESH::types_array& anElemTypes = previewData.elementTypes;
vtkIdType aCellsSize = anElemConnectivity.length() + anElemTypes.length();
vtkIdType aNbCells = anElemTypes.length();

2
src/SMESHGUI/SMESHGUI_MeshEditPreview.h
View File

@ -57,7 +57,7 @@ public:
SMESHGUI_MeshEditPreview( SVTK_ViewWindow* );
~SMESHGUI_MeshEditPreview();
void SetData( const SMESH::MeshPreviewStruct_var );
void SetData( const SMESH::MeshPreviewStruct& );
void SetVisibility( bool );
void SetColor( double, double, double );

2
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
View File

@ -1242,7 +1242,7 @@ void SMESHGUI_UnionOfTrianglesDlg::onDisplaySimulation( bool toDisplayPreview )
mySimulation->GetActor()->SetProperty( aProp );
aProp->Delete();
mySimulation->SetData( aMeshPreviewStruct._retn() );
mySimulation->SetData( aMeshPreviewStruct.in() );
} catch ( ... ) {
hidePreview();
}

2
src/SMESHGUI/SMESHGUI_PreviewDlg.cxx
View File

@ -248,7 +248,7 @@ void SMESHGUI_MultiPreviewDlg::setSimulationPreview( QList<SMESH::MeshPreviewStr
mySimulationList.clear();
for ( int i = 0; i < theMeshPreviewStruct.count(); i++ ) {
mySimulationList << new SMESHGUI_MeshEditPreview( SMESH::GetViewWindow( mySMESHGUI ) );
mySimulationList[i]->SetData( theMeshPreviewStruct[i].operator->() );
mySimulationList[i]->SetData( theMeshPreviewStruct[i].in() );
}
}

4
src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx
View File

@ -933,9 +933,9 @@ void SMESHGUI_ReorientFacesOp::redisplayPreview()
// }
// // display data
// if ( aMeshPreviewStruct.operator->() )
// if ( & aMeshPreviewStruct.in() )
// {
// myVectorPreview->SetData(aMeshPreviewStruct._retn());
// myVectorPreview->SetData(aMeshPreviewStruct.in());
// }
// else
// {

2
src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
View File

@ -796,7 +796,7 @@ void SMESHGUI_RevolutionDlg::onDisplaySimulation(bool toDisplayPreview)
anAxis, anAngle, aNbSteps, aTolerance, makeGroups );
SMESH::MeshPreviewStruct_var aMeshPreviewStruct = meshEditor->GetPreviewData();
mySimulation->SetData( aMeshPreviewStruct._retn() );
mySimulation->SetData( aMeshPreviewStruct.in() );
}
catch (...) {}
}