Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_9_BR'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ComputeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index a31ce3d9d327f61c65d174a77ece47f5e7031a19..142946c41ad55dd182404068dd30ace7d5724aa3 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
2
CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-1147,7
+1147,7
@@
void SMESHGUI_BaseComputeOp::showComputeResult( const bool theMemoryLack,
}
else if ( theNoCompError && theNoHypoError )
{
}
else if ( theNoCompError && theNoHypoError )
{
- SMESH::
long
_array_var aRes = myMesh->GetMeshInfo();
+ SMESH::
smIdType
_array_var aRes = myMesh->GetMeshInfo();
aCompDlg->myFullInfo->SetMeshInfo( aRes );
aCompDlg->myFullInfo->show();
aCompDlg->myBriefInfo->hide();
aCompDlg->myFullInfo->SetMeshInfo( aRes );
aCompDlg->myFullInfo->show();
aCompDlg->myBriefInfo->hide();
@@
-1162,7
+1162,7
@@
void SMESHGUI_BaseComputeOp::showComputeResult( const bool theMemoryLack,
theCompErrors[ i ].code == SMESH::COMPERR_NO_MESH_ON_SHAPE );
// full or brief mesh info
theCompErrors[ i ].code == SMESH::COMPERR_NO_MESH_ON_SHAPE );
// full or brief mesh info
- SMESH::
long
_array_var aRes = myMesh->GetMeshInfo();
+ SMESH::
smIdType
_array_var aRes = myMesh->GetMeshInfo();
if ( onlyWarnings ) {
aCompDlg->myFullInfo->SetMeshInfo( aRes );
aCompDlg->myFullInfo->show();
if ( onlyWarnings ) {
aCompDlg->myFullInfo->SetMeshInfo( aRes );
aCompDlg->myFullInfo->show();
@@
-2211,7
+2211,7
@@
void SMESHGUI_BaseComputeOp::evaluateMesh()
QString aHypErrors;
bool evaluateFailed = true, memoryLack = false;
QString aHypErrors;
bool evaluateFailed = true, memoryLack = false;
- SMESH::
long
_array_var aRes;
+ SMESH::
smIdType
_array_var aRes;
_PTR(SObject) aMeshSObj = SMESH::FindSObject(myMesh);
if ( !aMeshSObj ) // IPAL21340
_PTR(SObject) aMeshSObj = SMESH::FindSObject(myMesh);
if ( !aMeshSObj ) // IPAL21340
@@
-2286,7
+2286,7
@@
void SMESHGUI_BaseComputeOp::evaluateMesh()
}
}
-void SMESHGUI_BaseComputeOp::showEvaluateResult(const SMESH::
long
_array& theRes,
+void SMESHGUI_BaseComputeOp::showEvaluateResult(const SMESH::
smIdType
_array& theRes,
const bool theMemoryLack,
const bool theNoCompError,
SMESH::compute_error_array_var& theCompErrors,
const bool theMemoryLack,
const bool theNoCompError,
SMESH::compute_error_array_var& theCompErrors,