From: caremoli <caremoli>
Date: Fri, 2 Jul 2010 16:34:51 +0000 (+0000)
Subject: CCAR: some minor modifications
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fb9b9b625513e4c7c9853a8b75c69db14bc2fd29;p=modules%2Fgui.git

CCAR: some minor modifications
---

diff --git a/src/LightApp/LightApp_Displayer.cxx b/src/LightApp/LightApp_Displayer.cxx
index afa347975..e9a2ea487 100644
--- a/src/LightApp/LightApp_Displayer.cxx
+++ b/src/LightApp/LightApp_Displayer.cxx
@@ -194,7 +194,12 @@ SALOME_Prs* LightApp_Displayer::buildPresentation( const QString& entry, SALOME_
   SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView();
 
   if ( vf )
-    prs = vf->CreatePrs( entry.toLatin1() );
+    {
+      if(entry.isNull())
+        prs = vf->CreatePrs( 0 );
+      else
+        prs = vf->CreatePrs( entry.toLatin1() );
+    }
 
   return prs;
 }
diff --git a/src/SOCC/SOCC_ViewModel.cxx b/src/SOCC/SOCC_ViewModel.cxx
index ba3aa631f..aa6daf569 100755
--- a/src/SOCC/SOCC_ViewModel.cxx
+++ b/src/SOCC/SOCC_ViewModel.cxx
@@ -762,6 +762,9 @@ void SOCC_Viewer::Repaint()
   getViewer3d()->Update();
 }
 
+/*!
+  Updates viewer map entry2aisobject
+*/
 void SOCC_Viewer::updateViewer(SALOME_Prs* prs)
 {
   //std::cerr << "SOCC_Viewer::updateViewer" << std::endl;
diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 3a0094274..eb8c7e2a2 100644
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -82,7 +82,8 @@ class Observer_i : public virtual POA_SALOME::Observer
 
 
       //MESSAGE("Parent id  " << parent_id << " with position " << pos_in_parent);
-      _PTR(SObject) obj_parent = myStudyDS->FindObjectID( parent_id );
+      //_PTR(SObject) obj_parent = myStudyDS->FindObjectID( parent_id );
+      _PTR(SObject) obj_parent = obj->GetFather();
       //MESSAGE("Checking the ID from the sObj_parent : " << obj_parent->GetID());
       
       SUIT_DataObject* suit_obj;