Fix crash (from PPGP) when invoking popup on non-smesh (light) object

src/SMESHGUI/SMESHGUI_Selection.cxx

@@ -244,9 +244,7 @@ QString SMESHGUI_Selection::shrinkMode( int ind ) const
 {
   SMESH_Actor* actor = getActor( ind );
   if ( actor && actor->IsShrunkable() ) {
-    if ( actor->IsShrunk() )
+    return actor->IsShrunk() ? "IsShrunk" : "IsNotShrunk";
-      return "IsShrunk";
-    return "IsNotShrunk";
   }
   return "IsNotShrinkable";
 }
@@ -352,9 +350,7 @@ QString SMESHGUI_Selection::facesOrientationMode( int ind ) const
 {
   SMESH_Actor* actor = getActor( ind );
   if ( actor ) {
-    if ( actor->GetFacesOriented() )
+    return actor->GetFacesOriented() ? "IsOriented" : "IsNotOriented";
-      return "IsOriented";
-    return "IsNotOriented";
   }
   return "Unknown";
 }
@@ -373,7 +369,7 @@ bool SMESHGUI_Selection::isAutoColor( int ind ) const
 
     if ( !CORBA::is_nil( obj ) ) {
       SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( obj );
-      if ( ! mesh->_is_nil() )
+      if ( !CORBA::is_nil( mesh ) )
         return mesh->GetAutoColor();
     }
   }
@@ -394,13 +390,13 @@ int SMESHGUI_Selection::numberOfNodes( int ind ) const
 
     if ( !CORBA::is_nil( obj ) ) {
       SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( obj );
-      if ( ! mesh->_is_nil() )
+      if ( !CORBA::is_nil( mesh ) )
         return mesh->NbNodes();
       SMESH::SMESH_subMesh_var aSubMeshObj = SMESH::SMESH_subMesh::_narrow( obj );
-      if ( !aSubMeshObj->_is_nil() )
+      if ( !CORBA::is_nil( aSubMeshObj ) )
         return aSubMeshObj->GetNumberOfNodes(true);
       SMESH::SMESH_GroupBase_var aGroupObj = SMESH::SMESH_GroupBase::_narrow( obj );
-      if ( !aGroupObj->_is_nil() )
+      if ( !CORBA::is_nil( aGroupObj ) )
         return aGroupObj->IsEmpty() ? 0 : 1; // aGroupObj->Size();
     }
   }
@@ -425,17 +421,18 @@ int SMESHGUI_Selection::dim( int ind ) const
 
     if ( !CORBA::is_nil( obj ) ) {
       SMESH::SMESH_IDSource_var idSrc = SMESH::SMESH_IDSource::_narrow( obj );
-      if ( ! idSrc->_is_nil() )
+      if ( !CORBA::is_nil( idSrc ) )
       {
         SMESH::array_of_ElementType_var types = idSrc->GetTypes();
-        for ( int i = 0; i < types->length(); ++ i)
+        for ( int i = 0; i < types->length(); ++ i) {
           switch ( types[i] ) {
           case SMESH::EDGE  : dim = std::max( dim, 1 ); break;
           case SMESH::FACE  : dim = std::max( dim, 2 ); break;
           case SMESH::VOLUME: dim = std::max( dim, 3 ); break;
           case SMESH::ELEM0D: dim = std::max( dim, 0 ); break;
           case SMESH::BALL  : dim = std::max( dim, 0 ); break;
-          default:;
+          default: break;
+          }
 	}
       }
     }
@@ -452,25 +449,18 @@ QVariant SMESHGUI_Selection::isComputable( int ind ) const
 {
   if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
   {
-/*    Handle(SALOME_InteractiveObject) io =
-      static_cast<LightApp_DataOwner*>( myDataOwners[ ind ].get() )->IO();
-    if ( !io.IsNull() ) {
-      SMESH::SMESH_Mesh_var mesh = SMESH::GetMeshByIO(io); // m,sm,gr->m
-      if ( !mesh->_is_nil() ) {*/
     _PTR(SObject) so = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ).toLatin1().data() );
-        //FindSObject( mesh );
-        if ( so ) {
     CORBA::Object_var obj = SMESH::SObjectToObject( so, SMESH::GetActiveStudyDocument() );
     if( !CORBA::is_nil( obj ) ) {
       SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( obj );
-            if (!mesh->_is_nil()){
+      if ( !CORBA::is_nil( mesh ) ) {
 	if ( mesh->HasShapeToMesh() ) {
 	  GEOM::GEOM_Object_var shape = SMESH::GetShapeOnMeshOrSubMesh( so );
 	  return QVariant( !shape->_is_nil() );
 	}
 	else
 	{
-                return QVariant(!mesh->NbFaces()==0);
+	  return QVariant( mesh->NbFaces() !=0 );
 	}
       }
       else
@@ -480,9 +470,6 @@ QVariant SMESHGUI_Selection::isComputable( int ind ) const
       }
     }
   }
