Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50e4126
)
indentation
author
eap
<eap@opencascade.com>
Thu, 16 May 2013 17:16:44 +0000
(17:16 +0000)
committer
eap
<eap@opencascade.com>
Thu, 16 May 2013 17:16:44 +0000
(17:16 +0000)
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
patch
|
blob
|
history
diff --git
a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index f263c8277266c690dd31c994c42e26f8c60f2be8..c0a256911692c369a87c6b4384b2717b3334295c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@
-832,19
+832,15
@@
void SMESHGUI_BaseComputeOp::computeMesh()
#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
OCC_CATCH_SIGNALS;
#endif
#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
OCC_CATCH_SIGNALS;
#endif
- //SMESH::UpdateNulData(myIObject, true);
bool res;
bool res;
-#ifdef WITH_SMESH_CANCEL_COMPUTE
SMESHGUI_ComputeDlg_QThreadQDialog qthreaddialog(desktop(), gen, myMesh, myMainShape);
qthreaddialog.exec();
res = qthreaddialog.result();
SMESHGUI_ComputeDlg_QThreadQDialog qthreaddialog(desktop(), gen, myMesh, myMainShape);
qthreaddialog.exec();
res = qthreaddialog.result();
-#else
res = gen->Compute(myMesh, myMainShape);
res = gen->Compute(myMesh, myMainShape);
-#endif
if (res)
computeFailed = false;
}
if (res)
computeFailed = false;
}
- catch(const SALOME::SALOME_Exception & S_ex){
+ catch(const SALOME::SALOME_Exception & S_ex)
{
memoryLack = true;
}
try {
memoryLack = true;
}
try {
@@
-856,7
+852,7
@@
void SMESHGUI_BaseComputeOp::computeMesh()
for ( int i = 0; (i < aCompErrors->length()) && !memoryLack; ++i )
memoryLack = ( aCompErrors[ i ].code == SMESH::COMPERR_MEMORY_PB );
}
for ( int i = 0; (i < aCompErrors->length()) && !memoryLack; ++i )
memoryLack = ( aCompErrors[ i ].code == SMESH::COMPERR_MEMORY_PB );
}
- catch(const SALOME::SALOME_Exception & S_ex){
+ catch(const SALOME::SALOME_Exception & S_ex)
{
memoryLack = true;
}
memoryLack = true;
}