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
0052610: Inactive "eye" icon after mesh compound creation
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_StdHypothesisCreator.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
index 891b2c0c86170a4fdc62f383ba55a3eb9d44303d..e912e113d1d337b55483d397ac80483c2b4aff4a 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
@@
-47,6
+47,7
@@
// SALOME GUI includes
#include <SUIT_ResourceMgr.h>
// SALOME GUI includes
#include <SUIT_ResourceMgr.h>
+#include <SUIT_MessageBox.h>
// IDL includes
#include <SALOMEconfig.h>
// IDL includes
#include <SALOMEconfig.h>
@@
-407,7
+408,7
@@
bool StdMeshersGUI_StdHypothesisCreator::checkParams( QString& msg ) const
srcV = w1->GetValue();
tgtV = w2->GetValue();
ok = (( srcV.isEmpty() && tgtV.isEmpty() ) ||
srcV = w1->GetValue();
tgtV = w2->GetValue();
ok = (( srcV.isEmpty() && tgtV.isEmpty() ) ||
- ( !srcV.isEmpty() && !tgtV.isEmpty()
&& srcV != tgtV
));
+ ( !srcV.isEmpty() && !tgtV.isEmpty()
/*&& srcV != tgtV*/
));
if ( !ok ) {
w1->SetObject( CORBA::Object::_nil() );
w2->SetObject( CORBA::Object::_nil() );
if ( !ok ) {
w1->SetObject( CORBA::Object::_nil() );
w2->SetObject( CORBA::Object::_nil() );
@@
-1265,8
+1266,15
@@
bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const
idsWg->SetMainShapeEntry( aMainEntry );
idsWg->SetGeomShapeEntry( aSubEntry.isEmpty() ? aMainEntry : aSubEntry );
idsWg->SetMainShapeEntry( aMainEntry );
idsWg->SetGeomShapeEntry( aSubEntry.isEmpty() ? aMainEntry : aSubEntry );
- idsWg->SetListOfIDs( h->GetFaces() );
- idsWg->showPreview( true );
+ if ( idsWg->SetListOfIDs( h->GetFaces() ))
+ {
+ idsWg->showPreview( true );
+ }
+ else
+ {
+ SUIT_MessageBox::warning( dlg(),tr( "SMESH_WRN_WARNING" ),tr( "BAD_FACES_WARNING" ));
+ idsWg->setEnabled( false );
+ }
customWidgets()->append ( idsWg );
}
}
customWidgets()->append ( idsWg );
}
}
@@
-1317,8
+1325,15
@@
bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const
idsWg->SetMainShapeEntry( aMainEntry );
idsWg->SetGeomShapeEntry( aSubEntry.isEmpty() ? aMainEntry : aSubEntry );
idsWg->SetMainShapeEntry( aMainEntry );
idsWg->SetGeomShapeEntry( aSubEntry.isEmpty() ? aMainEntry : aSubEntry );
- idsWg->SetListOfIDs( h->GetEdges() );
- idsWg->showPreview( true );
+ if ( idsWg->SetListOfIDs( h->GetEdges() ))
+ {
+ idsWg->showPreview( true );
+ }
+ else
+ {
+ SUIT_MessageBox::warning( dlg(),tr( "SMESH_WRN_WARNING" ),tr( "BAD_EDGES_WARNING" ));
+ idsWg->setEnabled( false );
+ }
customWidgets()->append ( idsWg );
}
}
customWidgets()->append ( idsWg );
}
}