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

22784: EDF 8824 GHS3DPLUGIN: SetEnforcedVertexNamedWithGroup() does not add an extra group

Browse Source 
SMESH_Controls.cxx: add some protection against SIGSEGV
SMESHGUI_MeshOp.cxx: at mesh edition,avoid selection of a sole existing
                     hypothesis compatible with an assigned algo
SMESHGUI_Utils.h: make class toStdStr usable.
This commit is contained in:
eap 2014-10-17 18:45:17 +04:00
parent d7c32d7ece
commit 333b8ff2fb
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controls/SMESH_Controls.cxx
View File

@ -1954,6 +1954,7 @@ bool MultiConnection2D::Value::operator<(const MultiConnection2D::Value& x) cons
} }
void MultiConnection2D::GetValues(MValues& theValues){ void MultiConnection2D::GetValues(MValues& theValues){
if ( !myMesh ) return;
SMDS_FaceIteratorPtr anIter = myMesh->facesIterator(); SMDS_FaceIteratorPtr anIter = myMesh->facesIterator();
for(; anIter->more(); ){ for(; anIter->more(); ){
const SMDS_MeshFace* anElem = anIter->next(); const SMDS_MeshFace* anElem = anIter->next();

2
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -1555,7 +1555,7 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
hypIndex = this->find( curHyp, myExistingHyps[ dim ][ type ]); hypIndex = this->find( curHyp, myExistingHyps[ dim ][ type ]);
else else
hypIndex = -1; hypIndex = -1;
if ( !isSubmesh && hypIndex < 0 && anExisting.count() == 1 ) { if ( !isSubmesh && myToCreate && hypIndex < 0 && anExisting.count() == 1 ) {
// none is yet selected => select the sole existing if it is not optional // none is yet selected => select the sole existing if it is not optional
CORBA::String_var hypTypeName = myExistingHyps[ dim ][ type ].first().first->GetName(); CORBA::String_var hypTypeName = myExistingHyps[ dim ][ type ].first().first->GetName();
bool isOptional = true; bool isOptional = true;

2
src/SMESHGUI/SMESHGUI_Utils.h
View File

@ -204,7 +204,7 @@ SMESHGUI_EXPORT
struct toQStr : public toStrT< QString > { struct toQStr : public toStrT< QString > {
toQStr( char* s ): toStrT< QString >(s) {} toQStr( char* s ): toStrT< QString >(s) {}
}; };
class toStdStr : public toStrT< std::string > { struct toStdStr : public toStrT< std::string > {
toStdStr( char* s ): toStrT< std::string >(s) {} toStdStr( char* s ): toStrT< std::string >(s) {}
}; };