CCAR: some minor modifications

diff --git a/src/LightApp/LightApp_Displayer.cxx b/src/LightApp/LightApp_Displayer.cxx
index afa34797535d15aee404256e4ce563031f91ffa8..e9a2ea4879e14ad83fb107810bd2a6841a6531b8 100644 (file)
--- 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 ba3aa631fcf84fd9c317f76a90f1f750fabdab0e..aa6daf569b041f5ba85f94423ca3cbd4d380237c 100755 (executable)
--- 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 3a00942748022035a5905f0ce24594b63b3b8a69..eb8c7e2a24af68c1d910846a7117b1ce33862ea1 100644 (file)
--- 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;