-//      }
-//    }
-  }
   return QVariant( false );
 }
 
@@ -522,8 +509,7 @@ QVariant SMESHGUI_Selection::isVisible( int ind ) const
 {
   if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
   {
-    QString ent = entry( ind );
+    SMESH_Actor* actor = SMESH::FindActorByEntry( entry( ind ).toLatin1().data() );
-    SMESH_Actor* actor = SMESH::FindActorByEntry( ent.toLatin1().data() );
     if ( actor && actor->hasIO() ) {
       if ( SVTK_ViewWindow* aViewWindow = SMESH::GetCurrentVtkView() )
         return QVariant( aViewWindow->isVisible( actor->getIO() ) );
@@ -542,6 +528,7 @@ bool SMESHGUI_Selection::hasChildren( int ind ) const
   if ( ind >= 0 )
   {
     _PTR(SObject) sobj = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ).toLatin1().data() );
+    if ( sobj ) 
       return SMESH::GetActiveStudyDocument()->GetUseCaseBuilder()->HasChildren( sobj );
   }
   return false;
@@ -558,7 +545,7 @@ int SMESHGUI_Selection::nbChildren( int ind ) const
   if ( ind >= 0 )
   {
     _PTR(SObject) sobj = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ).toLatin1().data() );
-    if ( sobj->GetStudy()->GetUseCaseBuilder()->IsUseCaseNode( sobj ) ) {
+    if ( sobj && sobj->GetStudy()->GetUseCaseBuilder()->IsUseCaseNode( sobj ) ) {
       _PTR(UseCaseIterator) it = sobj->GetStudy()->GetUseCaseBuilder()->GetUseCaseIterator( sobj ); 
       for ( it->Init( false ); it->More(); it->Next() ) nb++;
     }
@@ -583,10 +570,9 @@ bool SMESHGUI_Selection::isContainer( int ind ) const
 
 int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
 {
-  _PTR(SObject) obj (study->FindObjectID(entry.toLatin1().data()));
+  int res = -1;
-  if( !obj )
+  _PTR(SObject) obj = study->FindObjectID( entry.toLatin1().data() );
-    return -1;
+  if ( obj ) {
-
     _PTR(SObject) ref;
     if ( obj->ReferencedObject( ref ) )
       obj = ref;
@@ -594,16 +580,14 @@ int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
     _PTR(SObject) objFather = obj->GetFather();
     _PTR(SComponent) objComponent = obj->GetFatherComponent();
 
-  if( objComponent->ComponentDataType()!="SMESH" )
+    if ( objComponent->ComponentDataType() == "SMESH" ) {
-    return -1;
+      if ( objComponent->GetIOR() == obj->GetIOR() ) {
-
+	res = SMESH::COMPONENT;
-  if( objComponent->GetIOR()==obj->GetIOR() )
+      }
-    return SMESH::COMPONENT;
+      else {
-
 	int aLevel = obj->Depth() - objComponent->Depth(),
 	  aFTag = objFather->Tag(),
-      anOTag = obj->Tag(),
+	  anOTag = obj->Tag();
-      res = -1;
 
 	switch ( aLevel )
 	{
@@ -614,41 +598,29 @@ int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
 	case 2:
 	  switch ( aFTag )
 	  {
-    case SMESH::Tag_HypothesisRoot:
+	  case SMESH::Tag_HypothesisRoot: res = SMESH::HYPOTHESIS; break;
-      res = SMESH::HYPOTHESIS;
+	  case SMESH::Tag_AlgorithmsRoot: res = SMESH::ALGORITHM;  break;
-      break;
+	  default: break;
-    case SMESH::Tag_AlgorithmsRoot:
-      res = SMESH::ALGORITHM;
-      break;
 	  }
 	  break;
 	case 3:
 	  switch ( aFTag )
 	  {
-    case SMESH::Tag_SubMeshOnVertex:
+	  case SMESH::Tag_SubMeshOnVertex:   res = SMESH::SUBMESH_VERTEX;   break;
-      res = SMESH::SUBMESH_VERTEX;
+	  case SMESH::Tag_SubMeshOnEdge:     res = SMESH::SUBMESH_EDGE;     break;
-      break;
+	  case SMESH::Tag_SubMeshOnFace:     res = SMESH::SUBMESH_FACE;     break;
-    case SMESH::Tag_SubMeshOnEdge:
+	  case SMESH::Tag_SubMeshOnSolid:    res = SMESH::SUBMESH_SOLID;    break;
-      res = SMESH::SUBMESH_EDGE;
+	  case SMESH::Tag_SubMeshOnCompound: res = SMESH::SUBMESH_COMPOUND; break;
-      break;
-    case SMESH::Tag_SubMeshOnFace:
-      res = SMESH::SUBMESH_FACE;
-      break;
-    case SMESH::Tag_SubMeshOnSolid:
-      res = SMESH::SUBMESH_SOLID;
-      break;
-    case SMESH::Tag_SubMeshOnCompound:
-      res = SMESH::SUBMESH_COMPOUND;
-      break;
 	  default:
-      if (aFTag >= SMESH::Tag_FirstGroup)
+	    if ( aFTag >= SMESH::Tag_FirstGroup) res = SMESH::GROUP;
-        res = SMESH::GROUP;
+	    else                                 res = SMESH::SUBMESH;
-      else
+	    break;
-        res = SMESH::SUBMESH;
 	  }
 	  break;
 	}
-
+      }
+    }
+  }
   return res;
 }
 
@@ -659,45 +631,46 @@ int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
 
 QString SMESHGUI_Selection::typeName( const int t )
 {
+  QString res = "Unknown";
   switch( t )
   {
   case SMESH::HYPOTHESIS:
-    return "Hypothesis";
+    res = "Hypothesis"; break;
   case SMESH::ALGORITHM:
-    return "Algorithm";
+    res = "Algorithm"; break;
   case SMESH::MESH:
-    return "Mesh";
+    res = "Mesh"; break;
   case SMESH::SUBMESH:
-    return "SubMesh";
+    res = "SubMesh"; break;
   case SMESH::MESHorSUBMESH:
-    return "Mesh or submesh";
+    res = "Mesh or submesh"; break;
   case SMESH::SUBMESH_VERTEX:
-    return "Mesh vertex";
+    res = "Mesh vertex"; break;
   case SMESH::SUBMESH_EDGE:
-    return "Mesh edge";
+    res = "Mesh edge"; break;
   case SMESH::SUBMESH_FACE:
-    return "Mesh face";
+    res = "Mesh face"; break;
   case SMESH::SUBMESH_SOLID:
-    return "Mesh solid";
+    res = "Mesh solid"; break;
   case SMESH::SUBMESH_COMPOUND:
-    return "Mesh compound";
+    res = "Mesh compound"; break;
   case SMESH::GROUP:
-    return "Group";
+    res = "Group"; break;
   case SMESH::COMPONENT:
-    return "Component";
+    res = "Component"; break;
   default:
-    return "Unknown";
+     break;
   }
+  return res;
 }
 
 bool SMESHGUI_Selection::isImported( const int ind ) const
 {
-  QString e = entry( ind );
-  _PTR(SObject) SO = SMESH::GetActiveStudyDocument()->FindObjectID( e.toLatin1().constData() );
   bool res = false;
-  if( SO )
+  _PTR(SObject) sobj = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ).toLatin1().constData() );
+  if ( sobj )
   {
-    SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( SMESH::SObjectToObject( SO ) );
+    SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( SMESH::SObjectToObject( sobj ) );
     if( !aMesh->_is_nil() )
     {
       SMESH::MedFileInfo_var inf = aMesh->GetMEDFileInfo();
@@ -714,20 +687,17 @@ bool SMESHGUI_Selection::isImported( const int ind ) const
 
 QString SMESHGUI_Selection::groupType( int ind ) const
 {
-  QString e = entry( ind );
+  _PTR(SObject) sobj = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ).toLatin1().constData() );
-  _PTR(SObject) SO = SMESH::GetActiveStudyDocument()->FindObjectID( e.toLatin1().constData() );
+  if ( sobj )
-  if( SO )
   {
-    SMESH::SMESH_Group_var g = SMESH::SObjectToInterface<SMESH::SMESH_Group>( SO );
+    SMESH::SMESH_Group_var g = SMESH::SObjectToInterface<SMESH::SMESH_Group>( sobj );
-    if( !g->_is_nil() )
+    if ( !CORBA::is_nil( g ) )
       return "Group";
-
+    SMESH::SMESH_GroupOnGeom_var gog = SMESH::SObjectToInterface<SMESH::SMESH_GroupOnGeom>( sobj );
-    SMESH::SMESH_GroupOnGeom_var gog = SMESH::SObjectToInterface<SMESH::SMESH_GroupOnGeom>( SO );
+    if( !CORBA::is_nil( gog ) )
-    if( !gog->_is_nil() )
       return "GroupOnGeom";
-
+    SMESH::SMESH_GroupOnFilter_var gof = SMESH::SObjectToInterface<SMESH::SMESH_GroupOnFilter>( sobj );
-    SMESH::SMESH_GroupOnFilter_var gof = SMESH::SObjectToInterface<SMESH::SMESH_GroupOnFilter>(SO);
+    if ( !CORBA::is_nil( gof ) )
-    if ( !gof->_is_nil() )
       return "GroupOnFilter";
   }
   return "";